diff --git a/lib/app.dart b/lib/app.dart
index f0d56cd..b72eeb4 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -1,5 +1,5 @@
-import 'package:flipub/providers/theme_provider.dart';
-import 'package:flipub/views/library_view.dart';
+import 'package:flipub/providers/theme/theme_provider.dart';
+import 'package:flipub/presentation/library/library_view.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
diff --git a/lib/views/book_cover.dart b/lib/presentation/book/book_cover.dart
similarity index 100%
rename from lib/views/book_cover.dart
rename to lib/presentation/book/book_cover.dart
diff --git a/lib/views/book_view.dart b/lib/presentation/book/book_view.dart
similarity index 95%
rename from lib/views/book_view.dart
rename to lib/presentation/book/book_view.dart
index 1f6302c..f9af727 100644
--- a/lib/views/book_view.dart
+++ b/lib/presentation/book/book_view.dart
@@ -1,7 +1,7 @@
 import 'package:epubx/epubx.dart';
 import 'package:flipub/data/constants.dart';
-import 'package:flipub/providers/book_provider.dart';
-import 'package:flipub/views/chapter_view.dart';
+import 'package:flipub/providers/epub/book_provider.dart';
+import 'package:flipub/presentation/chapter/chapter_view.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
diff --git a/lib/views/audio_book.dart b/lib/presentation/chapter/audio_book.dart
similarity index 100%
rename from lib/views/audio_book.dart
rename to lib/presentation/chapter/audio_book.dart
diff --git a/lib/views/chapter_view.dart b/lib/presentation/chapter/chapter_view.dart
similarity index 95%
rename from lib/views/chapter_view.dart
rename to lib/presentation/chapter/chapter_view.dart
index 55d375c..2bdde90 100644
--- a/lib/views/chapter_view.dart
+++ b/lib/presentation/chapter/chapter_view.dart
@@ -2,9 +2,9 @@ import 'dart:io';
 
 import 'package:epubx/epubx.dart';
 import 'package:flipub/data/constants.dart';
-import 'package:flipub/providers/preferences_provider.dart';
-import 'package:flipub/views/audio_book.dart';
-import 'package:flipub/views/linear_pogress_listener.dart';
+import 'package:flipub/providers/preferences/preferences_provider.dart';
+import 'package:flipub/presentation/chapter/audio_book.dart';
+import 'package:flipub/presentation/chapter/linear_pogress_listener.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
diff --git a/lib/views/linear_pogress_listener.dart b/lib/presentation/chapter/linear_pogress_listener.dart
similarity index 100%
rename from lib/views/linear_pogress_listener.dart
rename to lib/presentation/chapter/linear_pogress_listener.dart
diff --git a/lib/views/library_view.dart b/lib/presentation/library/library_view.dart
similarity index 92%
rename from lib/views/library_view.dart
rename to lib/presentation/library/library_view.dart
index be79ba1..c3dff05 100644
--- a/lib/views/library_view.dart
+++ b/lib/presentation/library/library_view.dart
@@ -2,11 +2,11 @@ import 'dart:io';
 
 import 'package:epubx/epubx.dart' show EpubBook;
 import 'package:flipub/data/book_library.dart';
-import 'package:flipub/providers/book_provider.dart';
-import 'package:flipub/providers/library_provider.dart';
-import 'package:flipub/providers/theme_provider.dart';
-import 'package:flipub/views/book_cover.dart';
-import 'package:flipub/views/book_view.dart';
+import 'package:flipub/providers/epub/book_provider.dart';
+import 'package:flipub/providers/epub/library_provider.dart';
+import 'package:flipub/providers/theme/theme_provider.dart';
+import 'package:flipub/presentation/book/book_cover.dart';
+import 'package:flipub/presentation/book/book_view.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
diff --git a/lib/providers/book_provider.dart b/lib/providers/epub/book_provider.dart
similarity index 100%
rename from lib/providers/book_provider.dart
rename to lib/providers/epub/book_provider.dart
diff --git a/lib/providers/book_provider.g.dart b/lib/providers/epub/book_provider.g.dart
similarity index 100%
rename from lib/providers/book_provider.g.dart
rename to lib/providers/epub/book_provider.g.dart
diff --git a/lib/providers/library_provider.dart b/lib/providers/epub/library_provider.dart
similarity index 100%
rename from lib/providers/library_provider.dart
rename to lib/providers/epub/library_provider.dart
diff --git a/lib/providers/library_provider.g.dart b/lib/providers/epub/library_provider.g.dart
similarity index 100%
rename from lib/providers/library_provider.g.dart
rename to lib/providers/epub/library_provider.g.dart
diff --git a/lib/providers/preferences_provider.dart b/lib/providers/preferences/preferences_provider.dart
similarity index 100%
rename from lib/providers/preferences_provider.dart
rename to lib/providers/preferences/preferences_provider.dart
diff --git a/lib/providers/preferences_provider.g.dart b/lib/providers/preferences/preferences_provider.g.dart
similarity index 100%
rename from lib/providers/preferences_provider.g.dart
rename to lib/providers/preferences/preferences_provider.g.dart
diff --git a/lib/providers/theme_provider.dart b/lib/providers/theme/theme_provider.dart
similarity index 92%
rename from lib/providers/theme_provider.dart
rename to lib/providers/theme/theme_provider.dart
index 3272987..38ffe73 100644
--- a/lib/providers/theme_provider.dart
+++ b/lib/providers/theme/theme_provider.dart
@@ -1,5 +1,5 @@
 import 'package:flipub/data/constants.dart';
-import 'package:flipub/providers/preferences_provider.dart';
+import 'package:flipub/providers/preferences/preferences_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
diff --git a/lib/providers/theme_provider.g.dart b/lib/providers/theme/theme_provider.g.dart
similarity index 100%
rename from lib/providers/theme_provider.g.dart
rename to lib/providers/theme/theme_provider.g.dart