diff --git a/lib/lib/data/cache_provider.dart b/lib/data/cache_provider.dart
similarity index 100%
rename from lib/lib/data/cache_provider.dart
rename to lib/data/cache_provider.dart
diff --git a/lib/lib/data/data.dart b/lib/data/data.dart
similarity index 100%
rename from lib/lib/data/data.dart
rename to lib/data/data.dart
diff --git a/lib/lib/data/file_system_data_provider.dart b/lib/data/file_system_data_provider.dart
similarity index 100%
rename from lib/lib/data/file_system_data_provider.dart
rename to lib/data/file_system_data_provider.dart
diff --git a/lib/lib/data/hive_data_provider.dart b/lib/data/hive_data_provider.dart
similarity index 100%
rename from lib/lib/data/hive_data_provider.dart
rename to lib/data/hive_data_provider.dart
diff --git a/lib/lib/main.dart b/lib/main.dart
similarity index 100%
rename from lib/lib/main.dart
rename to lib/main.dart
diff --git a/lib/lib/models/app_model.dart b/lib/models/app_model.dart
similarity index 100%
rename from lib/lib/models/app_model.dart
rename to lib/models/app_model.dart
diff --git a/lib/lib/models/bookmark.dart b/lib/models/bookmark.dart
similarity index 100%
rename from lib/lib/models/bookmark.dart
rename to lib/models/bookmark.dart
diff --git a/lib/lib/models/books.dart b/lib/models/books.dart
similarity index 100%
rename from lib/lib/models/books.dart
rename to lib/models/books.dart
diff --git a/lib/lib/models/full_text_search.dart b/lib/models/full_text_search.dart
similarity index 100%
rename from lib/lib/models/full_text_search.dart
rename to lib/models/full_text_search.dart
diff --git a/lib/lib/models/library.dart b/lib/models/library.dart
similarity index 100%
rename from lib/lib/models/library.dart
rename to lib/models/library.dart
diff --git a/lib/lib/models/links.dart b/lib/models/links.dart
similarity index 100%
rename from lib/lib/models/links.dart
rename to lib/models/links.dart
diff --git a/lib/lib/models/search_results.dart b/lib/models/search_results.dart
similarity index 100%
rename from lib/lib/models/search_results.dart
rename to lib/models/search_results.dart
diff --git a/lib/lib/models/tabs.dart b/lib/models/tabs.dart
similarity index 100%
rename from lib/lib/models/tabs.dart
rename to lib/models/tabs.dart
diff --git a/lib/lib/models/text_book_searcher.dart b/lib/models/text_book_searcher.dart
similarity index 100%
rename from lib/lib/models/text_book_searcher.dart
rename to lib/models/text_book_searcher.dart
diff --git a/lib/lib/screens/book_tree_checklist.dart b/lib/screens/book_tree_checklist.dart
similarity index 100%
rename from lib/lib/screens/book_tree_checklist.dart
rename to lib/screens/book_tree_checklist.dart
diff --git a/lib/lib/screens/bookmark_screen.dart b/lib/screens/bookmark_screen.dart
similarity index 100%
rename from lib/lib/screens/bookmark_screen.dart
rename to lib/screens/bookmark_screen.dart
diff --git a/lib/lib/screens/combined_book_screen.dart b/lib/screens/combined_book_screen.dart
similarity index 100%
rename from lib/lib/screens/combined_book_screen.dart
rename to lib/screens/combined_book_screen.dart
diff --git a/lib/lib/screens/commentators_list_screen.dart b/lib/screens/commentators_list_screen.dart
similarity index 100%
rename from lib/lib/screens/commentators_list_screen.dart
rename to lib/screens/commentators_list_screen.dart
diff --git a/lib/lib/screens/favoriets.dart b/lib/screens/favoriets.dart
similarity index 100%
rename from lib/lib/screens/favoriets.dart
rename to lib/screens/favoriets.dart
diff --git a/lib/lib/screens/find_book_screen.dart b/lib/screens/find_book_screen.dart
similarity index 100%
rename from lib/lib/screens/find_book_screen.dart
rename to lib/screens/find_book_screen.dart
diff --git a/lib/lib/screens/full_text_search_screen.dart b/lib/screens/full_text_search_screen.dart
similarity index 100%
rename from lib/lib/screens/full_text_search_screen.dart
rename to lib/screens/full_text_search_screen.dart
diff --git a/lib/lib/screens/history_screen.dart b/lib/screens/history_screen.dart
similarity index 100%
rename from lib/lib/screens/history_screen.dart
rename to lib/screens/history_screen.dart
diff --git a/lib/lib/screens/library_browser.dart b/lib/screens/library_browser.dart
similarity index 100%
rename from lib/lib/screens/library_browser.dart
rename to lib/screens/library_browser.dart
diff --git a/lib/lib/screens/links_screen.dart b/lib/screens/links_screen.dart
similarity index 100%
rename from lib/lib/screens/links_screen.dart
rename to lib/screens/links_screen.dart
diff --git a/lib/lib/screens/main_window_screen.dart b/lib/screens/main_window_screen.dart
similarity index 100%
rename from lib/lib/screens/main_window_screen.dart
rename to lib/screens/main_window_screen.dart
diff --git a/lib/lib/screens/pdf_book_screen.dart b/lib/screens/pdf_book_screen.dart
similarity index 100%
rename from lib/lib/screens/pdf_book_screen.dart
rename to lib/screens/pdf_book_screen.dart
diff --git a/lib/lib/screens/pdf_outlines_screen.dart b/lib/screens/pdf_outlines_screen.dart
similarity index 100%
rename from lib/lib/screens/pdf_outlines_screen.dart
rename to lib/screens/pdf_outlines_screen.dart
diff --git a/lib/lib/screens/pdf_search_screen.dart b/lib/screens/pdf_search_screen.dart
similarity index 100%
rename from lib/lib/screens/pdf_search_screen.dart
rename to lib/screens/pdf_search_screen.dart
diff --git a/lib/lib/screens/pdf_thumbnails_screen.dart b/lib/screens/pdf_thumbnails_screen.dart
similarity index 100%
rename from lib/lib/screens/pdf_thumbnails_screen.dart
rename to lib/screens/pdf_thumbnails_screen.dart
diff --git a/lib/lib/screens/printing_screen.dart b/lib/screens/printing_screen.dart
similarity index 100%
rename from lib/lib/screens/printing_screen.dart
rename to lib/screens/printing_screen.dart
diff --git a/lib/lib/screens/reading_screen.dart b/lib/screens/reading_screen.dart
similarity index 100%
rename from lib/lib/screens/reading_screen.dart
rename to lib/screens/reading_screen.dart
diff --git a/lib/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
similarity index 100%
rename from lib/lib/screens/settings_screen.dart
rename to lib/screens/settings_screen.dart
diff --git a/lib/lib/screens/simple_book_view.dart b/lib/screens/simple_book_view.dart
similarity index 100%
rename from lib/lib/screens/simple_book_view.dart
rename to lib/screens/simple_book_view.dart
diff --git a/lib/lib/screens/splited_view_screen.dart b/lib/screens/splited_view_screen.dart
similarity index 100%
rename from lib/lib/screens/splited_view_screen.dart
rename to lib/screens/splited_view_screen.dart
diff --git a/lib/lib/screens/text_book_screen.dart b/lib/screens/text_book_screen.dart
similarity index 100%
rename from lib/lib/screens/text_book_screen.dart
rename to lib/screens/text_book_screen.dart
diff --git a/lib/lib/screens/text_book_search_screen.dart b/lib/screens/text_book_search_screen.dart
similarity index 100%
rename from lib/lib/screens/text_book_search_screen.dart
rename to lib/screens/text_book_search_screen.dart
diff --git a/lib/lib/screens/toc_navigator_screen.dart b/lib/screens/toc_navigator_screen.dart
similarity index 100%
rename from lib/lib/screens/toc_navigator_screen.dart
rename to lib/screens/toc_navigator_screen.dart
diff --git a/lib/lib/utils/docx_to_otzaria.dart b/lib/utils/docx_to_otzaria.dart
similarity index 100%
rename from lib/lib/utils/docx_to_otzaria.dart
rename to lib/utils/docx_to_otzaria.dart
diff --git a/lib/lib/utils/text_manipulation.dart b/lib/utils/text_manipulation.dart
similarity index 100%
rename from lib/lib/utils/text_manipulation.dart
rename to lib/utils/text_manipulation.dart
diff --git a/lib/lib/widgets/commentary_content.dart b/lib/widgets/commentary_content.dart
similarity index 100%
rename from lib/lib/widgets/commentary_content.dart
rename to lib/widgets/commentary_content.dart
diff --git a/lib/lib/widgets/commentary_list.dart b/lib/widgets/commentary_list.dart
similarity index 100%
rename from lib/lib/widgets/commentary_list.dart
rename to lib/widgets/commentary_list.dart
diff --git a/lib/lib/widgets/grid_items.dart b/lib/widgets/grid_items.dart
similarity index 100%
rename from lib/lib/widgets/grid_items.dart
rename to lib/widgets/grid_items.dart
diff --git a/lib/lib/widgets/keyboard_shortcuts.dart b/lib/widgets/keyboard_shortcuts.dart
similarity index 100%
rename from lib/lib/widgets/keyboard_shortcuts.dart
rename to lib/widgets/keyboard_shortcuts.dart
diff --git a/lib/lib/widgets/password_dialog.dart b/lib/widgets/password_dialog.dart
similarity index 100%
rename from lib/lib/widgets/password_dialog.dart
rename to lib/widgets/password_dialog.dart