diff --git a/TODO b/TODO
index cbcd5d846..e49f87638 100644
--- a/TODO
+++ b/TODO
@@ -95,3 +95,4 @@ DONE	FootnoteView
 	выход по escape из view, не из приложения
 	получение списка шрифтов в ZLPaintContext
 	полноэкранный режим
+	tap scrolling
diff --git a/build.xml b/build.xml
index 99e6cdbd7..ee841c865 100644
--- a/build.xml
+++ b/build.xml
@@ -1,83 +1,83 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<project basedir = "." default = "buildJar" name = "fbreader">
-	<property name = "src.dir" value = "src"/>
-	<property name = "bin.dir" value = "bin"/>
-	<property name = "cache.dir" value = "depcache"/>
-	<property name = "icons.dir" value = "icons"/>
-	<property name = "data.dir" value = "data"/>
-	<property name = "test.dir" value = "test"/>
-	<property name = "manifest.file" value = "manifest.mf"/>
-	<property name = "main.jar" value = "FBReaderJ.jar"/>
-	<property name = "sources.zip" value = "FBReaderJ-sources.zip"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="buildJar" name="fbreader">
+	<property name="src.path" value="src:platform/swing/src"/>
+	<property name="bin.dir" value="bin"/>
+	<property name="cache.dir" value="depcache"/>
+	<property name="icons.dir" value="icons"/>
+	<property name="data.dir" value="data"/>
+	<property name="test.dir" value="test"/>
+	<property name="manifest.file" value="manifest.mf"/>
+	<property name="main.jar" value="FBReaderJ.jar"/>
+	<property name="sources.zip" value="FBReaderJ-sources.zip"/>
 
-	<target name = "prepare">
-		<mkdir dir = "${bin.dir}" />
+	<target name="prepare">
+		<mkdir dir="${bin.dir}" />
 	</target>
 
-	<target name = "depend" depends = "prepare">
-		<depend srcdir = "${src.dir}" destdir = "${bin.dir}" cache = "${cache.dir}" closure = "yes">
-			<exclude name = "org/zlibrary/core/xml/sax/**"/>
+	<target name="depend" depends="prepare">
+		<depend srcdir="${src.path}" destdir="${bin.dir}" cache="${cache.dir}" closure="yes">
+			<exclude name="org/zlibrary/core/xml/sax/**"/>
 		</depend>
 	</target>
 
-	<target name = "compile" depends = "depend">
-		<javac srcdir = "${src.dir}" destdir = "${bin.dir}">
-			<exclude name = "org/zlibrary/core/xml/sax/**"/>
+	<target name="compile" depends="depend">
+		<javac srcdir="${src.path}" destdir="${bin.dir}">
+			<exclude name="org/zlibrary/core/xml/sax/**"/>
 		</javac>
 	</target>
 
-	<target name = "buildJar" depends = "compile">
-		<jar destfile = "${main.jar}" manifest = "${manifest.file}">
-			<fileset dir = "${bin.dir}" includes = "**/*.class"/>
-			<fileset dir = "." includes = "${icons.dir}/**/*.png"/>
-			<fileset dir = "." includes = "${data.dir}/**"/>
-			<fileset dir = "platform/swing" includes = "${data.dir}/**"/>
+	<target name="buildJar" depends="compile">
+		<jar destfile="${main.jar}" manifest="${manifest.file}">
+			<fileset dir="${bin.dir}" includes="**/*.class"/>
+			<fileset dir="." includes="${icons.dir}/**/*.png"/>
+			<fileset dir="." includes="${data.dir}/**"/>
+			<fileset dir="platform/swing" includes="${data.dir}/**"/>
 		</jar>
 	</target>
 
-	<target name = "test" depends = "compile">
-		<javac srcdir = "${test.dir}" destdir = "${bin.dir}">
+	<target name="test" depends="compile">
+		<javac srcdir="${test.dir}" destdir="${bin.dir}">
 			<classpath>
