diff --git a/createRawResources.py b/createRawResources.py
index 54e2418a2..44248914e 100755
--- a/createRawResources.py
+++ b/createRawResources.py
@@ -10,8 +10,6 @@ tabs_icons_dir = "icons/tabs"
 text_search_icons_dir = "icons/text_search"
 data_dir = "data"
 
-print os.getcwd()
-
 def clean_res_dir(dir):
 	if os.path.exists(dir):
 		for file in os.listdir(dir):
diff --git a/platform/android/build.xml b/platform/android/build.xml
deleted file mode 100644
index 9893c942e..000000000
--- a/platform/android/build.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" ?>
-<project name="FBReaderJ" default="package">
-	
-	<!-- property name="sdk-folder" value="/home/geometer/src/android_sdk_linux_m3-rc37a" / -->
-	<property name="sdk-folder" value="/Users/geometer/android-sdk-mac_x86-1.0_r1" />
-	<property name="android-tools" value="${sdk-folder}/tools" />
-	<property name="sdk-folder-1.5" value="/Users/geometer/android-sdk-mac_x86-1.5_r1" />
-	<property name="android-tools-1.5" value="${sdk-folder-1.5}/tools" />
-	<property name="project-dir" value="/Users/geometer/src/projects/FBReaderJ" />
-	<property name="platform-dir" value="${project-dir}/platform/android" />
-
-<!--
-	<property name="sdk-folder" value="/home/grigory/distrib/android_sdk_linux_m3-rc20a" />
-	<property name="android-tools" value="/home/grigory/distrib/android_sdk_linux_m3-rc20a/tools" />
-	<property name="project-dir" value="/home/grigory/programming/amse/fbreader/java/trunk" />
--->
-
-
-	<!-- The intermediates directory -->
-	<!-- Eclipse uses "bin" for its own output, so we do the same. -->
-	<property name="outdir" value="${project-dir}/bin" />
-	<property name="cachedir" value="${project-dir}/depcache" />
-
-	<!-- Input directories -->
-	<property name="resource-dir" value="${platform-dir}/res" />
-	<property name="src.path" value="${project-dir}/src:${platform-dir}/src" />
-
-	<!-- Output directories -->
-	<property name="outdir-classes" value="${outdir}/classes" />
-
-	<!-- Intermediate files -->
-	<property name="dex-file" value="classes.dex" />
-	<property name="intermediate-dex" value="${outdir}/${dex-file}" />
-
-	<!-- The final package file to generate -->
-	<property name="out-package" value="${outdir}/${ant.project.name}.apk" />
-	<property name="resources-package" value="${outdir}/${ant.project.name}.ap_" />
-
-	<!-- Tools -->
-	<property name="aapt" value="${android-tools}/aapt" />
-	<property name="dx" value="${android-tools}/dx" />
-	<property name="adb" value="${android-tools}/adb" />
-	<property name="apk-builder" value="${android-tools-1.5}/apkbuilder" />
-	<property name="android-jar" value="${sdk-folder}/android.jar" />
-
-	<!-- Rules -->
-
-	<!-- Create the output directories if they don't exist yet. -->
-	<target name="dirs">
-		<mkdir dir="${outdir}" />
-		<mkdir dir="${outdir-classes}" />
-	</target>
-
-	<target name="raw-resources">
-		<echo>Copying raw resources...</echo>
-		<exec executable="${platform-dir}/create_raw_resources.py">
-			<arg value="${project-dir}" />
-		</exec>
-	</target>
-
-	<!-- Generate the R.java file for this project's resources. -->
-	<target name="resource-src" depends="dirs, raw-resources">
-		<echo>Generating R.java...</echo>
-		<exec executable="${aapt}" failonerror="true">
-			<arg value="p" />
-			<arg value="-m" />
-			<arg value="-J" />
-			<arg value="${platform-dir}/src" />
-			<arg value="-M" />
-			<arg value="${platform-dir}/AndroidManifest.xml" />
-			<arg value="-S" />
-			<arg value="${resource-dir}" />
-			<arg value="-I" />
-			<arg value="${android-jar}" />
-		</exec>
-	</target>
-
-	<target name="depend" depends="dirs, resource-src">
-		<depend srcdir="${src.path}" destdir="${outdir-classes}" cache="${cachedir}" closure="yes" />
-	</target>
-
-	<!-- Compile this project's .java files into .class files. -->
-	<target name="compile" depends="depend">
-		<javac target="1.5" srcdir="${src.path}" destdir="${outdir-classes}" bootclasspath="${android-jar}" />
-	</target>
-
-	<!-- Convert this project's .class files into .dex files. -->
-	<target name="dex" depends="compile">
-		<exec executable="${dx}" failonerror="true">
-			<arg value="-JXmx384M" />
-			<arg value="--dex" />
-			<arg value="--output=${intermediate-dex}" />
-			<arg value="--positions=lines" />
-			<arg path="${outdir-classes}" />
-		</exec>
-	</target>
-
-	<target name="package-res">
-		<echo>Packaging resources...</echo>
-		<exec executable="${aapt}" failonerror="true">
-			<arg value="package" />
-			<arg value="-f" />
-			<arg value="-M" />
-			<arg value="${platform-dir}/AndroidManifest.xml" />
-			<arg value="-S" />
-			<arg value="${resource-dir}" />
-			<!-- No assets directory -->
-			<arg value="-I" />
-			<arg value="${android-jar}" />
-			<arg value="-F" />
-			<arg value="${resources-package}" />
-		</exec>
-	</target>
-
-	<!-- Put the project's .dex files into the output package file. -->
-	<target name="package-dex" depends="dex, package-res">
-		<echo>Packaging dex...</echo>
-		<exec executable="${apk-builder}" failonerror="true">
-			<arg value="${out-package}" />
-			<arg value="-z" />
-			<arg value="${resources-package}" />
-			<arg value="-f" />
-			<arg value="${intermediate-dex}" />
-			<arg value="-nf" />
-			<arg value="${project-dir}/libs" />
-		</exec>
-	</target>
-
-	<!-- Create the package file for this project from the sources. -->
-	<target name="package" depends="package-dex" />
-
-	<target name="install" depends="package">
-		<echo>Installing to emulator...</echo>
-		<exec executable="${adb}" failonerror="true">
-			<arg value="install"/>
-			<arg value="-r"/>
-			<arg value="${out-package}"/>
-		</exec>
-	</target>
-</project>
diff --git a/platform/android/src/org/geometerplus/android/fbreader/BookDownloader.java b/src/org/geometerplus/android/fbreader/BookDownloader.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/BookDownloader.java
rename to src/org/geometerplus/android/fbreader/BookDownloader.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/BookSearchActivity.java b/src/org/geometerplus/android/fbreader/BookSearchActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/BookSearchActivity.java
rename to src/org/geometerplus/android/fbreader/BookSearchActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/BookmarkEditActivity.java b/src/org/geometerplus/android/fbreader/BookmarkEditActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/BookmarkEditActivity.java
rename to src/org/geometerplus/android/fbreader/BookmarkEditActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/BookmarkSearchActivity.java b/src/org/geometerplus/android/fbreader/BookmarkSearchActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/BookmarkSearchActivity.java
rename to src/org/geometerplus/android/fbreader/BookmarkSearchActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/BookmarksActivity.java b/src/org/geometerplus/android/fbreader/BookmarksActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/BookmarksActivity.java
rename to src/org/geometerplus/android/fbreader/BookmarksActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/ControlPanel.java b/src/org/geometerplus/android/fbreader/ControlPanel.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/ControlPanel.java
rename to src/org/geometerplus/android/fbreader/ControlPanel.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/FBReader.java
rename to src/org/geometerplus/android/fbreader/FBReader.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java b/src/org/geometerplus/android/fbreader/LibraryTabActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java
rename to src/org/geometerplus/android/fbreader/LibraryTabActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java
rename to src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/SearchActivity.java b/src/org/geometerplus/android/fbreader/SearchActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/SearchActivity.java
rename to src/org/geometerplus/android/fbreader/SearchActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/TOCActivity.java b/src/org/geometerplus/android/fbreader/TOCActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/TOCActivity.java
rename to src/org/geometerplus/android/fbreader/TOCActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/TextSearchActivity.java b/src/org/geometerplus/android/fbreader/TextSearchActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/TextSearchActivity.java
rename to src/org/geometerplus/android/fbreader/TextSearchActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java b/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java
rename to src/org/geometerplus/android/fbreader/ZLTreeAdapter.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java b/src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java
rename to src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/preferences/InfoPreference.java b/src/org/geometerplus/android/fbreader/preferences/InfoPreference.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/preferences/InfoPreference.java
rename to src/org/geometerplus/android/fbreader/preferences/InfoPreference.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
rename to src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java
rename to src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/preferences/ZLPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLPreference.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/preferences/ZLPreference.java
rename to src/org/geometerplus/android/fbreader/preferences/ZLPreference.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
rename to src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/preferences/ZLSimplePreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLSimplePreference.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/preferences/ZLSimplePreference.java
rename to src/org/geometerplus/android/fbreader/preferences/ZLSimplePreference.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/preferences/ZLStringListPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLStringListPreference.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/preferences/ZLStringListPreference.java
rename to src/org/geometerplus/android/fbreader/preferences/ZLStringListPreference.java
diff --git a/platform/android/src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java
similarity index 100%
rename from platform/android/src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java
rename to src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java b/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java
rename to src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java b/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
rename to src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/DialogActivity.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/DialogActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/DialogActivity.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/DialogActivity.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogInterface.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogInterface.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogInterface.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogInterface.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsTab.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsTab.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsTab.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsTab.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java b/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java
rename to src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java b/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java
rename to src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java b/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java
rename to src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java b/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java
rename to src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java b/src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
rename to src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
rename to src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
rename to src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
rename to src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java b/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java
rename to src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
rename to src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java
rename to src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
similarity index 100%
rename from platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
rename to src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java