diff --git a/src/android/patches/JellyBeanSpanFixTextView.java b/fbreader/app/src/main/java/android/patches/JellyBeanSpanFixTextView.java
similarity index 100%
rename from src/android/patches/JellyBeanSpanFixTextView.java
rename to fbreader/app/src/main/java/android/patches/JellyBeanSpanFixTextView.java
diff --git a/src/com/paragon/dictionary/fbreader/OpenDictionaryActivity.java b/fbreader/app/src/main/java/com/paragon/dictionary/fbreader/OpenDictionaryActivity.java
similarity index 100%
rename from src/com/paragon/dictionary/fbreader/OpenDictionaryActivity.java
rename to fbreader/app/src/main/java/com/paragon/dictionary/fbreader/OpenDictionaryActivity.java
diff --git a/src/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java b/fbreader/app/src/main/java/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java
similarity index 100%
rename from src/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java
rename to fbreader/app/src/main/java/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java
diff --git a/src/com/yotadevices/fbreader/FBReaderYotaService.java b/fbreader/app/src/main/java/com/yotadevices/fbreader/FBReaderYotaService.java
similarity index 100%
rename from src/com/yotadevices/fbreader/FBReaderYotaService.java
rename to fbreader/app/src/main/java/com/yotadevices/fbreader/FBReaderYotaService.java
diff --git a/src/org/amse/ys/zip/Decompressor.java b/fbreader/app/src/main/java/org/amse/ys/zip/Decompressor.java
similarity index 100%
rename from src/org/amse/ys/zip/Decompressor.java
rename to fbreader/app/src/main/java/org/amse/ys/zip/Decompressor.java
diff --git a/src/org/amse/ys/zip/DeflatingDecompressor.java b/fbreader/app/src/main/java/org/amse/ys/zip/DeflatingDecompressor.java
similarity index 100%
rename from src/org/amse/ys/zip/DeflatingDecompressor.java
rename to fbreader/app/src/main/java/org/amse/ys/zip/DeflatingDecompressor.java
diff --git a/src/org/amse/ys/zip/LocalFileHeader.java b/fbreader/app/src/main/java/org/amse/ys/zip/LocalFileHeader.java
similarity index 100%
rename from src/org/amse/ys/zip/LocalFileHeader.java
rename to fbreader/app/src/main/java/org/amse/ys/zip/LocalFileHeader.java
diff --git a/src/org/amse/ys/zip/MyBufferedInputStream.java b/fbreader/app/src/main/java/org/amse/ys/zip/MyBufferedInputStream.java
similarity index 100%
rename from src/org/amse/ys/zip/MyBufferedInputStream.java
rename to fbreader/app/src/main/java/org/amse/ys/zip/MyBufferedInputStream.java
diff --git a/src/org/amse/ys/zip/NoCompressionDecompressor.java b/fbreader/app/src/main/java/org/amse/ys/zip/NoCompressionDecompressor.java
similarity index 100%
rename from src/org/amse/ys/zip/NoCompressionDecompressor.java
rename to fbreader/app/src/main/java/org/amse/ys/zip/NoCompressionDecompressor.java
diff --git a/src/org/amse/ys/zip/ZipException.java b/fbreader/app/src/main/java/org/amse/ys/zip/ZipException.java
similarity index 100%
rename from src/org/amse/ys/zip/ZipException.java
rename to fbreader/app/src/main/java/org/amse/ys/zip/ZipException.java
diff --git a/src/org/amse/ys/zip/ZipFile.java b/fbreader/app/src/main/java/org/amse/ys/zip/ZipFile.java
similarity index 100%
rename from src/org/amse/ys/zip/ZipFile.java
rename to fbreader/app/src/main/java/org/amse/ys/zip/ZipFile.java
diff --git a/src/org/amse/ys/zip/ZipInputStream.java b/fbreader/app/src/main/java/org/amse/ys/zip/ZipInputStream.java
similarity index 100%
rename from src/org/amse/ys/zip/ZipInputStream.java
rename to fbreader/app/src/main/java/org/amse/ys/zip/ZipInputStream.java
diff --git a/src/org/geometerplus/android/fbreader/AppNotifier.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/AppNotifier.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/AppNotifier.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/AppNotifier.java
diff --git a/src/org/geometerplus/android/fbreader/CancelActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/CancelActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/CancelActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/CancelActivity.java
diff --git a/src/org/geometerplus/android/fbreader/DeviceUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/DeviceUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/DeviceUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/DeviceUtil.java
diff --git a/src/org/geometerplus/android/fbreader/DisplayBookPopupAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/DisplayBookPopupAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/DisplayBookPopupAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/DisplayBookPopupAction.java
diff --git a/src/org/geometerplus/android/fbreader/ExternalFileOpener.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ExternalFileOpener.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ExternalFileOpener.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ExternalFileOpener.java
diff --git a/src/org/geometerplus/android/fbreader/FBAndroidAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBAndroidAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/FBAndroidAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBAndroidAction.java
diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReader.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/FBReader.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReader.java
diff --git a/src/org/geometerplus/android/fbreader/FBReaderApplication.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReaderApplication.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/FBReaderApplication.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReaderApplication.java
diff --git a/src/org/geometerplus/android/fbreader/FBReaderMainActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReaderMainActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/FBReaderMainActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReaderMainActivity.java
diff --git a/src/org/geometerplus/android/fbreader/FBReaderUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReaderUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/FBReaderUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReaderUtil.java
diff --git a/src/org/geometerplus/android/fbreader/FBUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/FBUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBUtil.java
diff --git a/src/org/geometerplus/android/fbreader/HideToastAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/HideToastAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/HideToastAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/HideToastAction.java
diff --git a/src/org/geometerplus/android/fbreader/InstallPluginsAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/InstallPluginsAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/InstallPluginsAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/InstallPluginsAction.java
diff --git a/src/org/geometerplus/android/fbreader/MenuData.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/MenuData.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/MenuData.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/MenuData.java
diff --git a/src/org/geometerplus/android/fbreader/NavigationPopup.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/NavigationPopup.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/NavigationPopup.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/NavigationPopup.java
diff --git a/src/org/geometerplus/android/fbreader/NavigationWindow.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/NavigationWindow.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/NavigationWindow.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/NavigationWindow.java
diff --git a/src/org/geometerplus/android/fbreader/NotificationUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/NotificationUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/NotificationUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/NotificationUtil.java
diff --git a/src/org/geometerplus/android/fbreader/OpenVideoAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/OpenVideoAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/OpenVideoAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/OpenVideoAction.java
diff --git a/src/org/geometerplus/android/fbreader/OpenWebHelpAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/OpenWebHelpAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/OpenWebHelpAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/OpenWebHelpAction.java
diff --git a/src/org/geometerplus/android/fbreader/OrientationUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/OrientationUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/OrientationUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/OrientationUtil.java
diff --git a/src/org/geometerplus/android/fbreader/PluginListActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/PluginListActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/PluginListActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/PluginListActivity.java
diff --git a/src/org/geometerplus/android/fbreader/PopupPanel.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/PopupPanel.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/PopupPanel.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/PopupPanel.java
diff --git a/src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java
diff --git a/src/org/geometerplus/android/fbreader/RunPluginAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/RunPluginAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/RunPluginAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/RunPluginAction.java
diff --git a/src/org/geometerplus/android/fbreader/SearchAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SearchAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SearchAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SearchAction.java
diff --git a/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
diff --git a/src/org/geometerplus/android/fbreader/SelectionCopyAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionCopyAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SelectionCopyAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionCopyAction.java
diff --git a/src/org/geometerplus/android/fbreader/SelectionHidePanelAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionHidePanelAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SelectionHidePanelAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionHidePanelAction.java
diff --git a/src/org/geometerplus/android/fbreader/SelectionPopup.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionPopup.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SelectionPopup.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionPopup.java
diff --git a/src/org/geometerplus/android/fbreader/SelectionShareAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionShareAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SelectionShareAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionShareAction.java
diff --git a/src/org/geometerplus/android/fbreader/SelectionShowPanelAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionShowPanelAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SelectionShowPanelAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionShowPanelAction.java
diff --git a/src/org/geometerplus/android/fbreader/SelectionTranslateAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionTranslateAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SelectionTranslateAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionTranslateAction.java
diff --git a/src/org/geometerplus/android/fbreader/SetOrientationAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SetOrientationAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SetOrientationAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SetOrientationAction.java
diff --git a/src/org/geometerplus/android/fbreader/ShareBookAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShareBookAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ShareBookAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShareBookAction.java
diff --git a/src/org/geometerplus/android/fbreader/ShowBookInfoAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowBookInfoAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ShowBookInfoAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowBookInfoAction.java
diff --git a/src/org/geometerplus/android/fbreader/ShowBookmarksAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowBookmarksAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ShowBookmarksAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowBookmarksAction.java
diff --git a/src/org/geometerplus/android/fbreader/ShowCancelMenuAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowCancelMenuAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ShowCancelMenuAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowCancelMenuAction.java
diff --git a/src/org/geometerplus/android/fbreader/ShowLibraryAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowLibraryAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ShowLibraryAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowLibraryAction.java
diff --git a/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java
diff --git a/src/org/geometerplus/android/fbreader/ShowPreferencesAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowPreferencesAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ShowPreferencesAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowPreferencesAction.java
diff --git a/src/org/geometerplus/android/fbreader/ShowTOCAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowTOCAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ShowTOCAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowTOCAction.java
diff --git a/src/org/geometerplus/android/fbreader/SimplePopupWindow.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SimplePopupWindow.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SimplePopupWindow.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SimplePopupWindow.java
diff --git a/src/org/geometerplus/android/fbreader/StartScreenAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/StartScreenAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/StartScreenAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/StartScreenAction.java
diff --git a/src/org/geometerplus/android/fbreader/SwitchProfileAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SwitchProfileAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/SwitchProfileAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/SwitchProfileAction.java
diff --git a/src/org/geometerplus/android/fbreader/TOCActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/TOCActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/TOCActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/TOCActivity.java
diff --git a/src/org/geometerplus/android/fbreader/TextSearchPopup.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/TextSearchPopup.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/TextSearchPopup.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/TextSearchPopup.java
diff --git a/src/org/geometerplus/android/fbreader/ToggleBarsAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ToggleBarsAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ToggleBarsAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ToggleBarsAction.java
diff --git a/src/org/geometerplus/android/fbreader/YotaSwitchScreenAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/YotaSwitchScreenAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/YotaSwitchScreenAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/YotaSwitchScreenAction.java
diff --git a/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/ZLTreeAdapter.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/ZLTreeAdapter.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/ZLTreeAdapter.java
diff --git a/src/org/geometerplus/android/fbreader/api/Api.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/Api.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/Api.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/Api.java
diff --git a/src/org/geometerplus/android/fbreader/api/ApiClientImplementation.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiClientImplementation.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/ApiClientImplementation.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiClientImplementation.java
diff --git a/src/org/geometerplus/android/fbreader/api/ApiException.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiException.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/ApiException.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiException.java
diff --git a/src/org/geometerplus/android/fbreader/api/ApiInterface.aidl b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiInterface.aidl
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/ApiInterface.aidl
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiInterface.aidl
diff --git a/src/org/geometerplus/android/fbreader/api/ApiListener.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiListener.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/ApiListener.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiListener.java
diff --git a/src/org/geometerplus/android/fbreader/api/ApiMethods.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiMethods.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/ApiMethods.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiMethods.java
diff --git a/src/org/geometerplus/android/fbreader/api/ApiObject.aidl b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiObject.aidl
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/ApiObject.aidl
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiObject.aidl
diff --git a/src/org/geometerplus/android/fbreader/api/ApiObject.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiObject.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/ApiObject.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiObject.java
diff --git a/src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiServerImplementation.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiServerImplementation.java
diff --git a/src/org/geometerplus/android/fbreader/api/ApiService.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiService.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/ApiService.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiService.java
diff --git a/src/org/geometerplus/android/fbreader/api/FBReaderIntents.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/FBReaderIntents.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/FBReaderIntents.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/FBReaderIntents.java
diff --git a/src/org/geometerplus/android/fbreader/api/MenuNode.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/MenuNode.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/MenuNode.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/MenuNode.java
diff --git a/src/org/geometerplus/android/fbreader/api/PluginApi.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/PluginApi.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/PluginApi.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/PluginApi.java
diff --git a/src/org/geometerplus/android/fbreader/api/TextPosition.aidl b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/TextPosition.aidl
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/TextPosition.aidl
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/TextPosition.aidl
diff --git a/src/org/geometerplus/android/fbreader/api/TextPosition.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/TextPosition.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/api/TextPosition.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/TextPosition.java
diff --git a/src/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java
diff --git a/src/org/geometerplus/android/fbreader/bookmark/BookmarksUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/BookmarksUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/bookmark/BookmarksUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/BookmarksUtil.java
diff --git a/src/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java
diff --git a/src/org/geometerplus/android/fbreader/bookmark/EditStyleActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/EditStyleActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/bookmark/EditStyleActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/EditStyleActivity.java
diff --git a/src/org/geometerplus/android/fbreader/config/ConfigInterface.aidl b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/ConfigInterface.aidl
similarity index 100%
rename from src/org/geometerplus/android/fbreader/config/ConfigInterface.aidl
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/ConfigInterface.aidl
diff --git a/src/org/geometerplus/android/fbreader/config/ConfigService.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/ConfigService.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/config/ConfigService.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/ConfigService.java
diff --git a/src/org/geometerplus/android/fbreader/config/ConfigShadow.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/ConfigShadow.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/config/ConfigShadow.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/ConfigShadow.java
diff --git a/src/org/geometerplus/android/fbreader/config/SQLiteConfig.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/SQLiteConfig.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/config/SQLiteConfig.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/SQLiteConfig.java
diff --git a/src/org/geometerplus/android/fbreader/covers/CoverCache.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/covers/CoverCache.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/covers/CoverCache.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/covers/CoverCache.java
diff --git a/src/org/geometerplus/android/fbreader/covers/CoverHolder.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/covers/CoverHolder.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/covers/CoverHolder.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/covers/CoverHolder.java
diff --git a/src/org/geometerplus/android/fbreader/covers/CoverManager.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/covers/CoverManager.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/covers/CoverManager.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/covers/CoverManager.java
diff --git a/src/org/geometerplus/android/fbreader/crash/FixBooksDirectoryActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/crash/FixBooksDirectoryActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/crash/FixBooksDirectoryActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/crash/FixBooksDirectoryActivity.java
diff --git a/src/org/geometerplus/android/fbreader/crash/MissingNativeLibraryActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/crash/MissingNativeLibraryActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/crash/MissingNativeLibraryActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/crash/MissingNativeLibraryActivity.java
diff --git a/src/org/geometerplus/android/fbreader/dict/ColorDict.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/ColorDict.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/dict/ColorDict.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/ColorDict.java
diff --git a/src/org/geometerplus/android/fbreader/dict/Dictan.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/Dictan.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/dict/Dictan.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/Dictan.java
diff --git a/src/org/geometerplus/android/fbreader/dict/DictionaryNotInstalledActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/DictionaryNotInstalledActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/dict/DictionaryNotInstalledActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/DictionaryNotInstalledActivity.java
diff --git a/src/org/geometerplus/android/fbreader/dict/DictionaryUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/DictionaryUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/dict/DictionaryUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/DictionaryUtil.java
diff --git a/src/org/geometerplus/android/fbreader/dict/InternalUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/InternalUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/dict/InternalUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/InternalUtil.java
diff --git a/src/org/geometerplus/android/fbreader/dict/Lingvo.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/Lingvo.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/dict/Lingvo.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/Lingvo.java
diff --git a/src/org/geometerplus/android/fbreader/dict/OpenDictionary.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/OpenDictionary.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/dict/OpenDictionary.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/OpenDictionary.java
diff --git a/src/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java
diff --git a/src/org/geometerplus/android/fbreader/formatPlugin/CoverReader.aidl b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/formatPlugin/CoverReader.aidl
similarity index 100%
rename from src/org/geometerplus/android/fbreader/formatPlugin/CoverReader.aidl
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/formatPlugin/CoverReader.aidl
diff --git a/src/org/geometerplus/android/fbreader/formatPlugin/PluginUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/formatPlugin/PluginUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/formatPlugin/PluginUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/formatPlugin/PluginUtil.java
diff --git a/src/org/geometerplus/android/fbreader/httpd/DataInterface.aidl b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/httpd/DataInterface.aidl
similarity index 100%
rename from src/org/geometerplus/android/fbreader/httpd/DataInterface.aidl
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/httpd/DataInterface.aidl
diff --git a/src/org/geometerplus/android/fbreader/httpd/DataServer.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/httpd/DataServer.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/httpd/DataServer.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/httpd/DataServer.java
diff --git a/src/org/geometerplus/android/fbreader/httpd/DataService.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/httpd/DataService.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/httpd/DataService.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/httpd/DataService.java
diff --git a/src/org/geometerplus/android/fbreader/httpd/DataUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/httpd/DataUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/httpd/DataUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/httpd/DataUtil.java
diff --git a/src/org/geometerplus/android/fbreader/image/ImageViewActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/image/ImageViewActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/image/ImageViewActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/image/ImageViewActivity.java
diff --git a/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/BookInfoActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/BookInfoActivity.java
diff --git a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibraryActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/library/LibraryActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibraryActivity.java
diff --git a/src/org/geometerplus/android/fbreader/library/LibrarySearchActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibrarySearchActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/library/LibrarySearchActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibrarySearchActivity.java
diff --git a/src/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java
diff --git a/src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
diff --git a/src/org/geometerplus/android/fbreader/libraryService/LibraryInterface.aidl b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/LibraryInterface.aidl
similarity index 100%
rename from src/org/geometerplus/android/fbreader/libraryService/LibraryInterface.aidl
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/LibraryInterface.aidl
diff --git a/src/org/geometerplus/android/fbreader/libraryService/LibraryService.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/LibraryService.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/LibraryService.java
diff --git a/src/org/geometerplus/android/fbreader/libraryService/PositionWithTimestamp.aidl b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/PositionWithTimestamp.aidl
similarity index 100%
rename from src/org/geometerplus/android/fbreader/libraryService/PositionWithTimestamp.aidl
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/PositionWithTimestamp.aidl
diff --git a/src/org/geometerplus/android/fbreader/libraryService/PositionWithTimestamp.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/PositionWithTimestamp.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/libraryService/PositionWithTimestamp.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/PositionWithTimestamp.java
diff --git a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
diff --git a/src/org/geometerplus/android/fbreader/libraryService/Util.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/Util.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/libraryService/Util.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/libraryService/Util.java
diff --git a/src/org/geometerplus/android/fbreader/network/AddCatalogMenuActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AddCatalogMenuActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/AddCatalogMenuActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AddCatalogMenuActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AuthenticationActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AuthenticationActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/AuthorisationMenuActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AuthorisationMenuActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/AuthorisationMenuActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AuthorisationMenuActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/BookDownloader.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloader.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/BookDownloader.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloader.java
diff --git a/src/org/geometerplus/android/fbreader/network/BookDownloaderInterface.aidl b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderInterface.aidl
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/BookDownloaderInterface.aidl
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderInterface.aidl
diff --git a/src/org/geometerplus/android/fbreader/network/BookDownloaderService.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderService.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderService.java
diff --git a/src/org/geometerplus/android/fbreader/network/BookDownloaderServiceConnection.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderServiceConnection.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/BookDownloaderServiceConnection.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderServiceConnection.java
diff --git a/src/org/geometerplus/android/fbreader/network/BuyBooksActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BuyBooksActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/BuyBooksActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BuyBooksActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/CatalogManagerActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/CatalogManagerActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/CatalogManagerActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/CatalogManagerActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/ListenerCallback.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/ListenerCallback.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/ListenerCallback.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/ListenerCallback.java
diff --git a/src/org/geometerplus/android/fbreader/network/MenuActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/MenuActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/MenuActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/MenuActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryAdapter.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryAdapter.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/NetworkLibraryAdapter.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryAdapter.java
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryPrimaryActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryPrimaryActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/NetworkLibraryPrimaryActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryPrimaryActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibrarySecondaryActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibrarySecondaryActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/NetworkLibrarySecondaryActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibrarySecondaryActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
diff --git a/src/org/geometerplus/android/fbreader/network/TopupMenuActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/TopupMenuActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/TopupMenuActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/TopupMenuActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/UserRegistrationConstants.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/UserRegistrationConstants.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/UserRegistrationConstants.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/UserRegistrationConstants.java
diff --git a/src/org/geometerplus/android/fbreader/network/Util.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/Util.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/Util.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/Util.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/Action.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/Action.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/Action.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/Action.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/ActionCode.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ActionCode.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/ActionCode.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ActionCode.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/AddCustomCatalogAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/AddCustomCatalogAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/AddCustomCatalogAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/AddCustomCatalogAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/BookAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/BookAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/BookAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/BookAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/BuyBasketBooksAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/BuyBasketBooksAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/BuyBasketBooksAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/BuyBasketBooksAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/CatalogAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/CatalogAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/CatalogAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/CatalogAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/ClearBasketAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ClearBasketAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/ClearBasketAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ClearBasketAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/DisableCatalogAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/DisableCatalogAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/DisableCatalogAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/DisableCatalogAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/EditCustomCatalogAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/EditCustomCatalogAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/EditCustomCatalogAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/EditCustomCatalogAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/ManageCatalogsAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ManageCatalogsAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/ManageCatalogsAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ManageCatalogsAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/OpenCatalogAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/OpenCatalogAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/OpenCatalogAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/OpenCatalogAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/OpenInBrowserAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/OpenInBrowserAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/OpenInBrowserAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/OpenInBrowserAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/OpenRootAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/OpenRootAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/OpenRootAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/OpenRootAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/RemoveCustomCatalogAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/RemoveCustomCatalogAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/RemoveCustomCatalogAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/RemoveCustomCatalogAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/RootAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/RootAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/RootAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/RootAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/RunSearchAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/RunSearchAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/ShowBookInfoAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ShowBookInfoAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/ShowBookInfoAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ShowBookInfoAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/SignInAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/SignInAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/SignInAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/SignInAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/SignOutAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/SignOutAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/SignOutAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/SignOutAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/SignUpAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/SignUpAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/SignUpAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/SignUpAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/action/TopupAction.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/TopupAction.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/action/TopupAction.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/TopupAction.java
diff --git a/src/org/geometerplus/android/fbreader/network/auth/ActivityNetworkContext.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/ActivityNetworkContext.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/auth/ActivityNetworkContext.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/ActivityNetworkContext.java
diff --git a/src/org/geometerplus/android/fbreader/network/auth/AndroidNetworkContext.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/AndroidNetworkContext.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/auth/AndroidNetworkContext.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/AndroidNetworkContext.java
diff --git a/src/org/geometerplus/android/fbreader/network/auth/ServiceNetworkContext.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/ServiceNetworkContext.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/auth/ServiceNetworkContext.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/ServiceNetworkContext.java
diff --git a/src/org/geometerplus/android/fbreader/network/auth/WebAuthorisationScreen.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/WebAuthorisationScreen.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/auth/WebAuthorisationScreen.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/WebAuthorisationScreen.java
diff --git a/src/org/geometerplus/android/fbreader/network/litres/AutoRegistrationActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/AutoRegistrationActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/litres/AutoRegistrationActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/AutoRegistrationActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/litres/RegistrationActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/RegistrationActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/litres/RegistrationActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/RegistrationActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/litres/RegistrationUtils.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/RegistrationUtils.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/litres/RegistrationUtils.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/RegistrationUtils.java
diff --git a/src/org/geometerplus/android/fbreader/network/litres/UserRegistrationActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/UserRegistrationActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/litres/UserRegistrationActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/UserRegistrationActivity.java
diff --git a/src/org/geometerplus/android/fbreader/network/litres/UserRegistrationConstants.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/UserRegistrationConstants.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/network/litres/UserRegistrationConstants.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/litres/UserRegistrationConstants.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/AnimationSpeedPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/AnimationSpeedPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/AnimationSpeedPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/AnimationSpeedPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/BatteryLevelToTurnScreenOffPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/BatteryLevelToTurnScreenOffPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/BatteryLevelToTurnScreenOffPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/BatteryLevelToTurnScreenOffPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ColorPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ColorPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ColorPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ColorPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/FontPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/FontPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/FontPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/FontPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/FontStylePreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/FontStylePreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/FontStylePreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/FontStylePreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/InfoPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/InfoPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/InfoPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/InfoPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/LanguagePreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/LanguagePreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/LanguagePreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/LanguagePreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceSet.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/PreferenceSet.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/PreferenceSet.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/PreferenceSet.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ReloadablePreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ReloadablePreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ReloadablePreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ReloadablePreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/StringPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/StringPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/StringPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/StringPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ThirdPartyLibrariesPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ThirdPartyLibrariesPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ThirdPartyLibrariesPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ThirdPartyLibrariesPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/UrlPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/UrlPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/UrlPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/UrlPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLChoicePreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLChoicePreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLChoicePreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLChoicePreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLEnumPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLEnumPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLEnumPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLEnumPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLIntegerRangePreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLIntegerRangePreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLIntegerRangePreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLIntegerRangePreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLStringChoicePreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLStringChoicePreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLStringChoicePreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLStringChoicePreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLStringListPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLStringListPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLStringListPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLStringListPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/background/BackgroundPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/background/BackgroundPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/background/BackgroundPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/background/BackgroundPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/background/Chooser.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/background/Chooser.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/background/Chooser.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/background/Chooser.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/background/PredefinedImages.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/background/PredefinedImages.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/background/PredefinedImages.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/background/PredefinedImages.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserCollection.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserCollection.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserCollection.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserMultiPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserMultiPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserMultiPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserMultiPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
diff --git a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserSinglePreference.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserSinglePreference.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserSinglePreference.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserSinglePreference.java
diff --git a/src/org/geometerplus/android/fbreader/sync/BookmarkSyncUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/BookmarkSyncUtil.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/sync/BookmarkSyncUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/BookmarkSyncUtil.java
diff --git a/src/org/geometerplus/android/fbreader/sync/MissingBookActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/MissingBookActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/sync/MissingBookActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/MissingBookActivity.java
diff --git a/src/org/geometerplus/android/fbreader/sync/SyncNetworkContext.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/SyncNetworkContext.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/sync/SyncNetworkContext.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/SyncNetworkContext.java
diff --git a/src/org/geometerplus/android/fbreader/sync/SyncOperations.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/SyncOperations.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/sync/SyncOperations.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/SyncOperations.java
diff --git a/src/org/geometerplus/android/fbreader/sync/SyncService.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/SyncService.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/sync/SyncService.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/SyncService.java
diff --git a/src/org/geometerplus/android/fbreader/sync/SynchronizationDisabledException.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/SynchronizationDisabledException.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/sync/SynchronizationDisabledException.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/sync/SynchronizationDisabledException.java
diff --git a/src/org/geometerplus/android/fbreader/tips/TipsActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/tips/TipsActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/tips/TipsActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/tips/TipsActivity.java
diff --git a/src/org/geometerplus/android/fbreader/tree/TreeActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/tree/TreeActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeActivity.java
diff --git a/src/org/geometerplus/android/fbreader/tree/TreeAdapter.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeAdapter.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/tree/TreeAdapter.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeAdapter.java
diff --git a/src/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java
diff --git a/src/org/geometerplus/android/fbreader/util/SimpleDialogActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/util/SimpleDialogActivity.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/util/SimpleDialogActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/fbreader/util/SimpleDialogActivity.java
diff --git a/src/org/geometerplus/android/util/DeviceType.java b/fbreader/app/src/main/java/org/geometerplus/android/util/DeviceType.java
similarity index 100%
rename from src/org/geometerplus/android/util/DeviceType.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/DeviceType.java
diff --git a/src/org/geometerplus/android/util/EditAuthorsDialogActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/util/EditAuthorsDialogActivity.java
similarity index 100%
rename from src/org/geometerplus/android/util/EditAuthorsDialogActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/EditAuthorsDialogActivity.java
diff --git a/src/org/geometerplus/android/util/EditListDialogActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/util/EditListDialogActivity.java
similarity index 100%
rename from src/org/geometerplus/android/util/EditListDialogActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/EditListDialogActivity.java
diff --git a/src/org/geometerplus/android/util/EditTagsDialogActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/util/EditTagsDialogActivity.java
similarity index 100%
rename from src/org/geometerplus/android/util/EditTagsDialogActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/EditTagsDialogActivity.java
diff --git a/src/org/geometerplus/android/util/FileChooserUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/FileChooserUtil.java
similarity index 100%
rename from src/org/geometerplus/android/util/FileChooserUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/FileChooserUtil.java
diff --git a/src/org/geometerplus/android/util/FolderListDialogActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/util/FolderListDialogActivity.java
similarity index 100%
rename from src/org/geometerplus/android/util/FolderListDialogActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/FolderListDialogActivity.java
diff --git a/src/org/geometerplus/android/util/NativeLibraryUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/NativeLibraryUtil.java
similarity index 100%
rename from src/org/geometerplus/android/util/NativeLibraryUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/NativeLibraryUtil.java
diff --git a/src/org/geometerplus/android/util/PackageUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/PackageUtil.java
similarity index 100%
rename from src/org/geometerplus/android/util/PackageUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/PackageUtil.java
diff --git a/src/org/geometerplus/android/util/SQLiteUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/SQLiteUtil.java
similarity index 100%
rename from src/org/geometerplus/android/util/SQLiteUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/SQLiteUtil.java
diff --git a/src/org/geometerplus/android/util/SearchDialogUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/SearchDialogUtil.java
similarity index 100%
rename from src/org/geometerplus/android/util/SearchDialogUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/SearchDialogUtil.java
diff --git a/src/org/geometerplus/android/util/UIMessageUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/UIMessageUtil.java
similarity index 100%
rename from src/org/geometerplus/android/util/UIMessageUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/UIMessageUtil.java
diff --git a/src/org/geometerplus/android/util/UIUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/UIUtil.java
similarity index 100%
rename from src/org/geometerplus/android/util/UIUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/UIUtil.java
diff --git a/src/org/geometerplus/android/util/ViewUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/ViewUtil.java
similarity index 100%
rename from src/org/geometerplus/android/util/ViewUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/ViewUtil.java
diff --git a/src/org/geometerplus/android/util/eink/EInkUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/eink/EInkUtil.java
similarity index 100%
rename from src/org/geometerplus/android/util/eink/EInkUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/eink/EInkUtil.java
diff --git a/src/org/geometerplus/android/util/eink/Nook2Util.java b/fbreader/app/src/main/java/org/geometerplus/android/util/eink/Nook2Util.java
similarity index 100%
rename from src/org/geometerplus/android/util/eink/Nook2Util.java
rename to fbreader/app/src/main/java/org/geometerplus/android/util/eink/Nook2Util.java
diff --git a/src/org/geometerplus/fbreader/Paths.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/Paths.java
similarity index 100%
rename from src/org/geometerplus/fbreader/Paths.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/Paths.java
diff --git a/src/org/geometerplus/fbreader/book/AbstractBook.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/AbstractBook.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/AbstractBook.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/AbstractBook.java
diff --git a/src/org/geometerplus/fbreader/book/AbstractBookCollection.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/AbstractBookCollection.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/AbstractBookCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/AbstractBookCollection.java
diff --git a/src/org/geometerplus/fbreader/book/AbstractSerializer.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/AbstractSerializer.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/AbstractSerializer.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/AbstractSerializer.java
diff --git a/src/org/geometerplus/fbreader/book/Author.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/Author.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/Author.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/Author.java
diff --git a/src/org/geometerplus/fbreader/book/Book.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/Book.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/Book.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/Book.java
diff --git a/src/org/geometerplus/fbreader/book/BookCollection.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookCollection.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/BookCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookCollection.java
diff --git a/src/org/geometerplus/fbreader/book/BookEvent.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookEvent.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/BookEvent.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookEvent.java
diff --git a/src/org/geometerplus/fbreader/book/BookMergeHelper.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookMergeHelper.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/BookMergeHelper.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookMergeHelper.java
diff --git a/src/org/geometerplus/fbreader/book/BookQuery.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookQuery.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/BookQuery.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookQuery.java
diff --git a/src/org/geometerplus/fbreader/book/BookUtil.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookUtil.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/BookUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookUtil.java
diff --git a/src/org/geometerplus/fbreader/book/Bookmark.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/Bookmark.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/Bookmark.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/Bookmark.java
diff --git a/src/org/geometerplus/fbreader/book/BookmarkQuery.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookmarkQuery.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/BookmarkQuery.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookmarkQuery.java
diff --git a/src/org/geometerplus/fbreader/book/BookmarkUtil.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookmarkUtil.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/BookmarkUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/BookmarkUtil.java
diff --git a/src/org/geometerplus/fbreader/book/BooksDatabase.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/BooksDatabase.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/BooksDatabase.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/BooksDatabase.java
diff --git a/src/org/geometerplus/fbreader/book/CoverUtil.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/CoverUtil.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/CoverUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/CoverUtil.java
diff --git a/src/org/geometerplus/fbreader/book/DbBook.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/DbBook.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/DbBook.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/DbBook.java
diff --git a/src/org/geometerplus/fbreader/book/DuplicateResolver.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/DuplicateResolver.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/DuplicateResolver.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/DuplicateResolver.java
diff --git a/src/org/geometerplus/fbreader/book/FileInfo.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/FileInfo.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/FileInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/FileInfo.java
diff --git a/src/org/geometerplus/fbreader/book/FileInfoSet.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/FileInfoSet.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/FileInfoSet.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/FileInfoSet.java
diff --git a/src/org/geometerplus/fbreader/book/Filter.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/Filter.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/Filter.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/Filter.java
diff --git a/src/org/geometerplus/fbreader/book/HighlightingStyle.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/HighlightingStyle.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/HighlightingStyle.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/HighlightingStyle.java
diff --git a/src/org/geometerplus/fbreader/book/IBookCollection.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/IBookCollection.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/IBookCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/IBookCollection.java
diff --git a/src/org/geometerplus/fbreader/book/Label.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/Label.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/Label.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/Label.java
diff --git a/src/org/geometerplus/fbreader/book/SerializerUtil.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/SerializerUtil.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/SerializerUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/SerializerUtil.java
diff --git a/src/org/geometerplus/fbreader/book/Series.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/Series.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/Series.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/Series.java
diff --git a/src/org/geometerplus/fbreader/book/SeriesInfo.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/SeriesInfo.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/SeriesInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/SeriesInfo.java
diff --git a/src/org/geometerplus/fbreader/book/Tag.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/Tag.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/Tag.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/Tag.java
diff --git a/src/org/geometerplus/fbreader/book/UID.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/UID.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/UID.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/UID.java
diff --git a/src/org/geometerplus/fbreader/book/XMLSerializer.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/XMLSerializer.java
similarity index 100%
rename from src/org/geometerplus/fbreader/book/XMLSerializer.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/book/XMLSerializer.java
diff --git a/src/org/geometerplus/fbreader/bookmodel/BookModel.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/bookmodel/BookModel.java
similarity index 100%
rename from src/org/geometerplus/fbreader/bookmodel/BookModel.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/bookmodel/BookModel.java
diff --git a/src/org/geometerplus/fbreader/bookmodel/FBHyperlinkType.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/bookmodel/FBHyperlinkType.java
similarity index 100%
rename from src/org/geometerplus/fbreader/bookmodel/FBHyperlinkType.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/bookmodel/FBHyperlinkType.java
diff --git a/src/org/geometerplus/fbreader/bookmodel/FBTextKind.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/bookmodel/FBTextKind.java
similarity index 100%
rename from src/org/geometerplus/fbreader/bookmodel/FBTextKind.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/bookmodel/FBTextKind.java
diff --git a/src/org/geometerplus/fbreader/bookmodel/TOCTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/bookmodel/TOCTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/bookmodel/TOCTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/bookmodel/TOCTree.java
diff --git a/src/org/geometerplus/fbreader/fbreader/ActionCode.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/ActionCode.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/ActionCode.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/ActionCode.java
diff --git a/src/org/geometerplus/fbreader/fbreader/BookElement.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/BookElement.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/BookElement.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/BookElement.java
diff --git a/src/org/geometerplus/fbreader/fbreader/BookElementManager.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/BookElementManager.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/BookElementManager.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/BookElementManager.java
diff --git a/src/org/geometerplus/fbreader/fbreader/BookmarkHighlighting.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/BookmarkHighlighting.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/BookmarkHighlighting.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/BookmarkHighlighting.java
diff --git a/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/DictionaryHighlighting.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/DictionaryHighlighting.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/DictionaryHighlighting.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/DictionaryHighlighting.java
diff --git a/src/org/geometerplus/fbreader/fbreader/DurationEnum.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/DurationEnum.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/DurationEnum.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/DurationEnum.java
diff --git a/src/org/geometerplus/fbreader/fbreader/ExitAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/ExitAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/ExitAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/ExitAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/FBAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FBAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/FBAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FBAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FBReaderApp.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FBReaderApp.java
diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FBView.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/FBView.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FBView.java
diff --git a/src/org/geometerplus/fbreader/fbreader/FindNextAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FindNextAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/FindNextAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FindNextAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FindPreviousAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FindPreviousAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/MoveCursorAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/MoveCursorAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/MoveCursorAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/MoveCursorAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/SelectionClearAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/SelectionClearAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/SelectionClearAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/SelectionClearAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/TapZoneMap.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/TapZoneMap.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/TapZoneMap.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/TapZoneMap.java
diff --git a/src/org/geometerplus/fbreader/fbreader/TextBuildTraverser.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/TextBuildTraverser.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/TextBuildTraverser.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/TextBuildTraverser.java
diff --git a/src/org/geometerplus/fbreader/fbreader/TurnPageAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/TurnPageAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/TurnPageAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/TurnPageAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/VolumeKeyTurnPageAction.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/VolumeKeyTurnPageAction.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/VolumeKeyTurnPageAction.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/VolumeKeyTurnPageAction.java
diff --git a/src/org/geometerplus/fbreader/fbreader/WallpapersUtil.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/WallpapersUtil.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/WallpapersUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/WallpapersUtil.java
diff --git a/src/org/geometerplus/fbreader/fbreader/WordCountTraverser.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/WordCountTraverser.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/WordCountTraverser.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/WordCountTraverser.java
diff --git a/src/org/geometerplus/fbreader/fbreader/options/CancelMenuHelper.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/CancelMenuHelper.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/options/CancelMenuHelper.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/CancelMenuHelper.java
diff --git a/src/org/geometerplus/fbreader/fbreader/options/ColorProfile.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/ColorProfile.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/options/ColorProfile.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/ColorProfile.java
diff --git a/src/org/geometerplus/fbreader/fbreader/options/EInkOptions.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/EInkOptions.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/options/EInkOptions.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/EInkOptions.java
diff --git a/src/org/geometerplus/fbreader/fbreader/options/FooterOptions.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/FooterOptions.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/options/FooterOptions.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/FooterOptions.java
diff --git a/src/org/geometerplus/fbreader/fbreader/options/ImageOptions.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/ImageOptions.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/options/ImageOptions.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/ImageOptions.java
diff --git a/src/org/geometerplus/fbreader/fbreader/options/MiscOptions.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/MiscOptions.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/options/MiscOptions.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/MiscOptions.java
diff --git a/src/org/geometerplus/fbreader/fbreader/options/PageTurningOptions.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/PageTurningOptions.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/options/PageTurningOptions.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/PageTurningOptions.java
diff --git a/src/org/geometerplus/fbreader/fbreader/options/SyncOptions.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/SyncOptions.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/options/SyncOptions.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/SyncOptions.java
diff --git a/src/org/geometerplus/fbreader/fbreader/options/ViewOptions.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/ViewOptions.java
similarity index 100%
rename from src/org/geometerplus/fbreader/fbreader/options/ViewOptions.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/options/ViewOptions.java
diff --git a/src/org/geometerplus/fbreader/formats/BookReadingException.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/BookReadingException.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/BookReadingException.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/BookReadingException.java
diff --git a/src/org/geometerplus/fbreader/formats/BuiltinFormatPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/BuiltinFormatPlugin.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/BuiltinFormatPlugin.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/BuiltinFormatPlugin.java
diff --git a/src/org/geometerplus/fbreader/formats/ComicBookPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ComicBookPlugin.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/ComicBookPlugin.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ComicBookPlugin.java
diff --git a/src/org/geometerplus/fbreader/formats/DjVuPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/DjVuPlugin.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/DjVuPlugin.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/DjVuPlugin.java
diff --git a/src/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java
diff --git a/src/org/geometerplus/fbreader/formats/FormatPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/FormatPlugin.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/FormatPlugin.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/FormatPlugin.java
diff --git a/src/org/geometerplus/fbreader/formats/IFormatPluginCollection.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/IFormatPluginCollection.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/IFormatPluginCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/IFormatPluginCollection.java
diff --git a/src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
diff --git a/src/org/geometerplus/fbreader/formats/PDFPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PDFPlugin.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/PDFPlugin.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PDFPlugin.java
diff --git a/src/org/geometerplus/fbreader/formats/PluginCollection.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PluginCollection.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/PluginCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PluginCollection.java
diff --git a/src/org/geometerplus/fbreader/formats/PluginImage.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PluginImage.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/PluginImage.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PluginImage.java
diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2AnnotationReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/fb2/FB2AnnotationReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/fb2/FB2AnnotationReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/fb2/FB2AnnotationReader.java
diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2NativePlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/fb2/FB2NativePlugin.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/fb2/FB2NativePlugin.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/fb2/FB2NativePlugin.java
diff --git a/src/org/geometerplus/fbreader/formats/oeb/ContainerFileReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/oeb/ContainerFileReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/oeb/ContainerFileReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/oeb/ContainerFileReader.java
diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBAnnotationReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/oeb/OEBAnnotationReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/oeb/OEBAnnotationReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/oeb/OEBAnnotationReader.java
diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBNativePlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/oeb/OEBNativePlugin.java
similarity index 100%
rename from src/org/geometerplus/fbreader/formats/oeb/OEBNativePlugin.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/formats/oeb/OEBNativePlugin.java
diff --git a/src/org/geometerplus/fbreader/library/AuthorListTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/AuthorListTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/AuthorListTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/AuthorListTree.java
diff --git a/src/org/geometerplus/fbreader/library/AuthorTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/AuthorTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/AuthorTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/AuthorTree.java
diff --git a/src/org/geometerplus/fbreader/library/BookInSeriesTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/BookInSeriesTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/BookInSeriesTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/BookInSeriesTree.java
diff --git a/src/org/geometerplus/fbreader/library/BookTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/BookTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/BookTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/BookTree.java
diff --git a/src/org/geometerplus/fbreader/library/BookWithAuthorsTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/BookWithAuthorsTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/BookWithAuthorsTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/BookWithAuthorsTree.java
diff --git a/src/org/geometerplus/fbreader/library/ExternalViewTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/ExternalViewTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/ExternalViewTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/ExternalViewTree.java
diff --git a/src/org/geometerplus/fbreader/library/FavoritesTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FavoritesTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/FavoritesTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/FavoritesTree.java
diff --git a/src/org/geometerplus/fbreader/library/FileFirstLevelTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileFirstLevelTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/FileFirstLevelTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileFirstLevelTree.java
diff --git a/src/org/geometerplus/fbreader/library/FileTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/FileTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java
diff --git a/src/org/geometerplus/fbreader/library/FilteredTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FilteredTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/FilteredTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/FilteredTree.java
diff --git a/src/org/geometerplus/fbreader/library/FirstLevelTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FirstLevelTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/FirstLevelTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/FirstLevelTree.java
diff --git a/src/org/geometerplus/fbreader/library/LibraryTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/LibraryTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/LibraryTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/LibraryTree.java
diff --git a/src/org/geometerplus/fbreader/library/RecentBooksTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/RecentBooksTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/RecentBooksTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/RecentBooksTree.java
diff --git a/src/org/geometerplus/fbreader/library/RootTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/RootTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/RootTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/RootTree.java
diff --git a/src/org/geometerplus/fbreader/library/SearchResultsTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SearchResultsTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/SearchResultsTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/SearchResultsTree.java
diff --git a/src/org/geometerplus/fbreader/library/SeriesListTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SeriesListTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/SeriesListTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/SeriesListTree.java
diff --git a/src/org/geometerplus/fbreader/library/SeriesTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SeriesTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/SeriesTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/SeriesTree.java
diff --git a/src/org/geometerplus/fbreader/library/SyncLabelTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncLabelTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/SyncLabelTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncLabelTree.java
diff --git a/src/org/geometerplus/fbreader/library/SyncTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/SyncTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncTree.java
diff --git a/src/org/geometerplus/fbreader/library/TagListTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/TagListTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/TagListTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/TagListTree.java
diff --git a/src/org/geometerplus/fbreader/library/TagTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/TagTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/TagTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/TagTree.java
diff --git a/src/org/geometerplus/fbreader/library/TitleListTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/TitleListTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/TitleListTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/TitleListTree.java
diff --git a/src/org/geometerplus/fbreader/library/TitleTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/TitleTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/library/TitleTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/library/TitleTree.java
diff --git a/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/AbstractNetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/AbstractNetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/AbstractNetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/AllCatalogsSearchItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/AllCatalogsSearchItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/AllCatalogsSearchItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/AllCatalogsSearchItem.java
diff --git a/src/org/geometerplus/fbreader/network/AlreadyPurchasedException.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/AlreadyPurchasedException.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/AlreadyPurchasedException.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/AlreadyPurchasedException.java
diff --git a/src/org/geometerplus/fbreader/network/Base64EncodedImage.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/Base64EncodedImage.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/Base64EncodedImage.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/Base64EncodedImage.java
diff --git a/src/org/geometerplus/fbreader/network/BasketItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/BasketItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/BasketItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/BasketItem.java
diff --git a/src/org/geometerplus/fbreader/network/HtmlUtil.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/HtmlUtil.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/HtmlUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/HtmlUtil.java
diff --git a/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/ICustomNetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/ICustomNetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/ICustomNetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/INetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/INetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/INetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/INetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/IPredefinedNetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/IPredefinedNetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/IPredefinedNetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/IPredefinedNetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/ISyncNetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/ISyncNetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/ISyncNetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/ISyncNetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkBookItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkBookItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkBookItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkBookItem.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkBookItemComparator.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkBookItemComparator.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkCatalogItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkCatalogItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkCatalogItem.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkDatabase.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkDatabase.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkDatabase.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkDatabase.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkException.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkException.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkException.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkException.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkImage.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkImage.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkImage.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkImage.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkItem.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkLibrary.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkLibrary.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkLibrary.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkOperationData.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkOperationData.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkOperationData.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkOperationData.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkTree.java
diff --git a/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java
diff --git a/src/org/geometerplus/fbreader/network/RecentCatalogItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/RecentCatalogItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/RecentCatalogItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/RecentCatalogItem.java
diff --git a/src/org/geometerplus/fbreader/network/RecentCatalogListItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/RecentCatalogListItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/RecentCatalogListItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/RecentCatalogListItem.java
diff --git a/src/org/geometerplus/fbreader/network/SearchItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/SearchItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/SearchItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/SearchItem.java
diff --git a/src/org/geometerplus/fbreader/network/SingleCatalogSearchItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/SingleCatalogSearchItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/SingleCatalogSearchItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/SingleCatalogSearchItem.java
diff --git a/src/org/geometerplus/fbreader/network/TopUpItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/TopUpItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/TopUpItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/TopUpItem.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMAuthor.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMAuthor.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMAuthor.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMAuthor.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMCategory.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMCategory.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMCategory.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMCategory.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMCommonAttributes.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMCommonAttributes.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMCommonAttributes.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMCommonAttributes.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMConstants.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMConstants.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMConstants.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMConstants.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMContributor.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMContributor.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMContributor.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMContributor.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMDateConstruct.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMDateConstruct.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMDateConstruct.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMDateConstruct.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMEntry.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMEntry.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMEntry.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMEntry.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMFeedHandler.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMFeedHandler.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMFeedHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMFeedHandler.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMFeedMetadata.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMFeedMetadata.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMFeedMetadata.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMFeedMetadata.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMGenerator.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMGenerator.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMGenerator.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMGenerator.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMIcon.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMIcon.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMIcon.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMIcon.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMId.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMId.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMId.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMId.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMLink.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMLogo.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMLogo.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMLogo.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMLogo.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMPersonConstruct.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMPersonConstruct.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMPersonConstruct.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMPersonConstruct.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMPublished.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMPublished.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMPublished.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMPublished.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMUpdated.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMUpdated.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMUpdated.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMUpdated.java
diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/atom/AbstractATOMFeedHandler.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/AbstractATOMFeedHandler.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/AbstractATOMFeedHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/AbstractATOMFeedHandler.java
diff --git a/src/org/geometerplus/fbreader/network/atom/FormattedBuffer.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/FormattedBuffer.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/atom/FormattedBuffer.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/atom/FormattedBuffer.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenre.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResGenre.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResGenre.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResGenre.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResLoginXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResLoginXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResLoginXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResLoginXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResNetworkRequest.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResNetworkRequest.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResNetworkRequest.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResNetworkRequest.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResPasswordRecoveryXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResPasswordRecoveryXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResPasswordRecoveryXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResPasswordRecoveryXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResPurchaseXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResPurchaseXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResPurchaseXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResPurchaseXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResRegisterUserXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResRegisterUserXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResRegisterUserXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResRegisterUserXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResUtil.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResUtil.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResUtil.java
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/opds/AbstractOPDSFeedHandler.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/AbstractOPDSFeedHandler.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/AbstractOPDSFeedHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/AbstractOPDSFeedHandler.java
diff --git a/src/org/geometerplus/fbreader/network/opds/DCDate.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/DCDate.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/DCDate.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/DCDate.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSBasketItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSBasketItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSBasketItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSBasketItem.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSBookItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSBookItem.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogInfoHandler.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSCatalogInfoHandler.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSCatalogInfoHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSCatalogInfoHandler.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSConstants.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSConstants.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSConstants.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSConstants.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCustomNetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSCustomNetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSCustomNetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSCustomNetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSEntry.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSEntry.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSEntry.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSEntry.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSFeedMetadata.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSFeedMetadata.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSFeedMetadata.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSFeedMetadata.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLink.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSPredefinedNetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSPredefinedNetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSPredefinedNetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSPredefinedNetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSSyncNetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSSyncNetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSSyncNetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSSyncNetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OpenSearchDescription.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OpenSearchDescription.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OpenSearchDescription.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OpenSearchDescription.java
diff --git a/src/org/geometerplus/fbreader/network/opds/OpenSearchXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OpenSearchXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/OpenSearchXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OpenSearchXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/opds/RelationAlias.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/RelationAlias.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/RelationAlias.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/RelationAlias.java
diff --git a/src/org/geometerplus/fbreader/network/opds/SimpleOPDSFeedHandler.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/SimpleOPDSFeedHandler.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/SimpleOPDSFeedHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/SimpleOPDSFeedHandler.java
diff --git a/src/org/geometerplus/fbreader/network/opds/URLRewritingRule.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/URLRewritingRule.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/opds/URLRewritingRule.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/URLRewritingRule.java
diff --git a/src/org/geometerplus/fbreader/network/rss/AbstractRSSChannelHandler.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/AbstractRSSChannelHandler.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/AbstractRSSChannelHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/AbstractRSSChannelHandler.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSAuthor.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSAuthor.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSAuthor.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSAuthor.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSBookItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSBookItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSBookItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSBookItem.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSCatalogItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSCatalogItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSCatalogItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSCatalogItem.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSCategory.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSCategory.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSCategory.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSCategory.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSChannelHandler.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSChannelHandler.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSChannelHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSChannelHandler.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSChannelMetadata.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSChannelMetadata.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSChannelMetadata.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSChannelMetadata.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSId.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSId.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSId.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSId.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSItem.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSItem.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSItem.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSItem.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSLink.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSXMLReader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/rss/RSSXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/rss/RSSXMLReader.java
diff --git a/src/org/geometerplus/fbreader/network/sync/SyncData.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/sync/SyncData.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/sync/SyncData.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/sync/SyncData.java
diff --git a/src/org/geometerplus/fbreader/network/sync/SyncUtil.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/sync/SyncUtil.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/sync/SyncUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/sync/SyncUtil.java
diff --git a/src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/BasketCatalogTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/BasketCatalogTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/BasketCatalogTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/BasketCatalogTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/CatalogExpander.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/CatalogExpander.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/CatalogExpander.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/CatalogExpander.java
diff --git a/src/org/geometerplus/fbreader/network/tree/ManageCatalogsItemTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/ManageCatalogsItemTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/ManageCatalogsItemTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/ManageCatalogsItemTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkBookTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkBookTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkItemsLoader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkItemsLoader.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/NetworkItemsLoader.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkItemsLoader.java
diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkSeriesTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkSeriesTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/NetworkSeriesTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkSeriesTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java
diff --git a/src/org/geometerplus/fbreader/network/tree/RecentCatalogListTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/RecentCatalogListTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/RecentCatalogListTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/RecentCatalogListTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/RootTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/RootTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/RootTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/RootTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/SearchCatalogTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/SearchCatalogTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/SearchCatalogTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/SearchCatalogTree.java
diff --git a/src/org/geometerplus/fbreader/network/tree/Searcher.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/Searcher.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/Searcher.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/Searcher.java
diff --git a/src/org/geometerplus/fbreader/network/tree/TopUpTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/TopUpTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/tree/TopUpTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/TopUpTree.java
diff --git a/src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java
diff --git a/src/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java
diff --git a/src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java
diff --git a/src/org/geometerplus/fbreader/network/urlInfo/RelatedUrlInfo.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/RelatedUrlInfo.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/urlInfo/RelatedUrlInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/RelatedUrlInfo.java
diff --git a/src/org/geometerplus/fbreader/network/urlInfo/UrlInfo.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/UrlInfo.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/urlInfo/UrlInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/UrlInfo.java
diff --git a/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java
diff --git a/src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java
similarity index 100%
rename from src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java
diff --git a/src/org/geometerplus/fbreader/sort/TitledEntity.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java
similarity index 100%
rename from src/org/geometerplus/fbreader/sort/TitledEntity.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java
diff --git a/src/org/geometerplus/fbreader/tips/Tip.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/tips/Tip.java
similarity index 100%
rename from src/org/geometerplus/fbreader/tips/Tip.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/tips/Tip.java
diff --git a/src/org/geometerplus/fbreader/tips/TipsFeedHandler.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/tips/TipsFeedHandler.java
similarity index 100%
rename from src/org/geometerplus/fbreader/tips/TipsFeedHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/tips/TipsFeedHandler.java
diff --git a/src/org/geometerplus/fbreader/tips/TipsManager.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/tips/TipsManager.java
similarity index 100%
rename from src/org/geometerplus/fbreader/tips/TipsManager.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/tips/TipsManager.java
diff --git a/src/org/geometerplus/fbreader/tree/FBTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/tree/FBTree.java
similarity index 100%
rename from src/org/geometerplus/fbreader/tree/FBTree.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/tree/FBTree.java
diff --git a/src/org/geometerplus/fbreader/util/AutoTextSnippet.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/util/AutoTextSnippet.java
similarity index 100%
rename from src/org/geometerplus/fbreader/util/AutoTextSnippet.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/util/AutoTextSnippet.java
diff --git a/src/org/geometerplus/fbreader/util/EmptyTextSnippet.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/util/EmptyTextSnippet.java
similarity index 100%
rename from src/org/geometerplus/fbreader/util/EmptyTextSnippet.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/util/EmptyTextSnippet.java
diff --git a/src/org/geometerplus/fbreader/util/FixedTextSnippet.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/util/FixedTextSnippet.java
similarity index 100%
rename from src/org/geometerplus/fbreader/util/FixedTextSnippet.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/util/FixedTextSnippet.java
diff --git a/src/org/geometerplus/fbreader/util/TextSnippet.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/util/TextSnippet.java
similarity index 100%
rename from src/org/geometerplus/fbreader/util/TextSnippet.java
rename to fbreader/app/src/main/java/org/geometerplus/fbreader/util/TextSnippet.java
diff --git a/src/org/geometerplus/zlibrary/core/application/ZLApplication.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/application/ZLApplication.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/application/ZLApplication.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/application/ZLApplication.java
diff --git a/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java
diff --git a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
diff --git a/src/org/geometerplus/zlibrary/core/constants/XMLNamespaces.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/constants/XMLNamespaces.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/constants/XMLNamespaces.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/constants/XMLNamespaces.java
diff --git a/src/org/geometerplus/zlibrary/core/drm/EncryptionMethod.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/drm/EncryptionMethod.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/drm/EncryptionMethod.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/drm/EncryptionMethod.java
diff --git a/src/org/geometerplus/zlibrary/core/drm/FileEncryptionInfo.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/drm/FileEncryptionInfo.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/drm/FileEncryptionInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/drm/FileEncryptionInfo.java
diff --git a/src/org/geometerplus/zlibrary/core/drm/embedding/EmbeddingInputStream.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/drm/embedding/EmbeddingInputStream.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/drm/embedding/EmbeddingInputStream.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/drm/embedding/EmbeddingInputStream.java
diff --git a/src/org/geometerplus/zlibrary/core/encodings/AutoEncodingCollection.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/AutoEncodingCollection.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/encodings/AutoEncodingCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/AutoEncodingCollection.java
diff --git a/src/org/geometerplus/zlibrary/core/encodings/Encoding.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/Encoding.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/encodings/Encoding.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/Encoding.java
diff --git a/src/org/geometerplus/zlibrary/core/encodings/EncodingCollection.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/EncodingCollection.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/encodings/EncodingCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/EncodingCollection.java
diff --git a/src/org/geometerplus/zlibrary/core/encodings/EncodingConverter.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/EncodingConverter.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/encodings/EncodingConverter.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/EncodingConverter.java
diff --git a/src/org/geometerplus/zlibrary/core/encodings/FilteredEncodingCollection.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/FilteredEncodingCollection.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/encodings/FilteredEncodingCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/FilteredEncodingCollection.java
diff --git a/src/org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection.java
diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLArchiveEntryFile.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLArchiveEntryFile.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filesystem/ZLArchiveEntryFile.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLArchiveEntryFile.java
diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLFile.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLFile.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filesystem/ZLFile.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLFile.java
diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLPhysicalFile.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLPhysicalFile.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filesystem/ZLPhysicalFile.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLPhysicalFile.java
diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java
diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLZipEntryFile.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLZipEntryFile.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filesystem/ZLZipEntryFile.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/ZLZipEntryFile.java
diff --git a/src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarEntryFile.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarEntryFile.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarEntryFile.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarEntryFile.java
diff --git a/src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarHeader.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarHeader.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarHeader.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarHeader.java
diff --git a/src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarInputStream.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarInputStream.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarInputStream.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarInputStream.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileType.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileType.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/FileType.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileType.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeCBZ.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeCBZ.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/FileTypeCBZ.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeCBZ.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeCollection.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeCollection.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/FileTypeCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeCollection.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeDjVu.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeDjVu.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/FileTypeDjVu.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeDjVu.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeEpub.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeEpub.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/FileTypeEpub.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeEpub.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeFB2.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeFB2.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/FileTypeFB2.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeFB2.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeHtml.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeHtml.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/FileTypeHtml.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeHtml.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeMobipocket.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeMobipocket.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/FileTypeMobipocket.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypeMobipocket.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypePalm.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypePalm.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/FileTypePalm.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/FileTypePalm.java
diff --git a/src/org/geometerplus/zlibrary/core/filetypes/SimpleFileType.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/SimpleFileType.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/filetypes/SimpleFileType.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/filetypes/SimpleFileType.java
diff --git a/src/org/geometerplus/zlibrary/core/fonts/FileInfo.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/fonts/FileInfo.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/fonts/FileInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/fonts/FileInfo.java
diff --git a/src/org/geometerplus/zlibrary/core/fonts/FontEntry.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/fonts/FontEntry.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/fonts/FontEntry.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/fonts/FontEntry.java
diff --git a/src/org/geometerplus/zlibrary/core/fonts/FontManager.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/fonts/FontManager.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/fonts/FontManager.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/fonts/FontManager.java
diff --git a/src/org/geometerplus/zlibrary/core/image/ZLBase64EncodedImage.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLBase64EncodedImage.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/image/ZLBase64EncodedImage.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLBase64EncodedImage.java
diff --git a/src/org/geometerplus/zlibrary/core/image/ZLFileImage.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLFileImage.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/image/ZLFileImage.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLFileImage.java
diff --git a/src/org/geometerplus/zlibrary/core/image/ZLFileImageProxy.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLFileImageProxy.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/image/ZLFileImageProxy.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLFileImageProxy.java
diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImage.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImage.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/image/ZLImage.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImage.java
diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImageData.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImageData.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/image/ZLImageData.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImageData.java
diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImageManager.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImageManager.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/image/ZLImageManager.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImageManager.java
diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImageProxy.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImageProxy.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/image/ZLImageProxy.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImageProxy.java
diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImageSimpleProxy.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImageSimpleProxy.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/image/ZLImageSimpleProxy.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLImageSimpleProxy.java
diff --git a/src/org/geometerplus/zlibrary/core/image/ZLStreamImage.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLStreamImage.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/image/ZLStreamImage.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/image/ZLStreamImage.java
diff --git a/src/org/geometerplus/zlibrary/core/language/Language.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/language/Language.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/language/Language.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/language/Language.java
diff --git a/src/org/geometerplus/zlibrary/core/language/ZLLanguageUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/language/ZLLanguageUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/language/ZLLanguageUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/language/ZLLanguageUtil.java
diff --git a/src/org/geometerplus/zlibrary/core/library/ZLibrary.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/library/ZLibrary.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/library/ZLibrary.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/library/ZLibrary.java
diff --git a/src/org/geometerplus/zlibrary/core/money/Money.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/money/Money.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/money/Money.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/money/Money.java
diff --git a/src/org/geometerplus/zlibrary/core/money/MoneyException.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/money/MoneyException.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/money/MoneyException.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/money/MoneyException.java
diff --git a/src/org/geometerplus/zlibrary/core/network/BearerAuthenticationException.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/BearerAuthenticationException.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/BearerAuthenticationException.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/BearerAuthenticationException.java
diff --git a/src/org/geometerplus/zlibrary/core/network/CookieDatabase.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/CookieDatabase.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/CookieDatabase.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/CookieDatabase.java
diff --git a/src/org/geometerplus/zlibrary/core/network/JsonRequest.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/JsonRequest.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/JsonRequest.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/JsonRequest.java
diff --git a/src/org/geometerplus/zlibrary/core/network/JsonRequest2.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/JsonRequest2.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/JsonRequest2.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/JsonRequest2.java
diff --git a/src/org/geometerplus/zlibrary/core/network/QuietNetworkContext.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/QuietNetworkContext.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/QuietNetworkContext.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/QuietNetworkContext.java
diff --git a/src/org/geometerplus/zlibrary/core/network/ZLNetworkAuthenticationException.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkAuthenticationException.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/ZLNetworkAuthenticationException.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkAuthenticationException.java
diff --git a/src/org/geometerplus/zlibrary/core/network/ZLNetworkContext.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkContext.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/ZLNetworkContext.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkContext.java
diff --git a/src/org/geometerplus/zlibrary/core/network/ZLNetworkException.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkException.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/ZLNetworkException.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkException.java
diff --git a/src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java
diff --git a/src/org/geometerplus/zlibrary/core/network/ZLNetworkRequest.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkRequest.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/network/ZLNetworkRequest.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/network/ZLNetworkRequest.java
diff --git a/src/org/geometerplus/zlibrary/core/options/Config.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/Config.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/Config.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/Config.java
diff --git a/src/org/geometerplus/zlibrary/core/options/StringPair.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/StringPair.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/StringPair.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/StringPair.java
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLColorOption.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/ZLColorOption.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLColorOption.java
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLEnumOption.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLEnumOption.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/ZLEnumOption.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLEnumOption.java
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLOption.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLOption.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/ZLOption.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLOption.java
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLStringListOption.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLStringListOption.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/ZLStringListOption.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLStringListOption.java
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLStringOption.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLStringOption.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/options/ZLStringOption.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/options/ZLStringOption.java
diff --git a/src/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java
diff --git a/src/org/geometerplus/zlibrary/core/resources/ZLResource.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/resources/ZLResource.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/resources/ZLResource.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/resources/ZLResource.java
diff --git a/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java
diff --git a/src/org/geometerplus/zlibrary/core/tree/ZLTree.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/tree/ZLTree.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/tree/ZLTree.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/tree/ZLTree.java
diff --git a/src/org/geometerplus/zlibrary/core/util/Base64InputStream.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/Base64InputStream.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/Base64InputStream.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/Base64InputStream.java
diff --git a/src/org/geometerplus/zlibrary/core/util/BitmapUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/BitmapUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/BitmapUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/BitmapUtil.java
diff --git a/src/org/geometerplus/zlibrary/core/util/HexInputStream.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/HexInputStream.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/HexInputStream.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/HexInputStream.java
diff --git a/src/org/geometerplus/zlibrary/core/util/InputStreamHolder.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/InputStreamHolder.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/InputStreamHolder.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/InputStreamHolder.java
diff --git a/src/org/geometerplus/zlibrary/core/util/InputStreamWithOffset.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/InputStreamWithOffset.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/InputStreamWithOffset.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/InputStreamWithOffset.java
diff --git a/src/org/geometerplus/zlibrary/core/util/MergedInputStream.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/MergedInputStream.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/MergedInputStream.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/MergedInputStream.java
diff --git a/src/org/geometerplus/zlibrary/core/util/MimeType.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/MimeType.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/MimeType.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/MimeType.java
diff --git a/src/org/geometerplus/zlibrary/core/util/MiscUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/MiscUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/MiscUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/MiscUtil.java
diff --git a/src/org/geometerplus/zlibrary/core/util/RationalNumber.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/RationalNumber.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/RationalNumber.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/RationalNumber.java
diff --git a/src/org/geometerplus/zlibrary/core/util/SliceInputStream.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/SliceInputStream.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/SliceInputStream.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/SliceInputStream.java
diff --git a/src/org/geometerplus/zlibrary/core/util/SystemInfo.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/SystemInfo.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/SystemInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/SystemInfo.java
diff --git a/src/org/geometerplus/zlibrary/core/util/XmlUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/XmlUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/XmlUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/XmlUtil.java
diff --git a/src/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java
diff --git a/src/org/geometerplus/zlibrary/core/util/ZLBoolean3.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLBoolean3.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/ZLBoolean3.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLBoolean3.java
diff --git a/src/org/geometerplus/zlibrary/core/util/ZLColor.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLColor.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/ZLColor.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLColor.java
diff --git a/src/org/geometerplus/zlibrary/core/util/ZLNetworkUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLNetworkUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/ZLNetworkUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLNetworkUtil.java
diff --git a/src/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java
diff --git a/src/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java
diff --git a/src/org/geometerplus/zlibrary/core/util/ZLTTFInfo.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLTTFInfo.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/ZLTTFInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLTTFInfo.java
diff --git a/src/org/geometerplus/zlibrary/core/util/ZLTTFInfoDetector.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLTTFInfoDetector.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/util/ZLTTFInfoDetector.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/util/ZLTTFInfoDetector.java
diff --git a/src/org/geometerplus/zlibrary/core/view/DummyPaintContext.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/DummyPaintContext.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/view/DummyPaintContext.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/DummyPaintContext.java
diff --git a/src/org/geometerplus/zlibrary/core/view/HorizontalConvexHull.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/HorizontalConvexHull.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/view/HorizontalConvexHull.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/HorizontalConvexHull.java
diff --git a/src/org/geometerplus/zlibrary/core/view/Hull.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/Hull.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/view/Hull.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/Hull.java
diff --git a/src/org/geometerplus/zlibrary/core/view/SelectionCursor.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/SelectionCursor.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/view/SelectionCursor.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/SelectionCursor.java
diff --git a/src/org/geometerplus/zlibrary/core/view/UnionHull.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/UnionHull.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/view/UnionHull.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/UnionHull.java
diff --git a/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/ZLPaintContext.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/ZLPaintContext.java
diff --git a/src/org/geometerplus/zlibrary/core/view/ZLView.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/ZLView.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/view/ZLView.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/ZLView.java
diff --git a/src/org/geometerplus/zlibrary/core/view/ZLViewEnums.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/ZLViewEnums.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/view/ZLViewEnums.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/ZLViewEnums.java
diff --git a/src/org/geometerplus/zlibrary/core/view/ZLViewWidget.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/ZLViewWidget.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/view/ZLViewWidget.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/view/ZLViewWidget.java
diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLDTDParser.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLDTDParser.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/xml/ZLDTDParser.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLDTDParser.java
diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLMutableString.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLMutableString.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/xml/ZLMutableString.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLMutableString.java
diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLStringMap.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLStringMap.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/xml/ZLStringMap.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLStringMap.java
diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java
diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java
diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java
diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java
diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java
diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java
diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java
diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java
diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java
diff --git a/src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/CachedCharStorage.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/CachedCharStorage.java
diff --git a/src/org/geometerplus/zlibrary/text/model/CachedCharStorageException.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/CachedCharStorageException.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/CachedCharStorageException.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/CachedCharStorageException.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ExtensionEntry.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ExtensionEntry.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ExtensionEntry.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ExtensionEntry.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLImageEntry.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLImageEntry.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLImageEntry.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLImageEntry.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextCSSStyleEntry.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextCSSStyleEntry.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextCSSStyleEntry.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextCSSStyleEntry.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextMark.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextMark.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextMark.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextMark.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextMetrics.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextMetrics.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextMetrics.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextMetrics.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextModel.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextModel.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextModel.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextModel.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextOtherStyleEntry.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextOtherStyleEntry.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextOtherStyleEntry.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextOtherStyleEntry.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextParagraphImpl.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextParagraphImpl.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextParagraphImpl.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextParagraphImpl.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextSpecialParagraphImpl.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextSpecialParagraphImpl.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextSpecialParagraphImpl.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextSpecialParagraphImpl.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextStyleEntry.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextStyleEntry.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLTextStyleEntry.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextStyleEntry.java
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLVideoEntry.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLVideoEntry.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/model/ZLVideoEntry.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLVideoEntry.java
diff --git a/src/org/geometerplus/zlibrary/text/view/CursorManager.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/CursorManager.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/CursorManager.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/CursorManager.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ExtensionElement.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ExtensionElement.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ExtensionElement.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ExtensionElement.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ExtensionElementManager.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ExtensionElementManager.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ExtensionElementManager.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ExtensionElementManager.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ExtensionRegionSoul.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ExtensionRegionSoul.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ExtensionRegionSoul.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ExtensionRegionSoul.java
diff --git a/src/org/geometerplus/zlibrary/text/view/HullUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/HullUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/HullUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/HullUtil.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ModelDumper.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ModelDumper.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ModelDumper.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ModelDumper.java
diff --git a/src/org/geometerplus/zlibrary/text/view/PaintStateEnum.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/PaintStateEnum.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/PaintStateEnum.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/PaintStateEnum.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextControlElement.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextControlElement.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextControlElement.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextControlElement.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextElement.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextElement.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextElement.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextElement.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextElementArea.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextElementArea.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextElementArea.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextElementArea.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextFixedHSpaceElement.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextFixedHSpaceElement.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextFixedHSpaceElement.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextFixedHSpaceElement.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextFixedPosition.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextFixedPosition.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextFixedPosition.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextFixedPosition.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextHighlighting.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextHighlighting.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextHighlighting.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextHighlighting.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextHyperlink.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextHyperlink.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextHyperlink.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextHyperlink.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkControlElement.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkControlElement.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkControlElement.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkControlElement.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkRegionSoul.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkRegionSoul.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkRegionSoul.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkRegionSoul.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextImageElement.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextImageElement.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextImageElement.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextImageElement.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextImageRegionSoul.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextImageRegionSoul.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextImageRegionSoul.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextImageRegionSoul.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextLineInfo.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextLineInfo.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextLineInfo.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextLineInfo.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextManualHighlighting.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextManualHighlighting.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextManualHighlighting.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextManualHighlighting.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextPage.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextPage.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextPage.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextPage.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextPosition.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextPosition.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextPosition.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextPosition.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextRegion.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextRegion.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextRegion.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextRegion.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextSelection.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextSelection.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextSelection.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextSelection.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextSimpleHighlighting.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextSimpleHighlighting.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextSimpleHighlighting.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextSimpleHighlighting.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextStyle.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextStyle.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextStyleElement.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextStyleElement.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextStyleElement.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextStyleElement.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextTraverser.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextTraverser.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextTraverser.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextTraverser.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextVideoElement.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextVideoElement.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextVideoElement.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextVideoElement.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextVideoRegionSoul.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextVideoRegionSoul.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextVideoRegionSoul.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextVideoRegionSoul.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextView.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextWord.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextWord.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextWord.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextWord.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextWordCursor.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextWordCursor.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextWordCursor.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextWordCursor.java
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextWordRegionSoul.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextWordRegionSoul.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/ZLTextWordRegionSoul.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextWordRegionSoul.java
diff --git a/src/org/geometerplus/zlibrary/text/view/style/SimpleCSSReader.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/SimpleCSSReader.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/style/SimpleCSSReader.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/SimpleCSSReader.java
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextExplicitlyDecoratedStyle.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextExplicitlyDecoratedStyle.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/style/ZLTextExplicitlyDecoratedStyle.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextExplicitlyDecoratedStyle.java
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextNGStyle.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextNGStyle.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/style/ZLTextNGStyle.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextNGStyle.java
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextNGStyleDescription.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextNGStyleDescription.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/style/ZLTextNGStyleDescription.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextNGStyleDescription.java
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/error/BugReportActivity.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/error/BugReportActivity.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/error/BugReportActivity.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/error/BugReportActivity.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/error/ErrorKeys.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/error/ErrorKeys.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/error/ErrorKeys.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/error/ErrorKeys.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/error/ErrorUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/error/ErrorUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/error/ErrorUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/error/ErrorUtil.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/image/BitmapImageData.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/BitmapImageData.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/image/BitmapImageData.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/BitmapImageData.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/image/InputStreamImageData.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/InputStreamImageData.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/image/InputStreamImageData.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/InputStreamImageData.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageLoader.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageLoader.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageLoader.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageLoader.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/image/ZLBitmapImage.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/ZLBitmapImage.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/image/ZLBitmapImage.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/image/ZLBitmapImage.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/network/SQLiteCookieDatabase.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/network/SQLiteCookieDatabase.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/network/SQLiteCookieDatabase.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/network/SQLiteCookieDatabase.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidColorUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/util/ZLAndroidColorUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidColorUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/util/ZLAndroidColorUtil.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/BitmapManagerImpl.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/BitmapManagerImpl.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/BitmapManagerImpl.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/BitmapManagerImpl.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/MainView.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/MainView.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/MainView.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/MainView.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/ViewUtil.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/ViewUtil.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/ViewUtil.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/ViewUtil.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/animation/AnimationProvider.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/AnimationProvider.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/animation/AnimationProvider.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/AnimationProvider.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/animation/BitmapManager.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/BitmapManager.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/animation/BitmapManager.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/BitmapManager.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/animation/CurlAnimationProvider.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/CurlAnimationProvider.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/animation/CurlAnimationProvider.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/CurlAnimationProvider.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/animation/NoneAnimationProvider.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/NoneAnimationProvider.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/animation/NoneAnimationProvider.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/NoneAnimationProvider.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/animation/ShiftAnimationProvider.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/ShiftAnimationProvider.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/animation/ShiftAnimationProvider.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/ShiftAnimationProvider.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/animation/SimpleAnimationProvider.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/SimpleAnimationProvider.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/animation/SimpleAnimationProvider.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/SimpleAnimationProvider.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/animation/SlideAnimationProvider.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/SlideAnimationProvider.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/animation/SlideAnimationProvider.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/SlideAnimationProvider.java
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/animation/SlideOldStyleAnimationProvider.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/SlideOldStyleAnimationProvider.java
similarity index 100%
rename from src/org/geometerplus/zlibrary/ui/android/view/animation/SlideOldStyleAnimationProvider.java
rename to fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/animation/SlideOldStyleAnimationProvider.java
diff --git a/src/org/vimgadgets/linebreak/LineBreaker.java b/fbreader/app/src/main/java/org/vimgadgets/linebreak/LineBreaker.java
similarity index 100%
rename from src/org/vimgadgets/linebreak/LineBreaker.java
rename to fbreader/app/src/main/java/org/vimgadgets/linebreak/LineBreaker.java
diff --git a/project.properties b/project.properties
index 1eb04094d..8973f93e5 100644
--- a/project.properties
+++ b/project.properties
@@ -7,6 +7,7 @@
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 
+source.dir=fbreader/app/src/main/java
 java.encoding=utf-8
 # proguard.config=proguard.cfg
 # Project target.