-				<pathelement location = "lib/junit.jar"/>
+				<pathelement location="lib/junit.jar"/>
 			</classpath>
 		</javac>
 	</target>
 
-	<target name = "runtests" depends = "test">
-		<junit printsummary = "yes">
+	<target name="runtests" depends="test">
+		<junit printsummary="yes">
 			<classpath>
-				<pathelement location = "${bin.dir}"/>
+				<pathelement location="${bin.dir}"/>
 			</classpath>
-			<test name = "org.test.zlibrary.model.TestAll"/>
-			<test name = "org.test.zlibrary.options.TestAll"/>
-			<test name = "org.test.zlibrary.core.resources.AllTests"/>
-			<test name = "org.test.fbreader.formats.fb2.AllTests"/>
+			<test name="org.test.zlibrary.model.TestAll"/>
+			<test name="org.test.zlibrary.options.TestAll"/>
+			<test name="org.test.zlibrary.core.resources.AllTests"/>
+			<test name="org.test.fbreader.formats.fb2.AllTests"/>
 		</junit>
 	</target>
 
-	<target name = "clean">
-		<delete dir = "${bin.dir}"/>
-		<delete dir = "${cache.dir}"/>
-		<delete file = "${main.jar}"/>
-		<delete file = "${sources.zip}"/>
-		<delete file = "FBReaderJ.jad"/>
-		<delete dir = "platform/android/res/raw"/>
-		<delete file = "platform/android/src/org/zlibrary/ui/android/library/R.java"/>
+	<target name="clean">
+		<delete dir="${bin.dir}"/>
+		<delete dir="${cache.dir}"/>
+		<delete file="${main.jar}"/>
+		<delete file="${sources.zip}"/>
+		<delete file="FBReaderJ.jad"/>
+		<delete dir="platform/android/res/raw"/>
+		<delete file="platform/android/src/org/zlibrary/ui/android/library/R.java"/>
 	</target>
 
-	<target name = "sources-archive" depends = "clean">
+	<target name="sources-archive" depends="clean">
 		<echo>Packaging sources archive...</echo>
-		<exec executable = "zip" failonerror = "true">
-			<arg value = "-rq" />
-			<arg value = "${sources.zip}" />
-			<arg value = "${src.dir}" />
-			<arg value = "${data.dir}" />
-			<arg value = "${icons.dir}" />
-			<arg value = "${manifest.file}" />
-			<arg value = "build.xml" />
-			<arg value = "platform" />
-			<arg value = "-x" />
-			<arg value = "*/.svn/*" />
+		<exec executable="zip" failonerror="true">
+			<arg value="-rq" />
+			<arg value="${sources.zip}" />
+			<arg value="${data.dir}" />
+			<arg value="${icons.dir}" />
+			<arg value="${manifest.file}" />
+			<arg value="build.xml" />
+			<arg value="src" />
+			<arg value="platform" />
+			<arg value="-x" />
+			<arg value="*/.svn/*" />
 		</exec>
 	</target>
 </project>
diff --git a/platform/a1200/build.xml b/platform/a1200/build.xml
index 3517f4a64..ce766fdbc 100644
--- a/platform/a1200/build.xml
+++ b/platform/a1200/build.xml
@@ -5,6 +5,7 @@
 	<property name="wtk.home" value="/home/geometer/WTK2.5.2" />
 	<property name="wtk.cldc.version" value="1.1" />
 	<property name="wtk.midp.version" value="2.0" />
+	<property name="wtk.optionalpda.enabled" value="true" />
 	<property name="wtk.proguard.home" value="${project.dir}"/>
 	<property name="platform.dir" value="${project.dir}/platform/a1200" />
 	<property name="bin.dir" value="${project.dir}/bin" />
@@ -21,8 +22,6 @@
 	<target name="compile" depends="prepare">
 		<wtkbuild srcdir="${src.path}" destdir="${bin.dir}">
 			<exclude name="org/zlibrary/core/xml/sax/**"/>
-			<exclude name="org/zlibrary/core/xmlconfig/**"/>
-			<exclude name="org/zlibrary/ui/swing/**"/>
 		</wtkbuild>
 	</target>
 
diff --git a/platform/a1200/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java b/platform/a1200/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java
index f2ee178f4..ee77a4e2b 100644
--- a/platform/a1200/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java
+++ b/platform/a1200/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java
@@ -1,6 +1,8 @@
 package org.zlibrary.ui.j2me.library;
 
 import java.io.InputStream;
+import javax.microedition.io.Connector;
+import javax.microedition.io.file.*;
 
 import javax.microedition.midlet.MIDlet;
 import javax.microedition.lcdui.Display;
@@ -25,6 +27,15 @@ final class ZLJ2MELibrary extends ZLibrary {
 
 	protected InputStream getFileInputStream(String fileName) {
 		// TODO: implement
+		/*
+		try {
+			FileConnection connection = (FileConnection)Connector.open("file:///SDCard/test.fb2", Connector.READ);
+			if ((connection != null) && connection.exists()) {
+				return connection.openInputStream();
+			}
+		} catch (Exception e) {
+		}
+		*/
 		return null;
 	}
 
diff --git a/platform/android/build.xml b/platform/android/build.xml
index 6eec7f55e..6c680f27e 100644
--- a/platform/android/build.xml
+++ b/platform/android/build.xml
@@ -2,7 +2,7 @@
 <project name="FBReaderJ" default="package">
 	
 	<property name="sdk-folder" value="/home/geometer/src/android_sdk_linux_m3-rc37a" />
-	<property name="android-tools" value="/home/geometer/src/android_sdk_linux_m3-rc37a/tools" />
+	<property name="android-tools" value="${sdk-folder}/tools" />
 	<property name="project-dir" value="/home/geometer/src/projects/FBReaderJ" />
 
 <!--
@@ -17,11 +17,8 @@
 	<property name="outdir" value="../../bin" />
 	<property name="cachedir" value="../../depcache" />
 
-	<!-- No user servicable parts below. -->
-
 	<!-- Input directories -->
 	<property name="resource-dir" value="res" />
-	<property name="asset-dir" value="assets" />
 	<property name="src.path" value="../../src:src" />
 
 	<!-- Output directories -->
@@ -73,8 +70,6 @@
 	<target name="depend" depends="dirs, resource-src">
 		<depend srcdir="${src.path}" destdir="${outdir-classes}" cache="${cachedir}" closure="yes">
 			<exclude name="org/zlibrary/core/xml/sax/**"/>
-			<exclude name="org/zlibrary/core/xmlconfig/**"/>
-			<exclude name="org/zlibrary/ui/swing/**"/>
 		</depend>
 	</target>
 
@@ -82,8 +77,6 @@
 	<target name="compile" depends="depend">
 		<javac target="1.5" srcdir="${src.path}" destdir="${outdir-classes}" bootclasspath="${android-jar}">
 			<exclude name = "org/zlibrary/core/xml/sax/**"/>
-			<exclude name="org/zlibrary/core/xmlconfig/**"/>
-			<exclude name = "org/zlibrary/ui/swing/**"/>
 		</javac>
 	</target>
 
@@ -99,27 +92,7 @@
 		</exec>
 	</target>
 
-	<!-- Put the project's resources into the output package file. -->
-	<target name="package-res-and-assets">
-		<echo>Packaging resources and assets...</echo>
-		<exec executable="${aapt}" failonerror="true">
-			<arg value="package" />
-			<arg value="-f" />
-			<arg value="-c" />
-			<arg value="-M" />
-			<arg value="AndroidManifest.xml" />
-			<arg value="-S" />
-			<arg value="${resource-dir}" />
-			<arg value="-A" />
-			<arg value="${asset-dir}" />
-			<arg value="-I" />
-			<arg value="${android-jar}" />
-			<arg value="${out-package}" />
-		</exec>
-	</target>
-
-	<!-- Same as package-res-and-assets, but without "-A ${asset-dir}" -->
-	<target name="package-res-no-assets">
+	<target name="package-res">
 		<echo>Packaging resources...</echo>
 		<exec executable="${aapt}" failonerror="true">
 			<arg value="package" />
@@ -136,17 +109,6 @@
 		</exec>
 	</target>
 
-	<!-- Invoke the proper target depending on whether or not
-		 an assets directory is present. -->
-	<!-- TODO: find a nicer way to include the "-A ${asset-dir}" argument
-		 only when the assets dir exists. -->
-	<target name="package-res">
-		<available file="${asset-dir}" type="dir"
-				property="res-target" value="and-assets" />
-		<property name="res-target" value="no-assets" />
-		<antcall target="package-res-${res-target}" />
-	</target>
-
 	<!-- Put the project's .class files into the output package file. -->
 	<target name="package-java" depends="compile, package-res">
 		<echo>Packaging java...</echo>
diff --git a/src/org/zlibrary/core/xmlconfig/ZLConfigImpl.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigImpl.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLConfigImpl.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigImpl.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLConfigReader.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigReader.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLConfigReader.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigReader.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLConfigWriter.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigWriter.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLConfigWriter.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigWriter.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLDeltaConfig.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeltaConfig.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLDeltaConfig.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeltaConfig.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLGroup.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLGroup.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLGroup.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLGroup.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLOptionID.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionID.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLOptionID.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionID.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLOptionInfo.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionInfo.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLOptionInfo.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionInfo.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLReader.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLReader.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLReader.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLReader.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLSimpleConfig.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLSimpleConfig.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLSimpleConfig.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLSimpleConfig.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLWriter.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLWriter.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLWriter.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLWriter.java
diff --git a/src/org/zlibrary/core/xmlconfig/ZLXMLConfigManager.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLXMLConfigManager.java
similarity index 100%
rename from src/org/zlibrary/core/xmlconfig/ZLXMLConfigManager.java
rename to platform/swing/src/org/zlibrary/core/xmlconfig/ZLXMLConfigManager.java
diff --git a/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java b/platform/swing/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java
rename to platform/swing/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java
diff --git a/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java b/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java
rename to platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java
diff --git a/src/org/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java b/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java
rename to platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java
diff --git a/src/org/zlibrary/ui/swing/image/ZLSwingImageData.java b/platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageData.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/image/ZLSwingImageData.java
rename to platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageData.java
diff --git a/src/org/zlibrary/ui/swing/image/ZLSwingImageManager.java b/platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageManager.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/image/ZLSwingImageManager.java
rename to platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageManager.java
diff --git a/src/org/zlibrary/ui/swing/library/Main.java b/platform/swing/src/org/zlibrary/ui/swing/library/Main.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/library/Main.java
rename to platform/swing/src/org/zlibrary/ui/swing/library/Main.java
diff --git a/src/org/zlibrary/ui/swing/library/ZLSwingLibrary.java b/platform/swing/src/org/zlibrary/ui/swing/library/ZLSwingLibrary.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/library/ZLSwingLibrary.java
rename to platform/swing/src/org/zlibrary/ui/swing/library/ZLSwingLibrary.java
diff --git a/src/org/zlibrary/ui/swing/util/ZLSwingIconUtil.java b/platform/swing/src/org/zlibrary/ui/swing/util/ZLSwingIconUtil.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/util/ZLSwingIconUtil.java
rename to platform/swing/src/org/zlibrary/ui/swing/util/ZLSwingIconUtil.java
diff --git a/src/org/zlibrary/ui/swing/view/ZLSwingPaintContext.java b/platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingPaintContext.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/view/ZLSwingPaintContext.java
rename to platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingPaintContext.java
diff --git a/src/org/zlibrary/ui/swing/view/ZLSwingViewWidget.java b/platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingViewWidget.java
similarity index 100%
rename from src/org/zlibrary/ui/swing/view/ZLSwingViewWidget.java
rename to platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingViewWidget.java