diff --git a/android-app-core.iml b/android-app-core.iml
index 24c6422e..a807511b 100644
--- a/android-app-core.iml
+++ b/android-app-core.iml
@@ -5,10 +5,10 @@
       <configuration>
         <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/android-app-core/target/generated-sources/r" />
         <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/android-app-core/target/generated-sources/aidl" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app-core/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/android-app-core/res" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app-core/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/android-app-core/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app-core/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-core/libs" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-core/src/main/libs" />
         <option name="CUSTOM_APK_RESOURCE_FOLDER" value="/android-app-core/target/generated-sources/combined-resources/res" />
         <option name="APK_PATH" value="/android-app-core/target/android-app-core.apk" />
         <option name="LIBRARY_PROJECT" value="true" />
@@ -22,12 +22,13 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/android-app-core/target/idea-classes" />
-    <output-test url="file://$MODULE_DIR$/android-app-core/target/idea-test-classes" />
+    <output url="file://$MODULE_DIR$/android-app-core/target/classes" />
+    <output-test url="file://$MODULE_DIR$/android-app-core/target/test-classes" />
     <content url="file://$MODULE_DIR$/android-app-core">
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-assets" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes-instrumented" />
@@ -39,9 +40,30 @@
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpack" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpacked-libs" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
@@ -104,26 +126,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:xercesMinimal:1.9.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-6" level="project" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml
index 987c4a9e..b9fa7acc 100644
--- a/android-app-core/pom.xml
+++ b/android-app-core/pom.xml
@@ -76,7 +76,7 @@
 
 		<extensions>
 			<extension>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+				<groupId>com.simpligility.maven.plugins</groupId>
 				<artifactId>android-maven-plugin</artifactId>
 			</extension>
 		</extensions>
diff --git a/android-app-core/res/layout/main_calculator.xml b/android-app-core/res/layout/main_calculator.xml
deleted file mode 100644
index 6f0c7c34..00000000
--- a/android-app-core/res/layout/main_calculator.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:layout_width="fill_parent"
-			  android:layout_height="fill_parent">
-	<!--should be implemented-->
-</LinearLayout>
\ No newline at end of file
diff --git a/android-app-core/res/layout/main_calculator_mobile.xml b/android-app-core/res/layout/main_calculator_mobile.xml
deleted file mode 100644
index 6f0c7c34..00000000
--- a/android-app-core/res/layout/main_calculator_mobile.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:layout_width="fill_parent"
-			  android:layout_height="fill_parent">
-	<!--should be implemented-->
-</LinearLayout>
\ No newline at end of file
diff --git a/android-app-core/AndroidManifest.xml b/android-app-core/src/main/AndroidManifest.xml
similarity index 100%
rename from android-app-core/AndroidManifest.xml
rename to android-app-core/src/main/AndroidManifest.xml
diff --git a/android-app-core/assets/Roboto-Regular.ttf b/android-app-core/src/main/assets/Roboto-Regular.ttf
similarity index 100%
rename from android-app-core/assets/Roboto-Regular.ttf
rename to android-app-core/src/main/assets/Roboto-Regular.ttf
diff --git a/android-app-core/res/drawable-hdpi/ab_clock.png b/android-app-core/src/main/res/drawable-hdpi/ab_clock.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_clock.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_clock.png
diff --git a/android-app-core/res/drawable-hdpi/ab_disk.png b/android-app-core/src/main/res/drawable-hdpi/ab_disk.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_disk.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_disk.png
diff --git a/android-app-core/res/drawable-hdpi/ab_expand.png b/android-app-core/src/main/res/drawable-hdpi/ab_expand.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_expand.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_expand.png
diff --git a/android-app-core/res/drawable-hdpi/ab_icon.png b/android-app-core/src/main/res/drawable-hdpi/ab_icon.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_icon.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_icon.png
diff --git a/android-app-core/res/drawable-hdpi/ab_menu.png b/android-app-core/src/main/res/drawable-hdpi/ab_menu.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_menu.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_menu.png
diff --git a/android-app-core/res/drawable-hdpi/ab_plus.png b/android-app-core/src/main/res/drawable-hdpi/ab_plus.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_plus.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_plus.png
diff --git a/android-app-core/res/drawable-hdpi/ab_range.png b/android-app-core/src/main/res/drawable-hdpi/ab_range.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_range.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_range.png
diff --git a/android-app-core/res/drawable-hdpi/ab_remove.png b/android-app-core/src/main/res/drawable-hdpi/ab_remove.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_remove.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_remove.png
diff --git a/android-app-core/res/drawable-hdpi/ab_settings.png b/android-app-core/src/main/res/drawable-hdpi/ab_settings.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_settings.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_settings.png
diff --git a/android-app-core/res/drawable-hdpi/ab_stats.png b/android-app-core/src/main/res/drawable-hdpi/ab_stats.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_stats.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_stats.png
diff --git a/android-app-core/res/drawable-hdpi/ab_stats_3d.png b/android-app-core/src/main/res/drawable-hdpi/ab_stats_3d.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ab_stats_3d.png
rename to android-app-core/src/main/res/drawable-hdpi/ab_stats_3d.png
diff --git a/android-app-core/res/drawable-hdpi/icon.png b/android-app-core/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/icon.png
rename to android-app-core/src/main/res/drawable-hdpi/icon.png
diff --git a/android-app-core/res/drawable-hdpi/icon_onscreen.png b/android-app-core/src/main/res/drawable-hdpi/icon_onscreen.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/icon_onscreen.png
rename to android-app-core/src/main/res/drawable-hdpi/icon_onscreen.png
diff --git a/android-app-core/res/drawable-hdpi/kb_copy.png b/android-app-core/src/main/res/drawable-hdpi/kb_copy.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/kb_copy.png
rename to android-app-core/src/main/res/drawable-hdpi/kb_copy.png
diff --git a/android-app-core/res/drawable-hdpi/kb_erase.png b/android-app-core/src/main/res/drawable-hdpi/kb_erase.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/kb_erase.png
rename to android-app-core/src/main/res/drawable-hdpi/kb_erase.png
diff --git a/android-app-core/res/drawable-hdpi/kb_logo.png b/android-app-core/src/main/res/drawable-hdpi/kb_logo.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/kb_logo.png
rename to android-app-core/src/main/res/drawable-hdpi/kb_logo.png
diff --git a/android-app-core/res/drawable-hdpi/kb_paste.png b/android-app-core/src/main/res/drawable-hdpi/kb_paste.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/kb_paste.png
rename to android-app-core/src/main/res/drawable-hdpi/kb_paste.png
diff --git a/android-app-core/res/drawable-hdpi/kb_settings.png b/android-app-core/src/main/res/drawable-hdpi/kb_settings.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/kb_settings.png
rename to android-app-core/src/main/res/drawable-hdpi/kb_settings.png
diff --git a/android-app-core/res/drawable-hdpi/kb_share.png b/android-app-core/src/main/res/drawable-hdpi/kb_share.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/kb_share.png
rename to android-app-core/src/main/res/drawable-hdpi/kb_share.png
diff --git a/android-app-core/res/drawable-hdpi/logo.png b/android-app-core/src/main/res/drawable-hdpi/logo.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/logo.png
rename to android-app-core/src/main/res/drawable-hdpi/logo.png
diff --git a/android-app-core/res/drawable-ldpi/ab_icon.png b/android-app-core/src/main/res/drawable-ldpi/ab_icon.png
similarity index 100%
rename from android-app-core/res/drawable-ldpi/ab_icon.png
rename to android-app-core/src/main/res/drawable-ldpi/ab_icon.png
diff --git a/android-app-core/res/drawable-ldpi/kb_logo.png b/android-app-core/src/main/res/drawable-ldpi/kb_logo.png
similarity index 100%
rename from android-app-core/res/drawable-ldpi/kb_logo.png
rename to android-app-core/src/main/res/drawable-ldpi/kb_logo.png
diff --git a/android-app-core/res/drawable-ldpi/logo.png b/android-app-core/src/main/res/drawable-ldpi/logo.png
similarity index 100%
rename from android-app-core/res/drawable-ldpi/logo.png
rename to android-app-core/src/main/res/drawable-ldpi/logo.png
diff --git a/android-app-core/res/drawable-mdpi/ab_clock.png b/android-app-core/src/main/res/drawable-mdpi/ab_clock.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_clock.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_clock.png
diff --git a/android-app-core/res/drawable-mdpi/ab_disk.png b/android-app-core/src/main/res/drawable-mdpi/ab_disk.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_disk.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_disk.png
diff --git a/android-app-core/res/drawable-mdpi/ab_expand.png b/android-app-core/src/main/res/drawable-mdpi/ab_expand.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_expand.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_expand.png
diff --git a/android-app-core/res/drawable-mdpi/ab_icon.png b/android-app-core/src/main/res/drawable-mdpi/ab_icon.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_icon.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_icon.png
diff --git a/android-app-core/res/drawable-mdpi/ab_menu.png b/android-app-core/src/main/res/drawable-mdpi/ab_menu.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_menu.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_menu.png
diff --git a/android-app-core/res/drawable-mdpi/ab_plus.png b/android-app-core/src/main/res/drawable-mdpi/ab_plus.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_plus.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_plus.png
diff --git a/android-app-core/res/drawable-mdpi/ab_range.png b/android-app-core/src/main/res/drawable-mdpi/ab_range.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_range.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_range.png
diff --git a/android-app-core/res/drawable-mdpi/ab_remove.png b/android-app-core/src/main/res/drawable-mdpi/ab_remove.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_remove.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_remove.png
diff --git a/android-app-core/res/drawable-mdpi/ab_settings.png b/android-app-core/src/main/res/drawable-mdpi/ab_settings.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_settings.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_settings.png
diff --git a/android-app-core/res/drawable-mdpi/ab_stats.png b/android-app-core/src/main/res/drawable-mdpi/ab_stats.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_stats.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_stats.png
diff --git a/android-app-core/res/drawable-mdpi/ab_stats_3d.png b/android-app-core/src/main/res/drawable-mdpi/ab_stats_3d.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ab_stats_3d.png
rename to android-app-core/src/main/res/drawable-mdpi/ab_stats_3d.png
diff --git a/android-app-core/res/drawable-mdpi/icon.png b/android-app-core/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/icon.png
rename to android-app-core/src/main/res/drawable-mdpi/icon.png
diff --git a/android-app-core/res/drawable-mdpi/icon_onscreen.png b/android-app-core/src/main/res/drawable-mdpi/icon_onscreen.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/icon_onscreen.png
rename to android-app-core/src/main/res/drawable-mdpi/icon_onscreen.png
diff --git a/android-app-core/res/drawable-mdpi/kb_copy.png b/android-app-core/src/main/res/drawable-mdpi/kb_copy.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/kb_copy.png
rename to android-app-core/src/main/res/drawable-mdpi/kb_copy.png
diff --git a/android-app-core/res/drawable-mdpi/kb_erase.png b/android-app-core/src/main/res/drawable-mdpi/kb_erase.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/kb_erase.png
rename to android-app-core/src/main/res/drawable-mdpi/kb_erase.png
diff --git a/android-app-core/res/drawable-mdpi/kb_logo.png b/android-app-core/src/main/res/drawable-mdpi/kb_logo.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/kb_logo.png
rename to android-app-core/src/main/res/drawable-mdpi/kb_logo.png
diff --git a/android-app-core/res/drawable-mdpi/kb_paste.png b/android-app-core/src/main/res/drawable-mdpi/kb_paste.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/kb_paste.png
rename to android-app-core/src/main/res/drawable-mdpi/kb_paste.png
diff --git a/android-app-core/res/drawable-mdpi/kb_settings.png b/android-app-core/src/main/res/drawable-mdpi/kb_settings.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/kb_settings.png
rename to android-app-core/src/main/res/drawable-mdpi/kb_settings.png
diff --git a/android-app-core/res/drawable-mdpi/kb_share.png b/android-app-core/src/main/res/drawable-mdpi/kb_share.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/kb_share.png
rename to android-app-core/src/main/res/drawable-mdpi/kb_share.png
diff --git a/android-app-core/res/drawable-mdpi/logo.png b/android-app-core/src/main/res/drawable-mdpi/logo.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/logo.png
rename to android-app-core/src/main/res/drawable-mdpi/logo.png
diff --git a/android-app-core/res/drawable-nodpi/cpp_onscreen_button_close.png b/android-app-core/src/main/res/drawable-nodpi/cpp_onscreen_button_close.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/cpp_onscreen_button_close.png
rename to android-app-core/src/main/res/drawable-nodpi/cpp_onscreen_button_close.png
diff --git a/android-app-core/res/drawable-nodpi/cpp_onscreen_button_fold.png b/android-app-core/src/main/res/drawable-nodpi/cpp_onscreen_button_fold.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/cpp_onscreen_button_fold.png
rename to android-app-core/src/main/res/drawable-nodpi/cpp_onscreen_button_fold.png
diff --git a/android-app-core/res/drawable-nodpi/cpp_onscreen_button_minimize.png b/android-app-core/src/main/res/drawable-nodpi/cpp_onscreen_button_minimize.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/cpp_onscreen_button_minimize.png
rename to android-app-core/src/main/res/drawable-nodpi/cpp_onscreen_button_minimize.png
diff --git a/android-app-core/res/drawable-nodpi/cpp_onscreen_header_logo.png b/android-app-core/src/main/res/drawable-nodpi/cpp_onscreen_header_logo.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/cpp_onscreen_header_logo.png
rename to android-app-core/src/main/res/drawable-nodpi/cpp_onscreen_header_logo.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__list_focused_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__list_focused_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__list_focused_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__list_focused_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__tab_selected_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png b/android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
rename to android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
diff --git a/android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png b/android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
rename to android-app-core/src/main/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
diff --git a/android-app-core/res/drawable-nodpi/tablet_big_buttons.png b/android-app-core/src/main/res/drawable-nodpi/tablet_big_buttons.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/tablet_big_buttons.png
rename to android-app-core/src/main/res/drawable-nodpi/tablet_big_buttons.png
diff --git a/android-app-core/res/drawable-nodpi/tablet_optimized.png b/android-app-core/src/main/res/drawable-nodpi/tablet_optimized.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/tablet_optimized.png
rename to android-app-core/src/main/res/drawable-nodpi/tablet_optimized.png
diff --git a/android-app-core/res/drawable-nodpi/widget_preview.png b/android-app-core/src/main/res/drawable-nodpi/widget_preview.png
similarity index 100%
rename from android-app-core/res/drawable-nodpi/widget_preview.png
rename to android-app-core/src/main/res/drawable-nodpi/widget_preview.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_clock.png b/android-app-core/src/main/res/drawable-xhdpi/ab_clock.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_clock.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_clock.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_disk.png b/android-app-core/src/main/res/drawable-xhdpi/ab_disk.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_disk.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_disk.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_expand.png b/android-app-core/src/main/res/drawable-xhdpi/ab_expand.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_expand.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_expand.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_icon.png b/android-app-core/src/main/res/drawable-xhdpi/ab_icon.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_icon.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_icon.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_menu.png b/android-app-core/src/main/res/drawable-xhdpi/ab_menu.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_menu.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_menu.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_plus.png b/android-app-core/src/main/res/drawable-xhdpi/ab_plus.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_plus.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_plus.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_range.png b/android-app-core/src/main/res/drawable-xhdpi/ab_range.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_range.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_range.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_remove.png b/android-app-core/src/main/res/drawable-xhdpi/ab_remove.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_remove.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_remove.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_settings.png b/android-app-core/src/main/res/drawable-xhdpi/ab_settings.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_settings.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_settings.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_stats.png b/android-app-core/src/main/res/drawable-xhdpi/ab_stats.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_stats.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_stats.png
diff --git a/android-app-core/res/drawable-xhdpi/ab_stats_3d.png b/android-app-core/src/main/res/drawable-xhdpi/ab_stats_3d.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ab_stats_3d.png
rename to android-app-core/src/main/res/drawable-xhdpi/ab_stats_3d.png
diff --git a/android-app-core/res/drawable-xhdpi/icon.png b/android-app-core/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/icon.png
rename to android-app-core/src/main/res/drawable-xhdpi/icon.png
diff --git a/android-app-core/res/drawable-xhdpi/icon_onscreen.png b/android-app-core/src/main/res/drawable-xhdpi/icon_onscreen.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/icon_onscreen.png
rename to android-app-core/src/main/res/drawable-xhdpi/icon_onscreen.png
diff --git a/android-app-core/res/drawable-xhdpi/kb_copy.png b/android-app-core/src/main/res/drawable-xhdpi/kb_copy.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/kb_copy.png
rename to android-app-core/src/main/res/drawable-xhdpi/kb_copy.png
diff --git a/android-app-core/res/drawable-xhdpi/kb_erase.png b/android-app-core/src/main/res/drawable-xhdpi/kb_erase.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/kb_erase.png
rename to android-app-core/src/main/res/drawable-xhdpi/kb_erase.png
diff --git a/android-app-core/res/drawable-xhdpi/kb_logo.png b/android-app-core/src/main/res/drawable-xhdpi/kb_logo.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/kb_logo.png
rename to android-app-core/src/main/res/drawable-xhdpi/kb_logo.png
diff --git a/android-app-core/res/drawable-xhdpi/kb_paste.png b/android-app-core/src/main/res/drawable-xhdpi/kb_paste.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/kb_paste.png
rename to android-app-core/src/main/res/drawable-xhdpi/kb_paste.png
diff --git a/android-app-core/res/drawable-xhdpi/kb_settings.png b/android-app-core/src/main/res/drawable-xhdpi/kb_settings.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/kb_settings.png
rename to android-app-core/src/main/res/drawable-xhdpi/kb_settings.png
diff --git a/android-app-core/res/drawable-xhdpi/kb_share.png b/android-app-core/src/main/res/drawable-xhdpi/kb_share.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/kb_share.png
rename to android-app-core/src/main/res/drawable-xhdpi/kb_share.png
diff --git a/android-app-core/res/drawable-xhdpi/logo.png b/android-app-core/src/main/res/drawable-xhdpi/logo.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/logo.png
rename to android-app-core/src/main/res/drawable-xhdpi/logo.png
diff --git a/android-app-core/res/drawable-xlarge-hdpi/kb_logo.png b/android-app-core/src/main/res/drawable-xlarge-hdpi/kb_logo.png
similarity index 100%
rename from android-app-core/res/drawable-xlarge-hdpi/kb_logo.png
rename to android-app-core/src/main/res/drawable-xlarge-hdpi/kb_logo.png
diff --git a/android-app-core/res/drawable-xxhdpi/icon.png b/android-app-core/src/main/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from android-app-core/res/drawable-xxhdpi/icon.png
rename to android-app-core/src/main/res/drawable-xxhdpi/icon.png
diff --git a/android-app-core/res/drawable-xxhdpi/icon_onscreen.png b/android-app-core/src/main/res/drawable-xxhdpi/icon_onscreen.png
similarity index 100%
rename from android-app-core/res/drawable-xxhdpi/icon_onscreen.png
rename to android-app-core/src/main/res/drawable-xxhdpi/icon_onscreen.png
diff --git a/android-app-core/res/drawable/blue_button.xml b/android-app-core/src/main/res/drawable/blue_button.xml
similarity index 100%
rename from android-app-core/res/drawable/blue_button.xml
rename to android-app-core/src/main/res/drawable/blue_button.xml
diff --git a/android-app-core/res/drawable/blue_button_dark.xml b/android-app-core/src/main/res/drawable/blue_button_dark.xml
similarity index 100%
rename from android-app-core/res/drawable/blue_button_dark.xml
rename to android-app-core/src/main/res/drawable/blue_button_dark.xml
diff --git a/android-app-core/res/drawable/blue_button_dark_shape.xml b/android-app-core/src/main/res/drawable/blue_button_dark_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/blue_button_dark_shape.xml
rename to android-app-core/src/main/res/drawable/blue_button_dark_shape.xml
diff --git a/android-app-core/res/drawable/blue_button_shape.xml b/android-app-core/src/main/res/drawable/blue_button_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/blue_button_shape.xml
rename to android-app-core/src/main/res/drawable/blue_button_shape.xml
diff --git a/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml b/android-app-core/src/main/res/drawable/default_abs__btn_cab_done_holo_dark.xml
similarity index 100%
rename from android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml
rename to android-app-core/src/main/res/drawable/default_abs__btn_cab_done_holo_dark.xml
diff --git a/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml b/android-app-core/src/main/res/drawable/default_abs__item_background_holo_dark.xml
similarity index 100%
rename from android-app-core/res/drawable/default_abs__item_background_holo_dark.xml
rename to android-app-core/src/main/res/drawable/default_abs__item_background_holo_dark.xml
diff --git a/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml b/android-app-core/src/main/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
similarity index 100%
rename from android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
rename to android-app-core/src/main/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
diff --git a/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml b/android-app-core/src/main/res/drawable/default_abs__list_selector_holo_dark.xml
similarity index 100%
rename from android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml
rename to android-app-core/src/main/res/drawable/default_abs__list_selector_holo_dark.xml
diff --git a/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml b/android-app-core/src/main/res/drawable/default_abs__spinner_ab_holo_dark.xml
similarity index 100%
rename from android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml
rename to android-app-core/src/main/res/drawable/default_abs__spinner_ab_holo_dark.xml
diff --git a/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml b/android-app-core/src/main/res/drawable/default_abs__tab_indicator_ab_holo.xml
similarity index 100%
rename from android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml
rename to android-app-core/src/main/res/drawable/default_abs__tab_indicator_ab_holo.xml
diff --git a/android-app-core/res/drawable/gray_button.xml b/android-app-core/src/main/res/drawable/gray_button.xml
similarity index 100%
rename from android-app-core/res/drawable/gray_button.xml
rename to android-app-core/src/main/res/drawable/gray_button.xml
diff --git a/android-app-core/res/drawable/gray_button_dark.xml b/android-app-core/src/main/res/drawable/gray_button_dark.xml
similarity index 100%
rename from android-app-core/res/drawable/gray_button_dark.xml
rename to android-app-core/src/main/res/drawable/gray_button_dark.xml
diff --git a/android-app-core/res/drawable/gray_button_dark_shape.xml b/android-app-core/src/main/res/drawable/gray_button_dark_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/gray_button_dark_shape.xml
rename to android-app-core/src/main/res/drawable/gray_button_dark_shape.xml
diff --git a/android-app-core/res/drawable/gray_button_shape.xml b/android-app-core/src/main/res/drawable/gray_button_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/gray_button_shape.xml
rename to android-app-core/src/main/res/drawable/gray_button_shape.xml
diff --git a/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml b/android-app-core/src/main/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
rename to android-app-core/src/main/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
diff --git a/android-app-core/res/drawable/metro_blue_button.xml b/android-app-core/src/main/res/drawable/metro_blue_button.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_blue_button.xml
rename to android-app-core/src/main/res/drawable/metro_blue_button.xml
diff --git a/android-app-core/res/drawable/metro_blue_button_shape.xml b/android-app-core/src/main/res/drawable/metro_blue_button_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_blue_button_shape.xml
rename to android-app-core/src/main/res/drawable/metro_blue_button_shape.xml
diff --git a/android-app-core/res/drawable/metro_blue_list_item.xml b/android-app-core/src/main/res/drawable/metro_blue_list_item.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_blue_list_item.xml
rename to android-app-core/src/main/res/drawable/metro_blue_list_item.xml
diff --git a/android-app-core/res/drawable/metro_button_dark.xml b/android-app-core/src/main/res/drawable/metro_button_dark.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_button_dark.xml
rename to android-app-core/src/main/res/drawable/metro_button_dark.xml
diff --git a/android-app-core/res/drawable/metro_button_dark_shape.xml b/android-app-core/src/main/res/drawable/metro_button_dark_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_button_dark_shape.xml
rename to android-app-core/src/main/res/drawable/metro_button_dark_shape.xml
diff --git a/android-app-core/res/drawable/metro_button_green.xml b/android-app-core/src/main/res/drawable/metro_button_green.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_button_green.xml
rename to android-app-core/src/main/res/drawable/metro_button_green.xml
diff --git a/android-app-core/res/drawable/metro_button_green_shape.xml b/android-app-core/src/main/res/drawable/metro_button_green_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_button_green_shape.xml
rename to android-app-core/src/main/res/drawable/metro_button_green_shape.xml
diff --git a/android-app-core/res/drawable/metro_button_light.xml b/android-app-core/src/main/res/drawable/metro_button_light.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_button_light.xml
rename to android-app-core/src/main/res/drawable/metro_button_light.xml
diff --git a/android-app-core/res/drawable/metro_button_light_shape.xml b/android-app-core/src/main/res/drawable/metro_button_light_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_button_light_shape.xml
rename to android-app-core/src/main/res/drawable/metro_button_light_shape.xml
diff --git a/android-app-core/res/drawable/metro_button_pressed.xml b/android-app-core/src/main/res/drawable/metro_button_pressed.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_button_pressed.xml
rename to android-app-core/src/main/res/drawable/metro_button_pressed.xml
diff --git a/android-app-core/res/drawable/metro_button_purple.xml b/android-app-core/src/main/res/drawable/metro_button_purple.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_button_purple.xml
rename to android-app-core/src/main/res/drawable/metro_button_purple.xml
diff --git a/android-app-core/res/drawable/metro_button_purple_shape.xml b/android-app-core/src/main/res/drawable/metro_button_purple_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_button_purple_shape.xml
rename to android-app-core/src/main/res/drawable/metro_button_purple_shape.xml
diff --git a/android-app-core/res/drawable/metro_green_list_item.xml b/android-app-core/src/main/res/drawable/metro_green_list_item.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_green_list_item.xml
rename to android-app-core/src/main/res/drawable/metro_green_list_item.xml
diff --git a/android-app-core/res/drawable/metro_purple_list_item.xml b/android-app-core/src/main/res/drawable/metro_purple_list_item.xml
similarity index 100%
rename from android-app-core/res/drawable/metro_purple_list_item.xml
rename to android-app-core/src/main/res/drawable/metro_purple_list_item.xml
diff --git a/android-app-core/res/drawable/pane_background.xml b/android-app-core/src/main/res/drawable/pane_background.xml
similarity index 97%
rename from android-app-core/res/drawable/pane_background.xml
rename to android-app-core/src/main/res/drawable/pane_background.xml
index 23efe1bb..eba530f5 100644
--- a/android-app-core/res/drawable/pane_background.xml
+++ b/android-app-core/src/main/res/drawable/pane_background.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_pane_background"/>
-	<corners android:radius="1dp"/>
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid android:color="@color/cpp_pane_background"/>
+	<corners android:radius="1dp"/>
 </shape>
\ No newline at end of file
diff --git a/android-app-core/res/drawable/violet_button.xml b/android-app-core/src/main/res/drawable/violet_button.xml
similarity index 100%
rename from android-app-core/res/drawable/violet_button.xml
rename to android-app-core/src/main/res/drawable/violet_button.xml
diff --git a/android-app-core/res/drawable/violet_button_dark.xml b/android-app-core/src/main/res/drawable/violet_button_dark.xml
similarity index 100%
rename from android-app-core/res/drawable/violet_button_dark.xml
rename to android-app-core/src/main/res/drawable/violet_button_dark.xml
diff --git a/android-app-core/res/drawable/violet_button_dark_shape.xml b/android-app-core/src/main/res/drawable/violet_button_dark_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/violet_button_dark_shape.xml
rename to android-app-core/src/main/res/drawable/violet_button_dark_shape.xml
diff --git a/android-app-core/res/drawable/violet_button_shape.xml b/android-app-core/src/main/res/drawable/violet_button_shape.xml
similarity index 100%
rename from android-app-core/res/drawable/violet_button_shape.xml
rename to android-app-core/src/main/res/drawable/violet_button_shape.xml
diff --git a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml b/android-app-core/src/main/res/layout/cpp_fixable_messages_dialog.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_fixable_messages_dialog.xml
rename to android-app-core/src/main/res/layout/cpp_fixable_messages_dialog.xml
diff --git a/android-app-core/res/layout/cpp_fixable_messages_dialog_message.xml b/android-app-core/src/main/res/layout/cpp_fixable_messages_dialog_message.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_fixable_messages_dialog_message.xml
rename to android-app-core/src/main/res/layout/cpp_fixable_messages_dialog_message.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_0.xml b/android-app-core/src/main/res/layout/cpp_simple_button_0.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_0.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_0.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_1.xml b/android-app-core/src/main/res/layout/cpp_simple_button_1.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_1.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_1.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_2.xml b/android-app-core/src/main/res/layout/cpp_simple_button_2.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_2.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_2.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_3.xml b/android-app-core/src/main/res/layout/cpp_simple_button_3.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_3.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_3.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_4.xml b/android-app-core/src/main/res/layout/cpp_simple_button_4.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_4.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_4.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_5.xml b/android-app-core/src/main/res/layout/cpp_simple_button_5.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_5.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_5.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_6.xml b/android-app-core/src/main/res/layout/cpp_simple_button_6.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_6.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_6.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_7.xml b/android-app-core/src/main/res/layout/cpp_simple_button_7.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_7.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_7.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_8.xml b/android-app-core/src/main/res/layout/cpp_simple_button_8.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_8.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_8.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_9.xml b/android-app-core/src/main/res/layout/cpp_simple_button_9.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_9.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_9.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_app.xml b/android-app-core/src/main/res/layout/cpp_simple_button_app.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_app.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_app.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_clear.xml b/android-app-core/src/main/res/layout/cpp_simple_button_clear.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_clear.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_clear.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_copy.xml b/android-app-core/src/main/res/layout/cpp_simple_button_copy.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_copy.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_copy.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_division.xml b/android-app-core/src/main/res/layout/cpp_simple_button_division.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_division.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_division.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_dot.xml b/android-app-core/src/main/res/layout/cpp_simple_button_dot.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_dot.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_dot.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_equals.xml b/android-app-core/src/main/res/layout/cpp_simple_button_equals.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_equals.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_equals.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_erase.xml b/android-app-core/src/main/res/layout/cpp_simple_button_erase.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_erase.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_erase.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_functions.xml b/android-app-core/src/main/res/layout/cpp_simple_button_functions.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_functions.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_functions.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_history.xml b/android-app-core/src/main/res/layout/cpp_simple_button_history.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_history.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_history.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_left.xml b/android-app-core/src/main/res/layout/cpp_simple_button_left.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_left.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_left.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_like.xml b/android-app-core/src/main/res/layout/cpp_simple_button_like.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_like.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_like.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_multiplication.xml b/android-app-core/src/main/res/layout/cpp_simple_button_multiplication.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_multiplication.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_multiplication.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_operators.xml b/android-app-core/src/main/res/layout/cpp_simple_button_operators.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_operators.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_operators.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_paste.xml b/android-app-core/src/main/res/layout/cpp_simple_button_paste.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_paste.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_paste.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_percent.xml b/android-app-core/src/main/res/layout/cpp_simple_button_percent.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_percent.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_percent.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_plus.xml b/android-app-core/src/main/res/layout/cpp_simple_button_plus.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_plus.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_plus.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_power.xml b/android-app-core/src/main/res/layout/cpp_simple_button_power.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_power.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_power.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_right.xml b/android-app-core/src/main/res/layout/cpp_simple_button_right.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_right.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_right.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_round_brackets.xml b/android-app-core/src/main/res/layout/cpp_simple_button_round_brackets.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_round_brackets.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_round_brackets.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_settings.xml b/android-app-core/src/main/res/layout/cpp_simple_button_settings.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_settings.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_settings.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_subtraction.xml b/android-app-core/src/main/res/layout/cpp_simple_button_subtraction.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_subtraction.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_subtraction.xml
diff --git a/android-app-core/res/layout/cpp_simple_button_vars.xml b/android-app-core/src/main/res/layout/cpp_simple_button_vars.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_button_vars.xml
rename to android-app-core/src/main/res/layout/cpp_simple_button_vars.xml
diff --git a/android-app-core/res/layout/cpp_simple_keyboard.xml b/android-app-core/src/main/res/layout/cpp_simple_keyboard.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_keyboard.xml
rename to android-app-core/src/main/res/layout/cpp_simple_keyboard.xml
diff --git a/android-app-core/res/layout/cpp_simple_keyboard_lockscreen.xml b/android-app-core/src/main/res/layout/cpp_simple_keyboard_lockscreen.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_keyboard_lockscreen.xml
rename to android-app-core/src/main/res/layout/cpp_simple_keyboard_lockscreen.xml
diff --git a/android-app-core/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml b/android-app-core/src/main/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml
rename to android-app-core/src/main/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml
diff --git a/android-app-core/res/layout/cpp_unit_converter.xml b/android-app-core/src/main/res/layout/cpp_unit_converter.xml
similarity index 100%
rename from android-app-core/res/layout/cpp_unit_converter.xml
rename to android-app-core/src/main/res/layout/cpp_unit_converter.xml
diff --git a/android-app-core/res/values-ar/text_about.xml b/android-app-core/src/main/res/values-ar/text_about.xml
similarity index 100%
rename from android-app-core/res/values-ar/text_about.xml
rename to android-app-core/src/main/res/values-ar/text_about.xml
diff --git a/android-app-core/res/values-ar/text_functions.xml b/android-app-core/src/main/res/values-ar/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-ar/text_functions.xml
rename to android-app-core/src/main/res/values-ar/text_functions.xml
diff --git a/android-app-core/res/values-ar/text_operators.xml b/android-app-core/src/main/res/values-ar/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-ar/text_operators.xml
rename to android-app-core/src/main/res/values-ar/text_operators.xml
diff --git a/android-app-core/res/values-ar/text_preferences.xml b/android-app-core/src/main/res/values-ar/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-ar/text_preferences.xml
rename to android-app-core/src/main/res/values-ar/text_preferences.xml
diff --git a/android-app-core/res/values-ar/text_strings.xml b/android-app-core/src/main/res/values-ar/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-ar/text_strings.xml
rename to android-app-core/src/main/res/values-ar/text_strings.xml
diff --git a/android-app-core/res/values-ar/text_vars.xml b/android-app-core/src/main/res/values-ar/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-ar/text_vars.xml
rename to android-app-core/src/main/res/values-ar/text_vars.xml
diff --git a/android-app-core/res/values-ar/text_wizard.xml b/android-app-core/src/main/res/values-ar/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-ar/text_wizard.xml
rename to android-app-core/src/main/res/values-ar/text_wizard.xml
diff --git a/android-app-core/res/values-cs/text_about.xml b/android-app-core/src/main/res/values-cs/text_about.xml
similarity index 100%
rename from android-app-core/res/values-cs/text_about.xml
rename to android-app-core/src/main/res/values-cs/text_about.xml
diff --git a/android-app-core/res/values-cs/text_functions.xml b/android-app-core/src/main/res/values-cs/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-cs/text_functions.xml
rename to android-app-core/src/main/res/values-cs/text_functions.xml
diff --git a/android-app-core/res/values-cs/text_operators.xml b/android-app-core/src/main/res/values-cs/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-cs/text_operators.xml
rename to android-app-core/src/main/res/values-cs/text_operators.xml
diff --git a/android-app-core/res/values-cs/text_preferences.xml b/android-app-core/src/main/res/values-cs/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-cs/text_preferences.xml
rename to android-app-core/src/main/res/values-cs/text_preferences.xml
diff --git a/android-app-core/res/values-cs/text_strings.xml b/android-app-core/src/main/res/values-cs/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-cs/text_strings.xml
rename to android-app-core/src/main/res/values-cs/text_strings.xml
diff --git a/android-app-core/res/values-cs/text_vars.xml b/android-app-core/src/main/res/values-cs/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-cs/text_vars.xml
rename to android-app-core/src/main/res/values-cs/text_vars.xml
diff --git a/android-app-core/res/values-cs/text_wizard.xml b/android-app-core/src/main/res/values-cs/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-cs/text_wizard.xml
rename to android-app-core/src/main/res/values-cs/text_wizard.xml
diff --git a/android-app-core/res/values-de/text_about.xml b/android-app-core/src/main/res/values-de/text_about.xml
similarity index 100%
rename from android-app-core/res/values-de/text_about.xml
rename to android-app-core/src/main/res/values-de/text_about.xml
diff --git a/android-app-core/res/values-de/text_functions.xml b/android-app-core/src/main/res/values-de/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-de/text_functions.xml
rename to android-app-core/src/main/res/values-de/text_functions.xml
diff --git a/android-app-core/res/values-de/text_operators.xml b/android-app-core/src/main/res/values-de/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-de/text_operators.xml
rename to android-app-core/src/main/res/values-de/text_operators.xml
diff --git a/android-app-core/res/values-de/text_preferences.xml b/android-app-core/src/main/res/values-de/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-de/text_preferences.xml
rename to android-app-core/src/main/res/values-de/text_preferences.xml
diff --git a/android-app-core/res/values-de/text_strings.xml b/android-app-core/src/main/res/values-de/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-de/text_strings.xml
rename to android-app-core/src/main/res/values-de/text_strings.xml
diff --git a/android-app-core/res/values-de/text_vars.xml b/android-app-core/src/main/res/values-de/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-de/text_vars.xml
rename to android-app-core/src/main/res/values-de/text_vars.xml
diff --git a/android-app-core/res/values-de/text_wizard.xml b/android-app-core/src/main/res/values-de/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-de/text_wizard.xml
rename to android-app-core/src/main/res/values-de/text_wizard.xml
diff --git a/android-app-core/res/values-el/text_about.xml b/android-app-core/src/main/res/values-el/text_about.xml
similarity index 100%
rename from android-app-core/res/values-el/text_about.xml
rename to android-app-core/src/main/res/values-el/text_about.xml
diff --git a/android-app-core/res/values-el/text_functions.xml b/android-app-core/src/main/res/values-el/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-el/text_functions.xml
rename to android-app-core/src/main/res/values-el/text_functions.xml
diff --git a/android-app-core/res/values-el/text_operators.xml b/android-app-core/src/main/res/values-el/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-el/text_operators.xml
rename to android-app-core/src/main/res/values-el/text_operators.xml
diff --git a/android-app-core/res/values-el/text_preferences.xml b/android-app-core/src/main/res/values-el/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-el/text_preferences.xml
rename to android-app-core/src/main/res/values-el/text_preferences.xml
diff --git a/android-app-core/res/values-el/text_strings.xml b/android-app-core/src/main/res/values-el/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-el/text_strings.xml
rename to android-app-core/src/main/res/values-el/text_strings.xml
diff --git a/android-app-core/res/values-el/text_vars.xml b/android-app-core/src/main/res/values-el/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-el/text_vars.xml
rename to android-app-core/src/main/res/values-el/text_vars.xml
diff --git a/android-app-core/res/values-el/text_wizard.xml b/android-app-core/src/main/res/values-el/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-el/text_wizard.xml
rename to android-app-core/src/main/res/values-el/text_wizard.xml
diff --git a/android-app-core/res/values-es/text_about.xml b/android-app-core/src/main/res/values-es/text_about.xml
similarity index 100%
rename from android-app-core/res/values-es/text_about.xml
rename to android-app-core/src/main/res/values-es/text_about.xml
diff --git a/android-app-core/res/values-es/text_functions.xml b/android-app-core/src/main/res/values-es/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-es/text_functions.xml
rename to android-app-core/src/main/res/values-es/text_functions.xml
diff --git a/android-app-core/res/values-es/text_operators.xml b/android-app-core/src/main/res/values-es/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-es/text_operators.xml
rename to android-app-core/src/main/res/values-es/text_operators.xml
diff --git a/android-app-core/res/values-es/text_preferences.xml b/android-app-core/src/main/res/values-es/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-es/text_preferences.xml
rename to android-app-core/src/main/res/values-es/text_preferences.xml
diff --git a/android-app-core/res/values-es/text_strings.xml b/android-app-core/src/main/res/values-es/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-es/text_strings.xml
rename to android-app-core/src/main/res/values-es/text_strings.xml
diff --git a/android-app-core/res/values-es/text_vars.xml b/android-app-core/src/main/res/values-es/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-es/text_vars.xml
rename to android-app-core/src/main/res/values-es/text_vars.xml
diff --git a/android-app-core/res/values-es/text_wizard.xml b/android-app-core/src/main/res/values-es/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-es/text_wizard.xml
rename to android-app-core/src/main/res/values-es/text_wizard.xml
diff --git a/android-app-core/res/values-fi/text_about.xml b/android-app-core/src/main/res/values-fi/text_about.xml
similarity index 100%
rename from android-app-core/res/values-fi/text_about.xml
rename to android-app-core/src/main/res/values-fi/text_about.xml
diff --git a/android-app-core/res/values-fi/text_functions.xml b/android-app-core/src/main/res/values-fi/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-fi/text_functions.xml
rename to android-app-core/src/main/res/values-fi/text_functions.xml
diff --git a/android-app-core/res/values-fi/text_operators.xml b/android-app-core/src/main/res/values-fi/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-fi/text_operators.xml
rename to android-app-core/src/main/res/values-fi/text_operators.xml
diff --git a/android-app-core/res/values-fi/text_preferences.xml b/android-app-core/src/main/res/values-fi/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-fi/text_preferences.xml
rename to android-app-core/src/main/res/values-fi/text_preferences.xml
diff --git a/android-app-core/res/values-fi/text_strings.xml b/android-app-core/src/main/res/values-fi/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-fi/text_strings.xml
rename to android-app-core/src/main/res/values-fi/text_strings.xml
diff --git a/android-app-core/res/values-fi/text_vars.xml b/android-app-core/src/main/res/values-fi/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-fi/text_vars.xml
rename to android-app-core/src/main/res/values-fi/text_vars.xml
diff --git a/android-app-core/res/values-fi/text_wizard.xml b/android-app-core/src/main/res/values-fi/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-fi/text_wizard.xml
rename to android-app-core/src/main/res/values-fi/text_wizard.xml
diff --git a/android-app-core/res/values-fr/text_about.xml b/android-app-core/src/main/res/values-fr/text_about.xml
similarity index 100%
rename from android-app-core/res/values-fr/text_about.xml
rename to android-app-core/src/main/res/values-fr/text_about.xml
diff --git a/android-app-core/res/values-fr/text_functions.xml b/android-app-core/src/main/res/values-fr/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-fr/text_functions.xml
rename to android-app-core/src/main/res/values-fr/text_functions.xml
diff --git a/android-app-core/res/values-fr/text_operators.xml b/android-app-core/src/main/res/values-fr/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-fr/text_operators.xml
rename to android-app-core/src/main/res/values-fr/text_operators.xml
diff --git a/android-app-core/res/values-fr/text_preferences.xml b/android-app-core/src/main/res/values-fr/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-fr/text_preferences.xml
rename to android-app-core/src/main/res/values-fr/text_preferences.xml
diff --git a/android-app-core/res/values-fr/text_strings.xml b/android-app-core/src/main/res/values-fr/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-fr/text_strings.xml
rename to android-app-core/src/main/res/values-fr/text_strings.xml
diff --git a/android-app-core/res/values-fr/text_vars.xml b/android-app-core/src/main/res/values-fr/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-fr/text_vars.xml
rename to android-app-core/src/main/res/values-fr/text_vars.xml
diff --git a/android-app-core/res/values-fr/text_wizard.xml b/android-app-core/src/main/res/values-fr/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-fr/text_wizard.xml
rename to android-app-core/src/main/res/values-fr/text_wizard.xml
diff --git a/android-app-core/res/values-it/text_about.xml b/android-app-core/src/main/res/values-it/text_about.xml
similarity index 100%
rename from android-app-core/res/values-it/text_about.xml
rename to android-app-core/src/main/res/values-it/text_about.xml
diff --git a/android-app-core/res/values-it/text_functions.xml b/android-app-core/src/main/res/values-it/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-it/text_functions.xml
rename to android-app-core/src/main/res/values-it/text_functions.xml
diff --git a/android-app-core/res/values-it/text_operators.xml b/android-app-core/src/main/res/values-it/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-it/text_operators.xml
rename to android-app-core/src/main/res/values-it/text_operators.xml
diff --git a/android-app-core/res/values-it/text_preferences.xml b/android-app-core/src/main/res/values-it/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-it/text_preferences.xml
rename to android-app-core/src/main/res/values-it/text_preferences.xml
diff --git a/android-app-core/res/values-it/text_strings.xml b/android-app-core/src/main/res/values-it/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-it/text_strings.xml
rename to android-app-core/src/main/res/values-it/text_strings.xml
diff --git a/android-app-core/res/values-it/text_vars.xml b/android-app-core/src/main/res/values-it/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-it/text_vars.xml
rename to android-app-core/src/main/res/values-it/text_vars.xml
diff --git a/android-app-core/res/values-it/text_wizard.xml b/android-app-core/src/main/res/values-it/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-it/text_wizard.xml
rename to android-app-core/src/main/res/values-it/text_wizard.xml
diff --git a/android-app-core/res/values-ja/text_about.xml b/android-app-core/src/main/res/values-ja/text_about.xml
similarity index 100%
rename from android-app-core/res/values-ja/text_about.xml
rename to android-app-core/src/main/res/values-ja/text_about.xml
diff --git a/android-app-core/res/values-ja/text_functions.xml b/android-app-core/src/main/res/values-ja/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-ja/text_functions.xml
rename to android-app-core/src/main/res/values-ja/text_functions.xml
diff --git a/android-app-core/res/values-ja/text_operators.xml b/android-app-core/src/main/res/values-ja/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-ja/text_operators.xml
rename to android-app-core/src/main/res/values-ja/text_operators.xml
diff --git a/android-app-core/res/values-ja/text_preferences.xml b/android-app-core/src/main/res/values-ja/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-ja/text_preferences.xml
rename to android-app-core/src/main/res/values-ja/text_preferences.xml
diff --git a/android-app-core/res/values-ja/text_strings.xml b/android-app-core/src/main/res/values-ja/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-ja/text_strings.xml
rename to android-app-core/src/main/res/values-ja/text_strings.xml
diff --git a/android-app-core/res/values-ja/text_vars.xml b/android-app-core/src/main/res/values-ja/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-ja/text_vars.xml
rename to android-app-core/src/main/res/values-ja/text_vars.xml
diff --git a/android-app-core/res/values-ja/text_wizard.xml b/android-app-core/src/main/res/values-ja/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-ja/text_wizard.xml
rename to android-app-core/src/main/res/values-ja/text_wizard.xml
diff --git a/android-app-core/res/values-nl/text_about.xml b/android-app-core/src/main/res/values-nl/text_about.xml
similarity index 100%
rename from android-app-core/res/values-nl/text_about.xml
rename to android-app-core/src/main/res/values-nl/text_about.xml
diff --git a/android-app-core/res/values-nl/text_functions.xml b/android-app-core/src/main/res/values-nl/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-nl/text_functions.xml
rename to android-app-core/src/main/res/values-nl/text_functions.xml
diff --git a/android-app-core/res/values-nl/text_operators.xml b/android-app-core/src/main/res/values-nl/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-nl/text_operators.xml
rename to android-app-core/src/main/res/values-nl/text_operators.xml
diff --git a/android-app-core/res/values-nl/text_preferences.xml b/android-app-core/src/main/res/values-nl/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-nl/text_preferences.xml
rename to android-app-core/src/main/res/values-nl/text_preferences.xml
diff --git a/android-app-core/res/values-nl/text_strings.xml b/android-app-core/src/main/res/values-nl/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-nl/text_strings.xml
rename to android-app-core/src/main/res/values-nl/text_strings.xml
diff --git a/android-app-core/res/values-nl/text_vars.xml b/android-app-core/src/main/res/values-nl/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-nl/text_vars.xml
rename to android-app-core/src/main/res/values-nl/text_vars.xml
diff --git a/android-app-core/res/values-nl/text_wizard.xml b/android-app-core/src/main/res/values-nl/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-nl/text_wizard.xml
rename to android-app-core/src/main/res/values-nl/text_wizard.xml
diff --git a/android-app-core/res/values-pl/text_about.xml b/android-app-core/src/main/res/values-pl/text_about.xml
similarity index 100%
rename from android-app-core/res/values-pl/text_about.xml
rename to android-app-core/src/main/res/values-pl/text_about.xml
diff --git a/android-app-core/res/values-pl/text_functions.xml b/android-app-core/src/main/res/values-pl/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-pl/text_functions.xml
rename to android-app-core/src/main/res/values-pl/text_functions.xml
diff --git a/android-app-core/res/values-pl/text_operators.xml b/android-app-core/src/main/res/values-pl/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-pl/text_operators.xml
rename to android-app-core/src/main/res/values-pl/text_operators.xml
diff --git a/android-app-core/res/values-pl/text_preferences.xml b/android-app-core/src/main/res/values-pl/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-pl/text_preferences.xml
rename to android-app-core/src/main/res/values-pl/text_preferences.xml
diff --git a/android-app-core/res/values-pl/text_strings.xml b/android-app-core/src/main/res/values-pl/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-pl/text_strings.xml
rename to android-app-core/src/main/res/values-pl/text_strings.xml
diff --git a/android-app-core/res/values-pl/text_vars.xml b/android-app-core/src/main/res/values-pl/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-pl/text_vars.xml
rename to android-app-core/src/main/res/values-pl/text_vars.xml
diff --git a/android-app-core/res/values-pl/text_wizard.xml b/android-app-core/src/main/res/values-pl/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-pl/text_wizard.xml
rename to android-app-core/src/main/res/values-pl/text_wizard.xml
diff --git a/android-app-core/res/values-pt-rbr/text_about.xml b/android-app-core/src/main/res/values-pt-rbr/text_about.xml
similarity index 100%
rename from android-app-core/res/values-pt-rbr/text_about.xml
rename to android-app-core/src/main/res/values-pt-rbr/text_about.xml
diff --git a/android-app-core/res/values-pt-rbr/text_functions.xml b/android-app-core/src/main/res/values-pt-rbr/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-pt-rbr/text_functions.xml
rename to android-app-core/src/main/res/values-pt-rbr/text_functions.xml
diff --git a/android-app-core/res/values-pt-rbr/text_operators.xml b/android-app-core/src/main/res/values-pt-rbr/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-pt-rbr/text_operators.xml
rename to android-app-core/src/main/res/values-pt-rbr/text_operators.xml
diff --git a/android-app-core/res/values-pt-rbr/text_preferences.xml b/android-app-core/src/main/res/values-pt-rbr/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-pt-rbr/text_preferences.xml
rename to android-app-core/src/main/res/values-pt-rbr/text_preferences.xml
diff --git a/android-app-core/res/values-pt-rbr/text_strings.xml b/android-app-core/src/main/res/values-pt-rbr/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-pt-rbr/text_strings.xml
rename to android-app-core/src/main/res/values-pt-rbr/text_strings.xml
diff --git a/android-app-core/res/values-pt-rbr/text_vars.xml b/android-app-core/src/main/res/values-pt-rbr/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-pt-rbr/text_vars.xml
rename to android-app-core/src/main/res/values-pt-rbr/text_vars.xml
diff --git a/android-app-core/res/values-pt-rbr/text_wizard.xml b/android-app-core/src/main/res/values-pt-rbr/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-pt-rbr/text_wizard.xml
rename to android-app-core/src/main/res/values-pt-rbr/text_wizard.xml
diff --git a/android-app-core/res/values-ru/text_about.xml b/android-app-core/src/main/res/values-ru/text_about.xml
similarity index 100%
rename from android-app-core/res/values-ru/text_about.xml
rename to android-app-core/src/main/res/values-ru/text_about.xml
diff --git a/android-app-core/res/values-ru/text_functions.xml b/android-app-core/src/main/res/values-ru/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-ru/text_functions.xml
rename to android-app-core/src/main/res/values-ru/text_functions.xml
diff --git a/android-app-core/res/values-ru/text_operators.xml b/android-app-core/src/main/res/values-ru/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-ru/text_operators.xml
rename to android-app-core/src/main/res/values-ru/text_operators.xml
diff --git a/android-app-core/res/values-ru/text_preferences.xml b/android-app-core/src/main/res/values-ru/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-ru/text_preferences.xml
rename to android-app-core/src/main/res/values-ru/text_preferences.xml
diff --git a/android-app-core/res/values-ru/text_release_notes.xml b/android-app-core/src/main/res/values-ru/text_release_notes.xml
similarity index 100%
rename from android-app-core/res/values-ru/text_release_notes.xml
rename to android-app-core/src/main/res/values-ru/text_release_notes.xml
diff --git a/android-app-core/res/values-ru/text_strings.xml b/android-app-core/src/main/res/values-ru/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-ru/text_strings.xml
rename to android-app-core/src/main/res/values-ru/text_strings.xml
diff --git a/android-app-core/res/values-ru/text_vars.xml b/android-app-core/src/main/res/values-ru/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-ru/text_vars.xml
rename to android-app-core/src/main/res/values-ru/text_vars.xml
diff --git a/android-app-core/res/values-ru/text_wizard.xml b/android-app-core/src/main/res/values-ru/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-ru/text_wizard.xml
rename to android-app-core/src/main/res/values-ru/text_wizard.xml
diff --git a/android-app-core/res/values-uk/text_about.xml b/android-app-core/src/main/res/values-uk/text_about.xml
similarity index 100%
rename from android-app-core/res/values-uk/text_about.xml
rename to android-app-core/src/main/res/values-uk/text_about.xml
diff --git a/android-app-core/res/values-uk/text_functions.xml b/android-app-core/src/main/res/values-uk/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-uk/text_functions.xml
rename to android-app-core/src/main/res/values-uk/text_functions.xml
diff --git a/android-app-core/res/values-uk/text_operators.xml b/android-app-core/src/main/res/values-uk/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-uk/text_operators.xml
rename to android-app-core/src/main/res/values-uk/text_operators.xml
diff --git a/android-app-core/res/values-uk/text_preferences.xml b/android-app-core/src/main/res/values-uk/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-uk/text_preferences.xml
rename to android-app-core/src/main/res/values-uk/text_preferences.xml
diff --git a/android-app-core/res/values-uk/text_strings.xml b/android-app-core/src/main/res/values-uk/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-uk/text_strings.xml
rename to android-app-core/src/main/res/values-uk/text_strings.xml
diff --git a/android-app-core/res/values-uk/text_vars.xml b/android-app-core/src/main/res/values-uk/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-uk/text_vars.xml
rename to android-app-core/src/main/res/values-uk/text_vars.xml
diff --git a/android-app-core/res/values-uk/text_wizard.xml b/android-app-core/src/main/res/values-uk/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-uk/text_wizard.xml
rename to android-app-core/src/main/res/values-uk/text_wizard.xml
diff --git a/android-app-core/res/values-vi/text_about.xml b/android-app-core/src/main/res/values-vi/text_about.xml
similarity index 100%
rename from android-app-core/res/values-vi/text_about.xml
rename to android-app-core/src/main/res/values-vi/text_about.xml
diff --git a/android-app-core/res/values-vi/text_functions.xml b/android-app-core/src/main/res/values-vi/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-vi/text_functions.xml
rename to android-app-core/src/main/res/values-vi/text_functions.xml
diff --git a/android-app-core/res/values-vi/text_operators.xml b/android-app-core/src/main/res/values-vi/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-vi/text_operators.xml
rename to android-app-core/src/main/res/values-vi/text_operators.xml
diff --git a/android-app-core/res/values-vi/text_preferences.xml b/android-app-core/src/main/res/values-vi/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-vi/text_preferences.xml
rename to android-app-core/src/main/res/values-vi/text_preferences.xml
diff --git a/android-app-core/res/values-vi/text_strings.xml b/android-app-core/src/main/res/values-vi/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-vi/text_strings.xml
rename to android-app-core/src/main/res/values-vi/text_strings.xml
diff --git a/android-app-core/res/values-vi/text_vars.xml b/android-app-core/src/main/res/values-vi/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-vi/text_vars.xml
rename to android-app-core/src/main/res/values-vi/text_vars.xml
diff --git a/android-app-core/res/values-vi/text_wizard.xml b/android-app-core/src/main/res/values-vi/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-vi/text_wizard.xml
rename to android-app-core/src/main/res/values-vi/text_wizard.xml
diff --git a/android-app-core/res/values-zh-rcn/text_about.xml b/android-app-core/src/main/res/values-zh-rcn/text_about.xml
similarity index 100%
rename from android-app-core/res/values-zh-rcn/text_about.xml
rename to android-app-core/src/main/res/values-zh-rcn/text_about.xml
diff --git a/android-app-core/res/values-zh-rcn/text_functions.xml b/android-app-core/src/main/res/values-zh-rcn/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-zh-rcn/text_functions.xml
rename to android-app-core/src/main/res/values-zh-rcn/text_functions.xml
diff --git a/android-app-core/res/values-zh-rcn/text_operators.xml b/android-app-core/src/main/res/values-zh-rcn/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-zh-rcn/text_operators.xml
rename to android-app-core/src/main/res/values-zh-rcn/text_operators.xml
diff --git a/android-app-core/res/values-zh-rcn/text_preferences.xml b/android-app-core/src/main/res/values-zh-rcn/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-zh-rcn/text_preferences.xml
rename to android-app-core/src/main/res/values-zh-rcn/text_preferences.xml
diff --git a/android-app-core/res/values-zh-rcn/text_strings.xml b/android-app-core/src/main/res/values-zh-rcn/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-zh-rcn/text_strings.xml
rename to android-app-core/src/main/res/values-zh-rcn/text_strings.xml
diff --git a/android-app-core/res/values-zh-rcn/text_vars.xml b/android-app-core/src/main/res/values-zh-rcn/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-zh-rcn/text_vars.xml
rename to android-app-core/src/main/res/values-zh-rcn/text_vars.xml
diff --git a/android-app-core/res/values-zh-rcn/text_wizard.xml b/android-app-core/src/main/res/values-zh-rcn/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-zh-rcn/text_wizard.xml
rename to android-app-core/src/main/res/values-zh-rcn/text_wizard.xml
diff --git a/android-app-core/res/values-zh-rtw/text_about.xml b/android-app-core/src/main/res/values-zh-rtw/text_about.xml
similarity index 100%
rename from android-app-core/res/values-zh-rtw/text_about.xml
rename to android-app-core/src/main/res/values-zh-rtw/text_about.xml
diff --git a/android-app-core/res/values-zh-rtw/text_functions.xml b/android-app-core/src/main/res/values-zh-rtw/text_functions.xml
similarity index 100%
rename from android-app-core/res/values-zh-rtw/text_functions.xml
rename to android-app-core/src/main/res/values-zh-rtw/text_functions.xml
diff --git a/android-app-core/res/values-zh-rtw/text_operators.xml b/android-app-core/src/main/res/values-zh-rtw/text_operators.xml
similarity index 100%
rename from android-app-core/res/values-zh-rtw/text_operators.xml
rename to android-app-core/src/main/res/values-zh-rtw/text_operators.xml
diff --git a/android-app-core/res/values-zh-rtw/text_preferences.xml b/android-app-core/src/main/res/values-zh-rtw/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values-zh-rtw/text_preferences.xml
rename to android-app-core/src/main/res/values-zh-rtw/text_preferences.xml
diff --git a/android-app-core/res/values-zh-rtw/text_strings.xml b/android-app-core/src/main/res/values-zh-rtw/text_strings.xml
similarity index 100%
rename from android-app-core/res/values-zh-rtw/text_strings.xml
rename to android-app-core/src/main/res/values-zh-rtw/text_strings.xml
diff --git a/android-app-core/res/values-zh-rtw/text_vars.xml b/android-app-core/src/main/res/values-zh-rtw/text_vars.xml
similarity index 100%
rename from android-app-core/res/values-zh-rtw/text_vars.xml
rename to android-app-core/src/main/res/values-zh-rtw/text_vars.xml
diff --git a/android-app-core/res/values-zh-rtw/text_wizard.xml b/android-app-core/src/main/res/values-zh-rtw/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values-zh-rtw/text_wizard.xml
rename to android-app-core/src/main/res/values-zh-rtw/text_wizard.xml
diff --git a/android-app-core/res/values/arrays.xml b/android-app-core/src/main/res/values/arrays.xml
similarity index 96%
rename from android-app-core/res/values/arrays.xml
rename to android-app-core/src/main/res/values/arrays.xml
index 6fc1d59c..d5a7c2ae 100644
--- a/android-app-core/res/values/arrays.xml
+++ b/android-app-core/src/main/res/values/arrays.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<!--
-	 monochrome,
-    dashed,
-    dotted,
-    dash_dotted;
-	-->
-	<string-array name="cpp_plot_line_style_names">
-		<item>@string/cpp_solid_line_style</item>
-		<item>@string/cpp_dashed_line_style</item>
-		<item>@string/cpp_dotted_line_style</item>
-		<item>@string/cpp_dash_dotted_line_style</item>
-	</string-array>
-
-	<string-array name="cpp_plot_line_color_type_names">
-		<item>@string/cpp_monochrome_line_color_type</item>
-		<item>@string/cpp_color_map_line_color_type</item>
-	</string-array>
-
-	<string-array name="cpp_plot_line_color_names">
-		<item>@string/p_white_line_color</item>
-		<item>@string/p_blue_line_color</item>
-		<item>@string/p_red_line_color</item>
-		<item>@string/p_green_line_color</item>
-		<item>@string/p_grey_line_color</item>
-	</string-array>
-	<string-array name="cpp_plot_line_color_values">
-		<item>white</item>
-		<item>blue</item>
-		<item>red</item>
-		<item>green</item>
-		<item>grey</item>
-	</string-array>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<!--
+	 monochrome,
+    dashed,
+    dotted,
+    dash_dotted;
+	-->
+	<string-array name="cpp_plot_line_style_names">
+		<item>@string/cpp_solid_line_style</item>
+		<item>@string/cpp_dashed_line_style</item>
+		<item>@string/cpp_dotted_line_style</item>
+		<item>@string/cpp_dash_dotted_line_style</item>
+	</string-array>
+
+	<string-array name="cpp_plot_line_color_type_names">
+		<item>@string/cpp_monochrome_line_color_type</item>
+		<item>@string/cpp_color_map_line_color_type</item>
+	</string-array>
+
+	<string-array name="cpp_plot_line_color_names">
+		<item>@string/p_white_line_color</item>
+		<item>@string/p_blue_line_color</item>
+		<item>@string/p_red_line_color</item>
+		<item>@string/p_green_line_color</item>
+		<item>@string/p_grey_line_color</item>
+	</string-array>
+	<string-array name="cpp_plot_line_color_values">
+		<item>white</item>
+		<item>blue</item>
+		<item>red</item>
+		<item>green</item>
+		<item>grey</item>
+	</string-array>
+
 </resources>
\ No newline at end of file
diff --git a/android-app-core/res/values/attributes.xml b/android-app-core/src/main/res/values/attributes.xml
similarity index 100%
rename from android-app-core/res/values/attributes.xml
rename to android-app-core/src/main/res/values/attributes.xml
diff --git a/android-app-core/res/values/colors.xml b/android-app-core/src/main/res/values/colors.xml
similarity index 100%
rename from android-app-core/res/values/colors.xml
rename to android-app-core/src/main/res/values/colors.xml
diff --git a/android-app-core/res/values/dimens.xml b/android-app-core/src/main/res/values/dimens.xml
similarity index 100%
rename from android-app-core/res/values/dimens.xml
rename to android-app-core/src/main/res/values/dimens.xml
diff --git a/android-app-core/res/values/ids.xml b/android-app-core/src/main/res/values/ids.xml
similarity index 95%
rename from android-app-core/res/values/ids.xml
rename to android-app-core/src/main/res/values/ids.xml
index e21a5ace..aa8c5264 100644
--- a/android-app-core/res/values/ids.xml
+++ b/android-app-core/src/main/res/values/ids.xml
@@ -60,4 +60,7 @@
 	<item type="id" name="acl_wizard_next_button"/>
 	<item type="id" name="acl_wizard_content"/>
 
+	<item type="layout" name="main_calculator"/>
+	<item type="layout" name="main_calculator_mobile" />
+
 </resources>
\ No newline at end of file
diff --git a/android-app-core/res/values/styles.xml b/android-app-core/src/main/res/values/styles.xml
similarity index 100%
rename from android-app-core/res/values/styles.xml
rename to android-app-core/src/main/res/values/styles.xml
diff --git a/android-app-core/res/values/text_about.xml b/android-app-core/src/main/res/values/text_about.xml
similarity index 100%
rename from android-app-core/res/values/text_about.xml
rename to android-app-core/src/main/res/values/text_about.xml
diff --git a/android-app-core/res/values/text_functions.xml b/android-app-core/src/main/res/values/text_functions.xml
similarity index 100%
rename from android-app-core/res/values/text_functions.xml
rename to android-app-core/src/main/res/values/text_functions.xml
diff --git a/android-app-core/res/values/text_operators.xml b/android-app-core/src/main/res/values/text_operators.xml
similarity index 100%
rename from android-app-core/res/values/text_operators.xml
rename to android-app-core/src/main/res/values/text_operators.xml
diff --git a/android-app-core/res/values/text_preferences.xml b/android-app-core/src/main/res/values/text_preferences.xml
similarity index 100%
rename from android-app-core/res/values/text_preferences.xml
rename to android-app-core/src/main/res/values/text_preferences.xml
diff --git a/android-app-core/res/values/text_release_notes.xml b/android-app-core/src/main/res/values/text_release_notes.xml
similarity index 100%
rename from android-app-core/res/values/text_release_notes.xml
rename to android-app-core/src/main/res/values/text_release_notes.xml
diff --git a/android-app-core/res/values/text_strings.xml b/android-app-core/src/main/res/values/text_strings.xml
similarity index 100%
rename from android-app-core/res/values/text_strings.xml
rename to android-app-core/src/main/res/values/text_strings.xml
diff --git a/android-app-core/res/values/text_vars.xml b/android-app-core/src/main/res/values/text_vars.xml
similarity index 100%
rename from android-app-core/res/values/text_vars.xml
rename to android-app-core/src/main/res/values/text_vars.xml
diff --git a/android-app-core/res/values/text_wizard.xml b/android-app-core/src/main/res/values/text_wizard.xml
similarity index 100%
rename from android-app-core/res/values/text_wizard.xml
rename to android-app-core/src/main/res/values/text_wizard.xml
diff --git a/android-app-core/res/values/theme_gray.xml b/android-app-core/src/main/res/values/theme_gray.xml
similarity index 100%
rename from android-app-core/res/values/theme_gray.xml
rename to android-app-core/src/main/res/values/theme_gray.xml
diff --git a/android-app-core/res/values/theme_light_blue.xml b/android-app-core/src/main/res/values/theme_light_blue.xml
similarity index 100%
rename from android-app-core/res/values/theme_light_blue.xml
rename to android-app-core/src/main/res/values/theme_light_blue.xml
diff --git a/android-app-core/res/values/theme_metro_blue.xml b/android-app-core/src/main/res/values/theme_metro_blue.xml
similarity index 100%
rename from android-app-core/res/values/theme_metro_blue.xml
rename to android-app-core/src/main/res/values/theme_metro_blue.xml
diff --git a/android-app-core/res/values/theme_metro_green.xml b/android-app-core/src/main/res/values/theme_metro_green.xml
similarity index 100%
rename from android-app-core/res/values/theme_metro_green.xml
rename to android-app-core/src/main/res/values/theme_metro_green.xml
diff --git a/android-app-core/res/values/theme_metro_purple.xml b/android-app-core/src/main/res/values/theme_metro_purple.xml
similarity index 100%
rename from android-app-core/res/values/theme_metro_purple.xml
rename to android-app-core/src/main/res/values/theme_metro_purple.xml
diff --git a/android-app-core/res/values/theme_violet.xml b/android-app-core/src/main/res/values/theme_violet.xml
similarity index 100%
rename from android-app-core/res/values/theme_violet.xml
rename to android-app-core/src/main/res/values/theme_violet.xml
diff --git a/android-app-onscreen.iml b/android-app-onscreen.iml
index 32c6d13c..4adaa690 100644
--- a/android-app-onscreen.iml
+++ b/android-app-onscreen.iml
@@ -5,10 +5,10 @@
       <configuration>
         <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/android-app-onscreen/target/generated-sources/r" />
         <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/android-app-onscreen/target/generated-sources/aidl" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app-onscreen/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/android-app-onscreen/res" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app-onscreen/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/android-app-onscreen/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app-onscreen/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-onscreen/libs" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-onscreen/src/main/libs" />
         <option name="CUSTOM_APK_RESOURCE_FOLDER" value="/android-app-onscreen/target/generated-sources/combined-resources/res" />
         <option name="APK_PATH" value="/android-app-onscreen/target/android-app-onscreen.apk" />
         <option name="LIBRARY_PROJECT" value="true" />
@@ -22,12 +22,13 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/android-app-onscreen/target/idea-classes" />
-    <output-test url="file://$MODULE_DIR$/android-app-onscreen/target/idea-test-classes" />
+    <output url="file://$MODULE_DIR$/android-app-onscreen/target/classes" />
+    <output-test url="file://$MODULE_DIR$/android-app-onscreen/target/test-classes" />
     <content url="file://$MODULE_DIR$/android-app-onscreen">
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-assets" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes-instrumented" />
@@ -39,36 +40,10 @@
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/unpack" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/unpacked-libs" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="module" module-name="android-app-core" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
-    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
@@ -89,6 +64,32 @@
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
     <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
diff --git a/android-app-onscreen/pom.xml b/android-app-onscreen/pom.xml
index 644a258b..52cafcf6 100644
--- a/android-app-onscreen/pom.xml
+++ b/android-app-onscreen/pom.xml
@@ -44,7 +44,7 @@
 
 		<extensions>
 			<extension>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+				<groupId>com.simpligility.maven.plugins</groupId>
 				<artifactId>android-maven-plugin</artifactId>
 			</extension>
 		</extensions>
diff --git a/android-app-onscreen/AndroidManifest.xml b/android-app-onscreen/src/main/AndroidManifest.xml
similarity index 100%
rename from android-app-onscreen/AndroidManifest.xml
rename to android-app-onscreen/src/main/AndroidManifest.xml
diff --git a/android-app-onscreen/res/layout/onscreen_display.xml b/android-app-onscreen/src/main/res/layout/onscreen_display.xml
similarity index 100%
rename from android-app-onscreen/res/layout/onscreen_display.xml
rename to android-app-onscreen/src/main/res/layout/onscreen_display.xml
diff --git a/android-app-onscreen/res/layout/onscreen_editor.xml b/android-app-onscreen/src/main/res/layout/onscreen_editor.xml
similarity index 100%
rename from android-app-onscreen/res/layout/onscreen_editor.xml
rename to android-app-onscreen/src/main/res/layout/onscreen_editor.xml
diff --git a/android-app-onscreen/res/layout/onscreen_footer.xml b/android-app-onscreen/src/main/res/layout/onscreen_footer.xml
similarity index 97%
rename from android-app-onscreen/res/layout/onscreen_footer.xml
rename to android-app-onscreen/src/main/res/layout/onscreen_footer.xml
index 408d9eb4..61afbb42 100644
--- a/android-app-onscreen/res/layout/onscreen_footer.xml
+++ b/android-app-onscreen/src/main/res/layout/onscreen_footer.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="horizontal"
-			  android:layout_width="match_parent"
-			  android:layout_height="wrap_content">
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="horizontal"
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content">
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app-onscreen/res/layout/onscreen_header.xml b/android-app-onscreen/src/main/res/layout/onscreen_header.xml
similarity index 96%
rename from android-app-onscreen/res/layout/onscreen_header.xml
rename to android-app-onscreen/src/main/res/layout/onscreen_header.xml
index fe575532..6d178010 100644
--- a/android-app-onscreen/res/layout/onscreen_header.xml
+++ b/android-app-onscreen/src/main/res/layout/onscreen_header.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:a="http://schemas.android.com/apk/res/android"
-				a:layout_width="match_parent"
-				a:layout_height="30dp">
-
-	<LinearLayout
-			a:id="@+id/onscreen_header_buttons"
-			a:layout_width="wrap_content"
-			a:layout_height="match_parent"
-			a:layout_alignParentRight="true">
-
-		<ImageButton
-				a:id="@+id/onscreen_fold_button"
-				style="@style/onscreen_header_button_style"
-				a:src="@drawable/cpp_onscreen_button_fold"/>
-
-		<ImageButton
-				a:id="@+id/onscreen_minimize_button"
-				style="@style/onscreen_header_button_style"
-				a:src="@drawable/cpp_onscreen_button_minimize"/>
-
-		<ImageButton
-				a:id="@+id/onscreen_close_button"
-				style="@style/onscreen_header_button_style"
-				a:src="@drawable/cpp_onscreen_button_close"/>
-
-	</LinearLayout>
-
-	<ImageView
-			a:id="@+id/onscreen_title"
-			a:layout_width="match_parent"
-			a:layout_height="match_parent"
-			a:src="@drawable/cpp_onscreen_header_logo"
-			a:scaleType="fitStart"
-			a:paddingLeft="6dp"
-			a:paddingTop="2dp"
-			a:paddingBottom="2dp"
-			a:layout_toLeftOf="@id/onscreen_header_buttons"/>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:a="http://schemas.android.com/apk/res/android"
+				a:layout_width="match_parent"
+				a:layout_height="30dp">
+
+	<LinearLayout
+			a:id="@+id/onscreen_header_buttons"
+			a:layout_width="wrap_content"
+			a:layout_height="match_parent"
+			a:layout_alignParentRight="true">
+
+		<ImageButton
+				a:id="@+id/onscreen_fold_button"
+				style="@style/onscreen_header_button_style"
+				a:src="@drawable/cpp_onscreen_button_fold"/>
+
+		<ImageButton
+				a:id="@+id/onscreen_minimize_button"
+				style="@style/onscreen_header_button_style"
+				a:src="@drawable/cpp_onscreen_button_minimize"/>
+
+		<ImageButton
+				a:id="@+id/onscreen_close_button"
+				style="@style/onscreen_header_button_style"
+				a:src="@drawable/cpp_onscreen_button_close"/>
+
+	</LinearLayout>
+
+	<ImageView
+			a:id="@+id/onscreen_title"
+			a:layout_width="match_parent"
+			a:layout_height="match_parent"
+			a:src="@drawable/cpp_onscreen_header_logo"
+			a:scaleType="fitStart"
+			a:paddingLeft="6dp"
+			a:paddingTop="2dp"
+			a:paddingBottom="2dp"
+			a:layout_toLeftOf="@id/onscreen_header_buttons"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/android-app-onscreen/res/layout/onscreen_keyboard.xml b/android-app-onscreen/src/main/res/layout/onscreen_keyboard.xml
similarity index 100%
rename from android-app-onscreen/res/layout/onscreen_keyboard.xml
rename to android-app-onscreen/src/main/res/layout/onscreen_keyboard.xml
diff --git a/android-app-onscreen/res/layout/onscreen_layout.xml b/android-app-onscreen/src/main/res/layout/onscreen_layout.xml
similarity index 100%
rename from android-app-onscreen/res/layout/onscreen_layout.xml
rename to android-app-onscreen/src/main/res/layout/onscreen_layout.xml
diff --git a/android-app-onscreen/res/values/colors.xml b/android-app-onscreen/src/main/res/values/colors.xml
similarity index 100%
rename from android-app-onscreen/res/values/colors.xml
rename to android-app-onscreen/src/main/res/values/colors.xml
diff --git a/android-app-onscreen/res/values/styles.xml b/android-app-onscreen/src/main/res/values/styles.xml
similarity index 100%
rename from android-app-onscreen/res/values/styles.xml
rename to android-app-onscreen/src/main/res/values/styles.xml
diff --git a/android-app-widget.iml b/android-app-widget.iml
index a3f7c602..72b1d7fc 100644
--- a/android-app-widget.iml
+++ b/android-app-widget.iml
@@ -5,10 +5,10 @@
       <configuration>
         <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/android-app-widget/target/generated-sources/r" />
         <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/android-app-widget/target/generated-sources/aidl" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app-widget/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/android-app-widget/res" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app-widget/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/android-app-widget/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app-widget/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-widget/libs" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-widget/src/main/libs" />
         <option name="CUSTOM_APK_RESOURCE_FOLDER" value="/android-app-widget/target/generated-sources/combined-resources/res" />
         <option name="APK_PATH" value="/android-app-widget/target/android-app-widget.apk" />
         <option name="LIBRARY_PROJECT" value="true" />
@@ -22,12 +22,13 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/android-app-widget/target/idea-classes" />
-    <output-test url="file://$MODULE_DIR$/android-app-widget/target/idea-test-classes" />
+    <output url="file://$MODULE_DIR$/android-app-widget/target/classes" />
+    <output-test url="file://$MODULE_DIR$/android-app-widget/target/test-classes" />
     <content url="file://$MODULE_DIR$/android-app-widget">
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-assets" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes-instrumented" />
@@ -39,36 +40,10 @@
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/unpack" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/unpacked-libs" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="module" module-name="android-app-core" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
-    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
@@ -89,6 +64,32 @@
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
     <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
diff --git a/android-app-widget/pom.xml b/android-app-widget/pom.xml
index 5ccb273d..92e4896c 100644
--- a/android-app-widget/pom.xml
+++ b/android-app-widget/pom.xml
@@ -44,7 +44,7 @@
 
 		<extensions>
 			<extension>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+				<groupId>com.simpligility.maven.plugins</groupId>
 				<artifactId>android-maven-plugin</artifactId>
 			</extension>
 		</extensions>
diff --git a/android-app-widget/AndroidManifest.xml b/android-app-widget/src/main/AndroidManifest.xml
similarity index 100%
rename from android-app-widget/AndroidManifest.xml
rename to android-app-widget/src/main/AndroidManifest.xml
diff --git a/android-app-widget/res/layout/widget_display.xml b/android-app-widget/src/main/res/layout/widget_display.xml
similarity index 100%
rename from android-app-widget/res/layout/widget_display.xml
rename to android-app-widget/src/main/res/layout/widget_display.xml
diff --git a/android-app-widget/res/layout/widget_editor.xml b/android-app-widget/src/main/res/layout/widget_editor.xml
similarity index 100%
rename from android-app-widget/res/layout/widget_editor.xml
rename to android-app-widget/src/main/res/layout/widget_editor.xml
diff --git a/android-app-widget/res/layout/widget_layout.xml b/android-app-widget/src/main/res/layout/widget_layout.xml
similarity index 100%
rename from android-app-widget/res/layout/widget_layout.xml
rename to android-app-widget/src/main/res/layout/widget_layout.xml
diff --git a/android-app-widget/res/layout/widget_layout_lockscreen.xml b/android-app-widget/src/main/res/layout/widget_layout_lockscreen.xml
similarity index 100%
rename from android-app-widget/res/layout/widget_layout_lockscreen.xml
rename to android-app-widget/src/main/res/layout/widget_layout_lockscreen.xml
diff --git a/android-app-widget/res/layout/widget_layout_lockscreen_collapsed.xml b/android-app-widget/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
similarity index 100%
rename from android-app-widget/res/layout/widget_layout_lockscreen_collapsed.xml
rename to android-app-widget/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
diff --git a/android-app-widget/res/values/colors.xml b/android-app-widget/src/main/res/values/colors.xml
similarity index 100%
rename from android-app-widget/res/values/colors.xml
rename to android-app-widget/src/main/res/values/colors.xml
diff --git a/android-app-widget/res/values/dimens.xml b/android-app-widget/src/main/res/values/dimens.xml
similarity index 100%
rename from android-app-widget/res/values/dimens.xml
rename to android-app-widget/src/main/res/values/dimens.xml
diff --git a/android-app-widget/res/values/styles.xml b/android-app-widget/src/main/res/values/styles.xml
similarity index 100%
rename from android-app-widget/res/values/styles.xml
rename to android-app-widget/src/main/res/values/styles.xml
diff --git a/android-app.iml b/android-app.iml
index ce94d0d2..e0202cc3 100644
--- a/android-app.iml
+++ b/android-app.iml
@@ -5,13 +5,12 @@
       <configuration>
         <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/android-app/target/generated-sources/r" />
         <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/android-app/target/generated-sources/aidl" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/android-app/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app/libs" />
-        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="/android-app/target/generated-sources/combined-resources/res" />
-        <option name="APK_PATH" value="/android-app/target/android-app.apk" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/android-app/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app/src/main/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app/src/main/libs" />
         <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
+        <option name="PROGUARD_LOGS_FOLDER_RELATIVE_PATH" value="/android-app/proguard_logs" />
         <option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />
         <includeAssetsFromLibraries>true</includeAssetsFromLibraries>
         <resOverlayFolders>
@@ -21,13 +20,14 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/android-app/target/idea-classes" />
-    <output-test url="file://$MODULE_DIR$/android-app/target/idea-test-classes" />
+    <output url="file://$MODULE_DIR$/android-app/target/classes" />
+    <output-test url="file://$MODULE_DIR$/android-app/target/test-classes" />
     <content url="file://$MODULE_DIR$/android-app">
       <sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/android-app/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-assets" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes-instrumented" />
@@ -44,15 +44,33 @@
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/surefire-reports" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/unpack" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app/target/unpacked-libs" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="module" module-name="android-app-core" />
-    <orderEntry type="module" module-name="android-app-widget" />
-    <orderEntry type="module" module-name="android-app-onscreen" />
     <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
@@ -114,26 +132,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:xercesMinimal:1.9.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-6" level="project" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
diff --git a/android-app/pom.xml b/android-app/pom.xml
index 65eea8ad..0a1743b3 100644
--- a/android-app/pom.xml
+++ b/android-app/pom.xml
@@ -143,7 +143,7 @@
 			</plugin>
 
 			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+				<groupId>com.simpligility.maven.plugins</groupId>
 				<artifactId>android-maven-plugin</artifactId>
 				<extensions>true</extensions>
 				<configuration>
@@ -219,7 +219,7 @@
 					<!-- the signed apk then needs to be zipaligned and we activate proguard and we run the manifest
 					update -->
 					<plugin>
-						<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+						<groupId>com.simpligility.maven.plugins</groupId>
 						<artifactId>android-maven-plugin</artifactId>
 						<inherited>true</inherited>
 						<configuration>
diff --git a/android-app/AndroidManifest.xml b/android-app/src/main/AndroidManifest.xml
similarity index 100%
rename from android-app/AndroidManifest.xml
rename to android-app/src/main/AndroidManifest.xml
diff --git a/android-app/assets/fonts/Roboto-Regular.ttf b/android-app/src/main/assets/fonts/Roboto-Regular.ttf
similarity index 100%
rename from android-app/assets/fonts/Roboto-Regular.ttf
rename to android-app/src/main/assets/fonts/Roboto-Regular.ttf
diff --git a/android-app/res/layout-land/cpp_app_keyboard_mobile.xml b/android-app/src/main/res/layout-land/cpp_app_keyboard.xml
similarity index 100%
rename from android-app/res/layout-land/cpp_app_keyboard_mobile.xml
rename to android-app/src/main/res/layout-land/cpp_app_keyboard.xml
diff --git a/android-app/res/layout-land/cpp_app_keyboard.xml b/android-app/src/main/res/layout-land/cpp_app_keyboard_mobile.xml
similarity index 96%
rename from android-app/res/layout-land/cpp_app_keyboard.xml
rename to android-app/src/main/res/layout-land/cpp_app_keyboard_mobile.xml
index 0160cd2e..0dbc7132 100644
--- a/android-app/res/layout-land/cpp_app_keyboard.xml
+++ b/android-app/src/main/res/layout-land/cpp_app_keyboard_mobile.xml
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include layout="@layout/cpp_drag_button_vars"/>
-
-		<include layout="@layout/cpp_app_button_copy"/>
-
-		<include layout="@layout/cpp_drag_button_7"/>
-
-		<include layout="@layout/cpp_drag_button_8"/>
-
-		<include layout="@layout/cpp_drag_button_9"/>
-
-		<include layout="@layout/cpp_drag_button_multiplication"/>
-
-		<include layout="@layout/cpp_drag_button_division"/>
-
-		<include layout="@layout/cpp_drag_button_equals"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include layout="@layout/cpp_drag_button_functions"/>
-
-		<include layout="@layout/cpp_app_button_paste"/>
-
-		<include layout="@layout/cpp_drag_button_4"/>
-
-		<include layout="@layout/cpp_drag_button_5"/>
-
-		<include layout="@layout/cpp_drag_button_6"/>
-
-		<include layout="@layout/cpp_drag_button_plus"/>
-
-		<include layout="@layout/cpp_drag_button_subtraction"/>
-
-		<include layout="@layout/cpp_drag_button_round_brackets"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include layout="@layout/cpp_drag_button_operators"/>
-
-		<include layout="@layout/cpp_app_button_donate"/>
-
-		<include layout="@layout/cpp_drag_button_1"/>
-
-		<include layout="@layout/cpp_drag_button_2"/>
-
-		<include layout="@layout/cpp_drag_button_3"/>
-
-		<include layout="@layout/cpp_drag_button_0"/>
-
-		<include layout="@layout/cpp_drag_button_dot"/>
-
-		<include layout="@layout/cpp_drag_button_history"/>
-
-	</LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:layout_width="match_parent"
+			  a:layout_height="match_parent"
+			  a:orientation="vertical">
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include layout="@layout/cpp_drag_button_vars"/>
+
+		<include layout="@layout/cpp_app_button_copy"/>
+
+		<include layout="@layout/cpp_drag_button_7"/>
+
+		<include layout="@layout/cpp_drag_button_8"/>
+
+		<include layout="@layout/cpp_drag_button_9"/>
+
+		<include layout="@layout/cpp_drag_button_multiplication"/>
+
+		<include layout="@layout/cpp_drag_button_division"/>
+
+		<include layout="@layout/cpp_drag_button_equals"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include layout="@layout/cpp_drag_button_functions"/>
+
+		<include layout="@layout/cpp_app_button_paste"/>
+
+		<include layout="@layout/cpp_drag_button_4"/>
+
+		<include layout="@layout/cpp_drag_button_5"/>
+
+		<include layout="@layout/cpp_drag_button_6"/>
+
+		<include layout="@layout/cpp_drag_button_plus"/>
+
+		<include layout="@layout/cpp_drag_button_subtraction"/>
+
+		<include layout="@layout/cpp_drag_button_round_brackets"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include layout="@layout/cpp_drag_button_operators"/>
+
+		<include layout="@layout/cpp_app_button_donate"/>
+
+		<include layout="@layout/cpp_drag_button_1"/>
+
+		<include layout="@layout/cpp_drag_button_2"/>
+
+		<include layout="@layout/cpp_drag_button_3"/>
+
+		<include layout="@layout/cpp_drag_button_0"/>
+
+		<include layout="@layout/cpp_drag_button_dot"/>
+
+		<include layout="@layout/cpp_drag_button_history"/>
+
+	</LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout-land/main_calculator.xml b/android-app/src/main/res/layout-land/main_calculator.xml
similarity index 97%
rename from android-app/res/layout-land/main_calculator.xml
rename to android-app/src/main/res/layout-land/main_calculator.xml
index 6b6284be..22e0e676 100644
--- a/android-app/res/layout-land/main_calculator.xml
+++ b/android-app/src/main/res/layout-land/main_calculator.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_layout"
-			  a:orientation="vertical"
-			  style="?cpp_main_layout_style">
-
-	<include layout="@layout/main_first_pane"/>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:id="@+id/main_layout"
+			  a:orientation="vertical"
+			  style="?cpp_main_layout_style">
+
+	<include layout="@layout/main_first_pane"/>
+
+</LinearLayout>
diff --git a/android-app/res/layout-land/main_calculator_mobile.xml b/android-app/src/main/res/layout-land/main_calculator_mobile.xml
similarity index 100%
rename from android-app/res/layout-land/main_calculator_mobile.xml
rename to android-app/src/main/res/layout-land/main_calculator_mobile.xml
diff --git a/android-app/res/layout-land/main_first_pane_mobile.xml b/android-app/src/main/res/layout-land/main_first_pane.xml
similarity index 100%
rename from android-app/res/layout-land/main_first_pane_mobile.xml
rename to android-app/src/main/res/layout-land/main_first_pane.xml
diff --git a/android-app/res/layout-land/main_first_pane.xml b/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
similarity index 96%
rename from android-app/res/layout-land/main_first_pane.xml
rename to android-app/src/main/res/layout-land/main_first_pane_mobile.xml
index 9141e043..6567d91e 100644
--- a/android-app/res/layout-land/main_first_pane.xml
+++ b/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical"
-			  a:layout_gravity="center">
-
-	<LinearLayout
-			a:id="@+id/editorContainer"
-			a:layout_weight="2"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include
-				layout="@layout/cpp_drag_button_left"
-				a:layout_margin="@dimen/cpp_button_margin"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"
-				a:layout_weight="1"/>
-
-		<include
-				layout="@layout/cpp_app_button_erase"
-				a:layout_margin="@dimen/cpp_button_margin"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"
-				a:layout_weight="1"/>
-
-		<LinearLayout
-				a:id="@+id/displayContainer"
-				a:layout_height="match_parent"
-				a:layout_width="0dp"
-				a:layout_weight="4"
-				a:layout_margin="@dimen/cpp_display_margin_land"/>
-
-		<include
-				layout="@layout/cpp_drag_button_clear"
-				a:layout_margin="@dimen/cpp_button_margin"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"
-				a:layout_weight="1"/>
-
-		<include
-				layout="@layout/cpp_drag_button_right"
-				a:layout_margin="@dimen/cpp_button_margin"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"
-				a:layout_weight="1"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-			a:id="@+id/keyboardContainer"
-			a:layout_weight="3"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
-
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:layout_width="match_parent"
+			  a:layout_height="match_parent"
+			  a:orientation="vertical"
+			  a:layout_gravity="center">
+
+	<LinearLayout
+			a:id="@+id/editorContainer"
+			a:layout_weight="2"
+			a:layout_width="match_parent"
+			a:layout_height="0dp"/>
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include
+				layout="@layout/cpp_drag_button_left"
+				a:layout_margin="@dimen/cpp_button_margin"
+				a:layout_width="0dp"
+				a:layout_height="match_parent"
+				a:layout_weight="1"/>
+
+		<include
+				layout="@layout/cpp_app_button_erase"
+				a:layout_margin="@dimen/cpp_button_margin"
+				a:layout_width="0dp"
+				a:layout_height="match_parent"
+				a:layout_weight="1"/>
+
+		<LinearLayout
+				a:id="@+id/displayContainer"
+				a:layout_height="match_parent"
+				a:layout_width="0dp"
+				a:layout_weight="4"
+				a:layout_margin="@dimen/cpp_display_margin_land"/>
+
+		<include
+				layout="@layout/cpp_drag_button_clear"
+				a:layout_margin="@dimen/cpp_button_margin"
+				a:layout_width="0dp"
+				a:layout_height="match_parent"
+				a:layout_weight="1"/>
+
+		<include
+				layout="@layout/cpp_drag_button_right"
+				a:layout_margin="@dimen/cpp_button_margin"
+				a:layout_width="0dp"
+				a:layout_height="match_parent"
+				a:layout_weight="1"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+			a:id="@+id/keyboardContainer"
+			a:layout_weight="3"
+			a:layout_width="match_parent"
+			a:layout_height="0dp"/>
+
+
+</LinearLayout>
diff --git a/android-app/res/layout-large-land/cpp_app_keyboard.xml b/android-app/src/main/res/layout-large-land/cpp_app_keyboard.xml
similarity index 100%
rename from android-app/res/layout-large-land/cpp_app_keyboard.xml
rename to android-app/src/main/res/layout-large-land/cpp_app_keyboard.xml
diff --git a/android-app/res/layout-large-land/main_calculator.xml b/android-app/src/main/res/layout-large-land/main_calculator.xml
similarity index 100%
rename from android-app/res/layout-large-land/main_calculator.xml
rename to android-app/src/main/res/layout-large-land/main_calculator.xml
diff --git a/android-app/res/layout-large/cpp_app_display.xml b/android-app/src/main/res/layout-large/cpp_app_display.xml
similarity index 100%
rename from android-app/res/layout-large/cpp_app_display.xml
rename to android-app/src/main/res/layout-large/cpp_app_display.xml
diff --git a/android-app/res/layout-large/cpp_app_editor.xml b/android-app/src/main/res/layout-large/cpp_app_editor.xml
similarity index 100%
rename from android-app/res/layout-large/cpp_app_editor.xml
rename to android-app/src/main/res/layout-large/cpp_app_editor.xml
diff --git a/android-app/res/layout-large/cpp_app_keyboard.xml b/android-app/src/main/res/layout-large/cpp_app_keyboard.xml
similarity index 100%
rename from android-app/res/layout-large/cpp_app_keyboard.xml
rename to android-app/src/main/res/layout-large/cpp_app_keyboard.xml
diff --git a/android-app/res/layout-large/main_calculator.xml b/android-app/src/main/res/layout-large/main_calculator.xml
similarity index 100%
rename from android-app/res/layout-large/main_calculator.xml
rename to android-app/src/main/res/layout-large/main_calculator.xml
diff --git a/android-app/res/layout-xlarge-land/cpp_app_keyboard.xml b/android-app/src/main/res/layout-xlarge-land/cpp_app_keyboard.xml
similarity index 100%
rename from android-app/res/layout-xlarge-land/cpp_app_keyboard.xml
rename to android-app/src/main/res/layout-xlarge-land/cpp_app_keyboard.xml
diff --git a/android-app/res/layout-xlarge-land/main_calculator.xml b/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
similarity index 100%
rename from android-app/res/layout-xlarge-land/main_calculator.xml
rename to android-app/src/main/res/layout-xlarge-land/main_calculator.xml
diff --git a/android-app/res/layout-xlarge/cpp_app_display.xml b/android-app/src/main/res/layout-xlarge/cpp_app_display.xml
similarity index 100%
rename from android-app/res/layout-xlarge/cpp_app_display.xml
rename to android-app/src/main/res/layout-xlarge/cpp_app_display.xml
diff --git a/android-app/res/layout-xlarge/cpp_app_editor.xml b/android-app/src/main/res/layout-xlarge/cpp_app_editor.xml
similarity index 100%
rename from android-app/res/layout-xlarge/cpp_app_editor.xml
rename to android-app/src/main/res/layout-xlarge/cpp_app_editor.xml
diff --git a/android-app/res/layout-xlarge/cpp_app_keyboard.xml b/android-app/src/main/res/layout-xlarge/cpp_app_keyboard.xml
similarity index 100%
rename from android-app/res/layout-xlarge/cpp_app_keyboard.xml
rename to android-app/src/main/res/layout-xlarge/cpp_app_keyboard.xml
diff --git a/android-app/res/layout-xlarge/main_calculator.xml b/android-app/src/main/res/layout-xlarge/main_calculator.xml
similarity index 100%
rename from android-app/res/layout-xlarge/main_calculator.xml
rename to android-app/src/main/res/layout-xlarge/main_calculator.xml
diff --git a/android-app/res/layout/about_fragment.xml b/android-app/src/main/res/layout/about_fragment.xml
similarity index 96%
rename from android-app/res/layout/about_fragment.xml
rename to android-app/src/main/res/layout/about_fragment.xml
index 80302de9..ce76decb 100644
--- a/android-app/res/layout/about_fragment.xml
+++ b/android-app/src/main/res/layout/about_fragment.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	a:orientation="vertical"
-	a:layout_width="fill_parent"
-	a:layout_height="fill_parent"
-	a:background="#ff000000">
-
-	<ImageView
-		a:layout_width="wrap_content"
-		a:layout_height="wrap_content"
-		a:layout_gravity="center"
-		a:layout_weight="1"
-		a:padding="6dp"
-		a:src="@drawable/logo" />
-
-	<ScrollView
-		a:layout_width="fill_parent"
-		a:layout_height="fill_parent"
-		a:layout_weight="1">
-
-		<LinearLayout
-			a:layout_width="fill_parent"
-			a:layout_height="wrap_content"
-			a:orientation="vertical">
-
-			<TextView
-				a:id="@+id/cpp_about_textview"
-				a:text="@string/c_about_content"
-				a:layout_height="match_parent"
-				a:layout_width="match_parent"
-				style="@style/cpp_about_style" />
-
-
-			<TextView
-				a:id="@+id/cpp_about_translators_text"
-				a:text="@string/cpp_translators_text"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				a:paddingBottom="0dp"
-				style="@style/cpp_about_style" />
-
-			<TextView
-				a:id="@+id/cpp_about_translators"
-				a:text="@string/cpp_translators_list"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				a:paddingTop="0dp"
-				style="@style/cpp_about_style" />
-
-		</LinearLayout>
-	</ScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+	a:orientation="vertical"
+	a:layout_width="fill_parent"
+	a:layout_height="fill_parent"
+	a:background="#ff000000">
+
+	<ImageView
+		a:layout_width="wrap_content"
+		a:layout_height="wrap_content"
+		a:layout_gravity="center"
+		a:layout_weight="1"
+		a:padding="6dp"
+		a:src="@drawable/logo" />
+
+	<ScrollView
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
+		a:layout_weight="1">
+
+		<LinearLayout
+			a:layout_width="fill_parent"
+			a:layout_height="wrap_content"
+			a:orientation="vertical">
+
+			<TextView
+				a:id="@+id/cpp_about_textview"
+				a:text="@string/c_about_content"
+				a:layout_height="match_parent"
+				a:layout_width="match_parent"
+				style="@style/cpp_about_style" />
+
+
+			<TextView
+				a:id="@+id/cpp_about_translators_text"
+				a:text="@string/cpp_translators_text"
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				a:paddingBottom="0dp"
+				style="@style/cpp_about_style" />
+
+			<TextView
+				a:id="@+id/cpp_about_translators"
+				a:text="@string/cpp_translators_list"
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				a:paddingTop="0dp"
+				style="@style/cpp_about_style" />
+
+		</LinearLayout>
+	</ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/ad.xml b/android-app/src/main/res/layout/ad.xml
similarity index 100%
rename from android-app/res/layout/ad.xml
rename to android-app/src/main/res/layout/ad.xml
diff --git a/android-app/res/layout/calc_plot_view.xml b/android-app/src/main/res/layout/calc_plot_view.xml
similarity index 100%
rename from android-app/res/layout/calc_plot_view.xml
rename to android-app/src/main/res/layout/calc_plot_view.xml
diff --git a/android-app/res/layout/cpp_app_button_copy.xml b/android-app/src/main/res/layout/cpp_app_button_copy.xml
similarity index 100%
rename from android-app/res/layout/cpp_app_button_copy.xml
rename to android-app/src/main/res/layout/cpp_app_button_copy.xml
diff --git a/android-app/res/layout/cpp_app_button_donate.xml b/android-app/src/main/res/layout/cpp_app_button_donate.xml
similarity index 100%
rename from android-app/res/layout/cpp_app_button_donate.xml
rename to android-app/src/main/res/layout/cpp_app_button_donate.xml
diff --git a/android-app/res/layout/cpp_app_button_erase.xml b/android-app/src/main/res/layout/cpp_app_button_erase.xml
similarity index 97%
rename from android-app/res/layout/cpp_app_button_erase.xml
rename to android-app/src/main/res/layout/cpp_app_button_erase.xml
index f605dccf..1390029f 100644
--- a/android-app/res/layout/cpp_app_button_erase.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_erase.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_erase"
-			 a:src="@drawable/kb_erase"
-			 style="?cpp_control_image_button_style"
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+			 a:id="@id/cpp_button_erase"
+			 a:src="@drawable/kb_erase"
+			 style="?cpp_control_image_button_style"
 			 a:onClick="eraseButtonClickHandler"/>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_app_button_paste.xml b/android-app/src/main/res/layout/cpp_app_button_paste.xml
similarity index 97%
rename from android-app/res/layout/cpp_app_button_paste.xml
rename to android-app/src/main/res/layout/cpp_app_button_paste.xml
index 89057a17..7544b59e 100644
--- a/android-app/res/layout/cpp_app_button_paste.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_paste.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_paste"
-			 a:src="@drawable/kb_paste"
-			 style="?cpp_control_image_button_style"
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+			 a:id="@id/cpp_button_paste"
+			 a:src="@drawable/kb_paste"
+			 style="?cpp_control_image_button_style"
 			 a:onClick="pasteButtonClickHandler"/>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_app_display_mobile.xml b/android-app/src/main/res/layout/cpp_app_display.xml
similarity index 100%
rename from android-app/res/layout/cpp_app_display_mobile.xml
rename to android-app/src/main/res/layout/cpp_app_display.xml
diff --git a/android-app/res/layout/cpp_app_display.xml b/android-app/src/main/res/layout/cpp_app_display_mobile.xml
similarity index 97%
rename from android-app/res/layout/cpp_app_display.xml
rename to android-app/src/main/res/layout/cpp_app_display_mobile.xml
index 836fca7b..462bb091 100644
--- a/android-app/res/layout/cpp_app_display.xml
+++ b/android-app/src/main/res/layout/cpp_app_display_mobile.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
-															  a:id="@+id/calculator_display"
-															  style="@style/cpp_display_style"
-															  a:padding="@dimen/cpp_display_padding"
-															  a:inputType="textMultiLine"
-															  a:maxLines="3"
-															  a:scrollHorizontally="false"
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
+															  a:id="@+id/calculator_display"
+															  style="@style/cpp_display_style"
+															  a:padding="@dimen/cpp_display_padding"
+															  a:inputType="textMultiLine"
+															  a:maxLines="3"
+															  a:scrollHorizontally="false"
 															  a:scrollbars="none"/>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_app_editor.xml b/android-app/src/main/res/layout/cpp_app_editor.xml
similarity index 100%
rename from android-app/res/layout/cpp_app_editor.xml
rename to android-app/src/main/res/layout/cpp_app_editor.xml
diff --git a/android-app/res/layout/cpp_app_editor_mobile.xml b/android-app/src/main/res/layout/cpp_app_editor_mobile.xml
similarity index 100%
rename from android-app/res/layout/cpp_app_editor_mobile.xml
rename to android-app/src/main/res/layout/cpp_app_editor_mobile.xml
diff --git a/android-app/res/layout/cpp_app_keyboard_mobile.xml b/android-app/src/main/res/layout/cpp_app_keyboard.xml
similarity index 100%
rename from android-app/res/layout/cpp_app_keyboard_mobile.xml
rename to android-app/src/main/res/layout/cpp_app_keyboard.xml
diff --git a/android-app/res/layout/cpp_app_keyboard.xml b/android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml
similarity index 96%
rename from android-app/res/layout/cpp_app_keyboard.xml
rename to android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml
index 129a9970..633a98c9 100644
--- a/android-app/res/layout/cpp_app_keyboard.xml
+++ b/android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include layout="@layout/cpp_drag_button_7"/>
-
-		<include layout="@layout/cpp_drag_button_8"/>
-
-		<include layout="@layout/cpp_drag_button_9"/>
-
-		<include layout="@layout/cpp_drag_button_multiplication"/>
-
-		<include layout="@layout/cpp_drag_button_clear"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include layout="@layout/cpp_drag_button_4"/>
-
-		<include layout="@layout/cpp_drag_button_5"/>
-
-		<include layout="@layout/cpp_drag_button_6"/>
-
-		<include layout="@layout/cpp_drag_button_division"/>
-
-		<include layout="@layout/cpp_app_button_erase"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include layout="@layout/cpp_drag_button_1"/>
-
-		<include layout="@layout/cpp_drag_button_2"/>
-
-		<include layout="@layout/cpp_drag_button_3"/>
-
-		<include layout="@layout/cpp_drag_button_plus"/>
-
-		<include layout="@layout/cpp_app_button_copy"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include layout="@layout/cpp_drag_button_round_brackets"/>
-
-		<include layout="@layout/cpp_drag_button_0"/>
-
-		<include layout="@layout/cpp_drag_button_dot"/>
-
-		<include layout="@layout/cpp_drag_button_subtraction"/>
-
-		<include layout="@layout/cpp_app_button_paste"/>
-
-	</LinearLayout>
-
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include layout="@layout/cpp_drag_button_left"/>
-
-		<include layout="@layout/cpp_drag_button_right"/>
-
-		<include layout="@layout/cpp_drag_button_vars"/>
-
-		<include layout="@layout/cpp_drag_button_functions"/>
-
-		<include layout="@layout/cpp_drag_button_history"/>
-
-	</LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:layout_width="match_parent"
+			  a:layout_height="match_parent"
+			  a:orientation="vertical">
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include layout="@layout/cpp_drag_button_7"/>
+
+		<include layout="@layout/cpp_drag_button_8"/>
+
+		<include layout="@layout/cpp_drag_button_9"/>
+
+		<include layout="@layout/cpp_drag_button_multiplication"/>
+
+		<include layout="@layout/cpp_drag_button_clear"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include layout="@layout/cpp_drag_button_4"/>
+
+		<include layout="@layout/cpp_drag_button_5"/>
+
+		<include layout="@layout/cpp_drag_button_6"/>
+
+		<include layout="@layout/cpp_drag_button_division"/>
+
+		<include layout="@layout/cpp_app_button_erase"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include layout="@layout/cpp_drag_button_1"/>
+
+		<include layout="@layout/cpp_drag_button_2"/>
+
+		<include layout="@layout/cpp_drag_button_3"/>
+
+		<include layout="@layout/cpp_drag_button_plus"/>
+
+		<include layout="@layout/cpp_app_button_copy"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include layout="@layout/cpp_drag_button_round_brackets"/>
+
+		<include layout="@layout/cpp_drag_button_0"/>
+
+		<include layout="@layout/cpp_drag_button_dot"/>
+
+		<include layout="@layout/cpp_drag_button_subtraction"/>
+
+		<include layout="@layout/cpp_app_button_paste"/>
+
+	</LinearLayout>
+
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include layout="@layout/cpp_drag_button_left"/>
+
+		<include layout="@layout/cpp_drag_button_right"/>
+
+		<include layout="@layout/cpp_drag_button_vars"/>
+
+		<include layout="@layout/cpp_drag_button_functions"/>
+
+		<include layout="@layout/cpp_drag_button_history"/>
+
+	</LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_dialog.xml b/android-app/src/main/res/layout/cpp_dialog.xml
similarity index 100%
rename from android-app/res/layout/cpp_dialog.xml
rename to android-app/src/main/res/layout/cpp_dialog.xml
diff --git a/android-app/res/layout/cpp_dialog_fragment.xml b/android-app/src/main/res/layout/cpp_dialog_fragment.xml
similarity index 96%
rename from android-app/res/layout/cpp_dialog_fragment.xml
rename to android-app/src/main/res/layout/cpp_dialog_fragment.xml
index 8dda8994..d1a9dd61 100644
--- a/android-app/res/layout/cpp_dialog_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_dialog_fragment.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
-			  a:layout_width="match_parent"
-			  a:layout_gravity="center_horizontal"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
-
-	<TextView
-			a:id="@+id/cpp_dialog_message_textview"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:maxLines="10"
-			a:scrollbars="vertical"/>
-
-	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="horizontal">
-
-		<Button
-				a:id="@+id/cpp_copy_button"
-				a:text="@string/c_copy"
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:visibility="gone"/>
-
-		<Button
-				a:id="@+id/cpp_ok_button"
-				a:text="@string/ok"
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"/>
-
-	</LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:id="@+id/main_fragment_layout"
+			  style="?cpp_fragment_layout_style"
+			  a:layout_width="match_parent"
+			  a:layout_gravity="center_horizontal"
+			  a:layout_height="match_parent"
+			  a:orientation="vertical">
+
+	<TextView
+			a:id="@+id/cpp_dialog_message_textview"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:maxLines="10"
+			a:scrollbars="vertical"/>
+
+	<LinearLayout
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:orientation="horizontal">
+
+		<Button
+				a:id="@+id/cpp_copy_button"
+				a:text="@string/c_copy"
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:visibility="gone"/>
+
+		<Button
+				a:id="@+id/cpp_ok_button"
+				a:text="@string/ok"
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"/>
+
+	</LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_drag_button_0.xml b/android-app/src/main/res/layout/cpp_drag_button_0.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_0.xml
rename to android-app/src/main/res/layout/cpp_drag_button_0.xml
diff --git a/android-app/res/layout/cpp_drag_button_1.xml b/android-app/src/main/res/layout/cpp_drag_button_1.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_1.xml
rename to android-app/src/main/res/layout/cpp_drag_button_1.xml
diff --git a/android-app/res/layout/cpp_drag_button_2.xml b/android-app/src/main/res/layout/cpp_drag_button_2.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_2.xml
rename to android-app/src/main/res/layout/cpp_drag_button_2.xml
diff --git a/android-app/res/layout/cpp_drag_button_3.xml b/android-app/src/main/res/layout/cpp_drag_button_3.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_3.xml
rename to android-app/src/main/res/layout/cpp_drag_button_3.xml
diff --git a/android-app/res/layout/cpp_drag_button_4.xml b/android-app/src/main/res/layout/cpp_drag_button_4.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_4.xml
rename to android-app/src/main/res/layout/cpp_drag_button_4.xml
diff --git a/android-app/res/layout/cpp_drag_button_5.xml b/android-app/src/main/res/layout/cpp_drag_button_5.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_5.xml
rename to android-app/src/main/res/layout/cpp_drag_button_5.xml
diff --git a/android-app/res/layout/cpp_drag_button_6.xml b/android-app/src/main/res/layout/cpp_drag_button_6.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_6.xml
rename to android-app/src/main/res/layout/cpp_drag_button_6.xml
diff --git a/android-app/res/layout/cpp_drag_button_7.xml b/android-app/src/main/res/layout/cpp_drag_button_7.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_7.xml
rename to android-app/src/main/res/layout/cpp_drag_button_7.xml
diff --git a/android-app/res/layout/cpp_drag_button_8.xml b/android-app/src/main/res/layout/cpp_drag_button_8.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_8.xml
rename to android-app/src/main/res/layout/cpp_drag_button_8.xml
diff --git a/android-app/res/layout/cpp_drag_button_9.xml b/android-app/src/main/res/layout/cpp_drag_button_9.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_9.xml
rename to android-app/src/main/res/layout/cpp_drag_button_9.xml
diff --git a/android-app/res/layout/cpp_drag_button_clear.xml b/android-app/src/main/res/layout/cpp_drag_button_clear.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_clear.xml
rename to android-app/src/main/res/layout/cpp_drag_button_clear.xml
diff --git a/android-app/res/layout/cpp_drag_button_division.xml b/android-app/src/main/res/layout/cpp_drag_button_division.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_division.xml
rename to android-app/src/main/res/layout/cpp_drag_button_division.xml
diff --git a/android-app/res/layout/cpp_drag_button_dot.xml b/android-app/src/main/res/layout/cpp_drag_button_dot.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_dot.xml
rename to android-app/src/main/res/layout/cpp_drag_button_dot.xml
diff --git a/android-app/res/layout/cpp_drag_button_empty.xml b/android-app/src/main/res/layout/cpp_drag_button_empty.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_empty.xml
rename to android-app/src/main/res/layout/cpp_drag_button_empty.xml
diff --git a/android-app/res/layout/cpp_drag_button_equals.xml b/android-app/src/main/res/layout/cpp_drag_button_equals.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_equals.xml
rename to android-app/src/main/res/layout/cpp_drag_button_equals.xml
diff --git a/android-app/res/layout/cpp_drag_button_functions.xml b/android-app/src/main/res/layout/cpp_drag_button_functions.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_functions.xml
rename to android-app/src/main/res/layout/cpp_drag_button_functions.xml
diff --git a/android-app/res/layout/cpp_drag_button_history.xml b/android-app/src/main/res/layout/cpp_drag_button_history.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_history.xml
rename to android-app/src/main/res/layout/cpp_drag_button_history.xml
diff --git a/android-app/res/layout/cpp_drag_button_left.xml b/android-app/src/main/res/layout/cpp_drag_button_left.xml
similarity index 97%
rename from android-app/res/layout/cpp_drag_button_left.xml
rename to android-app/src/main/res/layout/cpp_drag_button_left.xml
index dbf4f5a3..b174eb97 100644
--- a/android-app/res/layout/cpp_drag_button_left.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_left.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													a:id="@id/cpp_button_left"
-													c:textUp="◁◁"
-													a:text="◁"
-													c:directionTextScale="0.5"
-													style="?cpp_control_button_style"
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													a:id="@id/cpp_button_left"
+													c:textUp="◁◁"
+													a:text="◁"
+													c:directionTextScale="0.5"
+													style="?cpp_control_button_style"
 													a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_drag_button_multiplication.xml b/android-app/src/main/res/layout/cpp_drag_button_multiplication.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_multiplication.xml
rename to android-app/src/main/res/layout/cpp_drag_button_multiplication.xml
diff --git a/android-app/res/layout/cpp_drag_button_operators.xml b/android-app/src/main/res/layout/cpp_drag_button_operators.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_operators.xml
rename to android-app/src/main/res/layout/cpp_drag_button_operators.xml
diff --git a/android-app/res/layout/cpp_drag_button_plus.xml b/android-app/src/main/res/layout/cpp_drag_button_plus.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_plus.xml
rename to android-app/src/main/res/layout/cpp_drag_button_plus.xml
diff --git a/android-app/res/layout/cpp_drag_button_right.xml b/android-app/src/main/res/layout/cpp_drag_button_right.xml
similarity index 97%
rename from android-app/res/layout/cpp_drag_button_right.xml
rename to android-app/src/main/res/layout/cpp_drag_button_right.xml
index 17659d63..e781dcfb 100644
--- a/android-app/res/layout/cpp_drag_button_right.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_right.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													a:id="@id/cpp_button_right"
-													c:textUp="▷▷"
-													a:text="▷"
-													c:directionTextScale="0.5"
-													style="?cpp_control_button_style"
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
+													xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+													a:id="@id/cpp_button_right"
+													c:textUp="▷▷"
+													a:text="▷"
+													c:directionTextScale="0.5"
+													style="?cpp_control_button_style"
 													a:onClick="digitButtonClickHandler"/>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_drag_button_round_brackets.xml b/android-app/src/main/res/layout/cpp_drag_button_round_brackets.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_round_brackets.xml
rename to android-app/src/main/res/layout/cpp_drag_button_round_brackets.xml
diff --git a/android-app/res/layout/cpp_drag_button_subtraction.xml b/android-app/src/main/res/layout/cpp_drag_button_subtraction.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_subtraction.xml
rename to android-app/src/main/res/layout/cpp_drag_button_subtraction.xml
diff --git a/android-app/res/layout/cpp_drag_button_vars.xml b/android-app/src/main/res/layout/cpp_drag_button_vars.xml
similarity index 100%
rename from android-app/res/layout/cpp_drag_button_vars.xml
rename to android-app/src/main/res/layout/cpp_drag_button_vars.xml
diff --git a/android-app/res/layout/cpp_plot_fragment.xml b/android-app/src/main/res/layout/cpp_plot_fragment.xml
similarity index 100%
rename from android-app/res/layout/cpp_plot_fragment.xml
rename to android-app/src/main/res/layout/cpp_plot_fragment.xml
diff --git a/android-app/res/layout/cpp_plot_function_list_item.xml b/android-app/src/main/res/layout/cpp_plot_function_list_item.xml
similarity index 96%
rename from android-app/res/layout/cpp_plot_function_list_item.xml
rename to android-app/src/main/res/layout/cpp_plot_function_list_item.xml
index bfd1ce45..b4a7f567 100644
--- a/android-app/res/layout/cpp_plot_function_list_item.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_list_item.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="wrap_content"
-			  a:orientation="horizontal">
-
-	<TextView
-			a:id="@+id/cpp_plot_function_expression_textview"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="3"/>
-
-	<CheckBox
-			a:id="@+id/cpp_plot_function_pinned_checkbox"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="1"/>
-
-	<CheckBox
-			a:id="@+id/cpp_plot_function_visible_checkbox"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="1"/>
-
-	<ImageButton
-			a:id="@+id/cpp_plot_function_settings_button"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="1"
-			a:paddingTop="0dp"
-			a:paddingBottom="0dp"
-			a:scaleType="centerInside"
-			a:src="@drawable/kb_settings"/>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:layout_width="match_parent"
+			  a:layout_height="wrap_content"
+			  a:orientation="horizontal">
+
+	<TextView
+			a:id="@+id/cpp_plot_function_expression_textview"
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="3"/>
+
+	<CheckBox
+			a:id="@+id/cpp_plot_function_pinned_checkbox"
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"/>
+
+	<CheckBox
+			a:id="@+id/cpp_plot_function_visible_checkbox"
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"/>
+
+	<ImageButton
+			a:id="@+id/cpp_plot_function_settings_button"
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"
+			a:paddingTop="0dp"
+			a:paddingBottom="0dp"
+			a:scaleType="centerInside"
+			a:src="@drawable/kb_settings"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_plot_function_settings_dialog.xml b/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
similarity index 100%
rename from android-app/res/layout/cpp_plot_function_settings_dialog.xml
rename to android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
diff --git a/android-app/res/layout/cpp_plot_function_settings_fragment.xml b/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
similarity index 96%
rename from android-app/res/layout/cpp_plot_function_settings_fragment.xml
rename to android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
index 952adffa..998af24a 100644
--- a/android-app/res/layout/cpp_plot_function_settings_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
-			  a:layout_width="wrap_content"
-			  a:layout_gravity="center_horizontal"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
-
-	<include layout="@layout/ad"/>
-
-	<TextView
-			a:text="@string/cpp_plot_function_line_color_type"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
-	<Spinner
-			a:id="@+id/cpp_plot_function_line_color_type_spinner"
-			a:entries="@array/cpp_plot_line_color_type_names"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
-	<TextView
-			a:text="@string/cpp_plot_function_line_color"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
-	<Spinner
-			a:id="@+id/cpp_plot_function_line_color_spinner"
-			a:entries="@array/cpp_plot_line_color_names"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
-	<TextView
-			a:text="@string/cpp_plot_function_line_style"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
-	<Spinner
-			a:id="@+id/cpp_plot_function_line_style_spinner"
-			a:entries="@array/cpp_plot_line_style_names"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
-	<TextView
-			a:text="@string/cpp_plot_function_line_width"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
-	<SeekBar
-			a:id="@+id/cpp_plot_functions_line_width_seekbar"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
-	<Button
-			a:id="@+id/cpp_apply_button"
-			a:text="@string/cpp_apply"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:id="@+id/main_fragment_layout"
+			  style="?cpp_fragment_layout_style"
+			  a:layout_width="wrap_content"
+			  a:layout_gravity="center_horizontal"
+			  a:layout_height="match_parent"
+			  a:orientation="vertical">
+
+	<include layout="@layout/ad"/>
+
+	<TextView
+			a:text="@string/cpp_plot_function_line_color_type"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
+	<Spinner
+			a:id="@+id/cpp_plot_function_line_color_type_spinner"
+			a:entries="@array/cpp_plot_line_color_type_names"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
+	<TextView
+			a:text="@string/cpp_plot_function_line_color"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
+	<Spinner
+			a:id="@+id/cpp_plot_function_line_color_spinner"
+			a:entries="@array/cpp_plot_line_color_names"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
+	<TextView
+			a:text="@string/cpp_plot_function_line_style"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
+	<Spinner
+			a:id="@+id/cpp_plot_function_line_style_spinner"
+			a:entries="@array/cpp_plot_line_style_names"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
+	<TextView
+			a:text="@string/cpp_plot_function_line_width"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
+	<SeekBar
+			a:id="@+id/cpp_plot_functions_line_width_seekbar"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
+	<Button
+			a:id="@+id/cpp_apply_button"
+			a:text="@string/cpp_apply"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_plot_functions_fragment.xml b/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
similarity index 96%
rename from android-app/res/layout/cpp_plot_functions_fragment.xml
rename to android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
index 094c3150..266e3c83 100644
--- a/android-app/res/layout/cpp_plot_functions_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
-
-	<include layout="@layout/ad"/>
-
-	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="horizontal">
-
-		<TextView
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="3"
-				a:text="@string/cpp_function"/>
-
-		<TextView
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:text="@string/cpp_pinned"/>
-
-		<TextView
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:text="@string/cpp_visible"/>
-
-		<TextView
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"/>
-
-	</LinearLayout>
-
-	<ListView style="?cpp_fragment_list_view_style"/>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:id="@+id/main_fragment_layout"
+			  style="?cpp_fragment_layout_style"
+			  a:layout_width="match_parent"
+			  a:layout_height="match_parent">
+
+	<include layout="@layout/ad"/>
+
+	<LinearLayout
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:orientation="horizontal">
+
+		<TextView
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="3"
+				a:text="@string/cpp_function"/>
+
+		<TextView
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:text="@string/cpp_pinned"/>
+
+		<TextView
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:text="@string/cpp_visible"/>
+
+		<TextView
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"/>
+
+	</LinearLayout>
+
+	<ListView style="?cpp_fragment_list_view_style"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_plot_range_fragment.xml b/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
similarity index 96%
rename from android-app/res/layout/cpp_plot_range_fragment.xml
rename to android-app/src/main/res/layout/cpp_plot_range_fragment.xml
index e407446e..dc0e5343 100644
--- a/android-app/res/layout/cpp_plot_range_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
@@ -1,131 +1,131 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
-			  a:layout_width="match_parent"
-			  a:layout_gravity="center_horizontal"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
-
-	<include layout="@layout/ad"/>
-
-	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="horizontal"
-			a:baselineAligned="false">
-
-		<LinearLayout
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:orientation="vertical">
-
-			<TextView
-					a:text="@string/cpp_plot_range_x_min"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
-
-			<EditText
-					a:id="@+id/cpp_plot_range_x_min_editext"
-					a:inputType="numberDecimal|numberSigned"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
-		</LinearLayout>
-
-		<LinearLayout
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:orientation="vertical">
-
-			<TextView
-					a:text="@string/cpp_plot_range_x_max"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
-
-			<EditText
-					a:id="@+id/cpp_plot_range_x_max_editext"
-					a:inputType="numberDecimal|numberSigned"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
-		</LinearLayout>
-
-
-	</LinearLayout>
-
-	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="horizontal"
-			a:baselineAligned="false">
-
-		<LinearLayout
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:orientation="vertical">
-
-			<TextView
-					a:text="@string/cpp_plot_range_y_min"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
-
-			<EditText
-					a:id="@+id/cpp_plot_range_y_min_editext"
-					a:inputType="numberDecimal|numberSigned"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
-		</LinearLayout>
-
-		<LinearLayout
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:orientation="vertical">
-
-			<TextView
-					a:text="@string/cpp_plot_range_y_max"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
-
-			<EditText
-					a:id="@+id/cpp_plot_range_y_max_editext"
-					a:inputType="numberDecimal|numberSigned"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
-		</LinearLayout>
-
-
-	</LinearLayout>
-
-	<Button
-			a:id="@+id/cpp_apply_button"
-			a:text="@string/cpp_apply"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:id="@+id/main_fragment_layout"
+			  style="?cpp_fragment_layout_style"
+			  a:layout_width="match_parent"
+			  a:layout_gravity="center_horizontal"
+			  a:layout_height="match_parent"
+			  a:orientation="vertical">
+
+	<include layout="@layout/ad"/>
+
+	<LinearLayout
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:orientation="horizontal"
+			a:baselineAligned="false">
+
+		<LinearLayout
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:orientation="vertical">
+
+			<TextView
+					a:text="@string/cpp_plot_range_x_min"
+					a:layout_width="match_parent"
+					a:layout_height="wrap_content"/>
+
+			<EditText
+					a:id="@+id/cpp_plot_range_x_min_editext"
+					a:inputType="numberDecimal|numberSigned"
+					a:layout_width="match_parent"
+					a:layout_height="wrap_content"/>
+		</LinearLayout>
+
+		<LinearLayout
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:orientation="vertical">
+
+			<TextView
+					a:text="@string/cpp_plot_range_x_max"
+					a:layout_width="match_parent"
+					a:layout_height="wrap_content"/>
+
+			<EditText
+					a:id="@+id/cpp_plot_range_x_max_editext"
+					a:inputType="numberDecimal|numberSigned"
+					a:layout_width="match_parent"
+					a:layout_height="wrap_content"/>
+		</LinearLayout>
+
+
+	</LinearLayout>
+
+	<LinearLayout
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:orientation="horizontal"
+			a:baselineAligned="false">
+
+		<LinearLayout
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:orientation="vertical">
+
+			<TextView
+					a:text="@string/cpp_plot_range_y_min"
+					a:layout_width="match_parent"
+					a:layout_height="wrap_content"/>
+
+			<EditText
+					a:id="@+id/cpp_plot_range_y_min_editext"
+					a:inputType="numberDecimal|numberSigned"
+					a:layout_width="match_parent"
+					a:layout_height="wrap_content"/>
+		</LinearLayout>
+
+		<LinearLayout
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:orientation="vertical">
+
+			<TextView
+					a:text="@string/cpp_plot_range_y_max"
+					a:layout_width="match_parent"
+					a:layout_height="wrap_content"/>
+
+			<EditText
+					a:id="@+id/cpp_plot_range_y_max_editext"
+					a:inputType="numberDecimal|numberSigned"
+					a:layout_width="match_parent"
+					a:layout_height="wrap_content"/>
+		</LinearLayout>
+
+
+	</LinearLayout>
+
+	<Button
+			a:id="@+id/cpp_apply_button"
+			a:text="@string/cpp_apply"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_purchase_dialog_fragment.xml b/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
similarity index 96%
rename from android-app/res/layout/cpp_purchase_dialog_fragment.xml
rename to android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
index 877f5574..e910cd7e 100644
--- a/android-app/res/layout/cpp_purchase_dialog_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
-			  a:layout_width="match_parent"
-			  a:layout_gravity="center_horizontal"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
-
-	<TextView
-			a:id="@+id/cpp_purchase_text"
-			a:text="@string/cpp_purchase_text"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:maxLines="10"
-			a:scrollbars="vertical"/>
-
-	<Button
-			a:id="@+id/cpp_continue_button"
-			a:text="@string/cpp_continue"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:id="@+id/main_fragment_layout"
+			  style="?cpp_fragment_layout_style"
+			  a:layout_width="match_parent"
+			  a:layout_gravity="center_horizontal"
+			  a:layout_height="match_parent"
+			  a:orientation="vertical">
+
+	<TextView
+			a:id="@+id/cpp_purchase_text"
+			a:text="@string/cpp_purchase_text"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:maxLines="10"
+			a:scrollbars="vertical"/>
+
+	<Button
+			a:id="@+id/cpp_continue_button"
+			a:text="@string/cpp_continue"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_wiki_page.xml b/android-app/src/main/res/layout/cpp_wiki_page.xml
similarity index 100%
rename from android-app/res/layout/cpp_wiki_page.xml
rename to android-app/src/main/res/layout/cpp_wiki_page.xml
diff --git a/android-app/res/layout/cpp_wizard.xml b/android-app/src/main/res/layout/cpp_wizard.xml
similarity index 100%
rename from android-app/res/layout/cpp_wizard.xml
rename to android-app/src/main/res/layout/cpp_wizard.xml
diff --git a/android-app/res/layout/cpp_wizard_step_choose_layout.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml
similarity index 100%
rename from android-app/res/layout/cpp_wizard_step_choose_layout.xml
rename to android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml
diff --git a/android-app/res/layout/cpp_wizard_step_choose_mode.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
similarity index 100%
rename from android-app/res/layout/cpp_wizard_step_choose_mode.xml
rename to android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
diff --git a/android-app/res/layout/cpp_wizard_step_drag_button.xml b/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
similarity index 100%
rename from android-app/res/layout/cpp_wizard_step_drag_button.xml
rename to android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
diff --git a/android-app/res/layout/cpp_wizard_step_final.xml b/android-app/src/main/res/layout/cpp_wizard_step_final.xml
similarity index 100%
rename from android-app/res/layout/cpp_wizard_step_final.xml
rename to android-app/src/main/res/layout/cpp_wizard_step_final.xml
diff --git a/android-app/res/layout/cpp_wizard_step_onscreen.xml b/android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml
similarity index 100%
rename from android-app/res/layout/cpp_wizard_step_onscreen.xml
rename to android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml
diff --git a/android-app/res/layout/cpp_wizard_step_welcome.xml b/android-app/src/main/res/layout/cpp_wizard_step_welcome.xml
similarity index 100%
rename from android-app/res/layout/cpp_wizard_step_welcome.xml
rename to android-app/src/main/res/layout/cpp_wizard_step_welcome.xml
diff --git a/android-app/res/layout/display_error_message.xml b/android-app/src/main/res/layout/display_error_message.xml
similarity index 100%
rename from android-app/res/layout/display_error_message.xml
rename to android-app/src/main/res/layout/display_error_message.xml
diff --git a/android-app/res/layout/drag_button_calibration.xml b/android-app/src/main/res/layout/drag_button_calibration.xml
similarity index 100%
rename from android-app/res/layout/drag_button_calibration.xml
rename to android-app/src/main/res/layout/drag_button_calibration.xml
diff --git a/android-app/res/layout/feedback.xml b/android-app/src/main/res/layout/feedback.xml
similarity index 100%
rename from android-app/res/layout/feedback.xml
rename to android-app/src/main/res/layout/feedback.xml
diff --git a/android-app/res/layout/function_add_param.xml b/android-app/src/main/res/layout/function_add_param.xml
similarity index 100%
rename from android-app/res/layout/function_add_param.xml
rename to android-app/src/main/res/layout/function_add_param.xml
diff --git a/android-app/res/layout/function_edit.xml b/android-app/src/main/res/layout/function_edit.xml
similarity index 100%
rename from android-app/res/layout/function_edit.xml
rename to android-app/src/main/res/layout/function_edit.xml
diff --git a/android-app/res/layout/function_edit_param.xml b/android-app/src/main/res/layout/function_edit_param.xml
similarity index 100%
rename from android-app/res/layout/function_edit_param.xml
rename to android-app/src/main/res/layout/function_edit_param.xml
diff --git a/android-app/res/layout/history_edit.xml b/android-app/src/main/res/layout/history_edit.xml
similarity index 100%
rename from android-app/res/layout/history_edit.xml
rename to android-app/src/main/res/layout/history_edit.xml
diff --git a/android-app/res/layout/history_fragment.xml b/android-app/src/main/res/layout/history_fragment.xml
similarity index 100%
rename from android-app/res/layout/history_fragment.xml
rename to android-app/src/main/res/layout/history_fragment.xml
diff --git a/android-app/res/layout/history_item.xml b/android-app/src/main/res/layout/history_item.xml
similarity index 100%
rename from android-app/res/layout/history_item.xml
rename to android-app/src/main/res/layout/history_item.xml
diff --git a/android-app/res/layout/main_calculator_mobile.xml b/android-app/src/main/res/layout/main_calculator.xml
similarity index 100%
rename from android-app/res/layout/main_calculator_mobile.xml
rename to android-app/src/main/res/layout/main_calculator.xml
diff --git a/android-app/res/layout/main_calculator.xml b/android-app/src/main/res/layout/main_calculator_mobile.xml
similarity index 96%
rename from android-app/res/layout/main_calculator.xml
rename to android-app/src/main/res/layout/main_calculator_mobile.xml
index 3fd7a7f4..77d335b7 100644
--- a/android-app/res/layout/main_calculator.xml
+++ b/android-app/src/main/res/layout/main_calculator_mobile.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:id="@+id/main_layout"
-			  a:orientation="vertical"
-			  style="?cpp_main_layout_style">
-
-	<LinearLayout
-			a:id="@+id/editorContainer"
-			a:layout_weight="2"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
-
-	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
-
-		<include
-				layout="@layout/cpp_drag_button_equals"
-				a:layout_margin="@dimen/cpp_button_margin"
-				a:layout_weight="1"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"/>
-
-		<LinearLayout
-				a:id="@+id/displayContainer"
-				a:layout_weight="4"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-			a:id="@+id/keyboardContainer"
-			a:layout_weight="5"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:layout_width="match_parent"
+			  a:layout_height="match_parent"
+			  a:id="@+id/main_layout"
+			  a:orientation="vertical"
+			  style="?cpp_main_layout_style">
+
+	<LinearLayout
+			a:id="@+id/editorContainer"
+			a:layout_weight="2"
+			a:layout_width="match_parent"
+			a:layout_height="0dp"/>
+
+	<LinearLayout
+			a:layout_weight="1"
+			a:layout_width="match_parent"
+			a:layout_height="0dp">
+
+		<include
+				layout="@layout/cpp_drag_button_equals"
+				a:layout_margin="@dimen/cpp_button_margin"
+				a:layout_weight="1"
+				a:layout_width="0dp"
+				a:layout_height="match_parent"/>
+
+		<LinearLayout
+				a:id="@+id/displayContainer"
+				a:layout_weight="4"
+				a:layout_width="0dp"
+				a:layout_height="match_parent"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+			a:id="@+id/keyboardContainer"
+			a:layout_weight="5"
+			a:layout_width="match_parent"
+			a:layout_height="0dp"/>
+
+</LinearLayout>
diff --git a/android-app/res/layout/main_empty.xml b/android-app/src/main/res/layout/main_empty.xml
similarity index 97%
rename from android-app/res/layout/main_empty.xml
rename to android-app/src/main/res/layout/main_empty.xml
index de6c14a1..f7c124c0 100644
--- a/android-app/res/layout/main_empty.xml
+++ b/android-app/src/main/res/layout/main_empty.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_layout"
-			  style="?cpp_main_layout_style"
-			  a:orientation="vertical">
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:id="@+id/main_layout"
+			  style="?cpp_main_layout_style"
+			  a:orientation="vertical">
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/main_empty_multi_pane.xml b/android-app/src/main/res/layout/main_empty_multi_pane.xml
similarity index 97%
rename from android-app/res/layout/main_empty_multi_pane.xml
rename to android-app/src/main/res/layout/main_empty_multi_pane.xml
index f7ccc04f..20359ebc 100644
--- a/android-app/res/layout/main_empty_multi_pane.xml
+++ b/android-app/src/main/res/layout/main_empty_multi_pane.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_layout"
-			  style="?cpp_main_multi_pane_layout_style"
-			  a:orientation="vertical">
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:id="@+id/main_layout"
+			  style="?cpp_main_multi_pane_layout_style"
+			  a:orientation="vertical">
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/math_entities_fragment.xml b/android-app/src/main/res/layout/math_entities_fragment.xml
similarity index 100%
rename from android-app/res/layout/math_entities_fragment.xml
rename to android-app/src/main/res/layout/math_entities_fragment.xml
diff --git a/android-app/res/layout/math_entity.xml b/android-app/src/main/res/layout/math_entity.xml
similarity index 100%
rename from android-app/res/layout/math_entity.xml
rename to android-app/src/main/res/layout/math_entity.xml
diff --git a/android-app/res/layout/matrix_edit_fragment.xml b/android-app/src/main/res/layout/matrix_edit_fragment.xml
similarity index 96%
rename from android-app/res/layout/matrix_edit_fragment.xml
rename to android-app/src/main/res/layout/matrix_edit_fragment.xml
index 2ba2961b..b49ee31b 100644
--- a/android-app/res/layout/matrix_edit_fragment.xml
+++ b/android-app/src/main/res/layout/matrix_edit_fragment.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  xmlns:picker="http://schemas.android.com/apk/res-auto"
-			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
-
-	<TextView
-			a:id="@+id/fragmentTitle"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			style="?cpp_fragment_title_style"/>
-
-	<include layout="@layout/ad"/>
-
-	<LinearLayout
-			a:layout_height="match_parent"
-			a:layout_width="match_parent"
-			a:orientation="vertical">
-
-		<org.solovyev.android.view.Picker
-				a:id="@+id/matrix_cols_count_picker"
-				a:layout_height="wrap_content"
-				a:layout_width="wrap_content"
-				a:layout_gravity="center"
-				picker:orientation="horizontal"/>
-
-		<LinearLayout
-				a:layout_height="match_parent"
-				a:layout_width="match_parent"
-				a:orientation="horizontal"
-				a:gravity="center">
-
-			<org.solovyev.android.view.Picker
-					a:id="@+id/matrix_rows_count_picker"
-					a:layout_height="wrap_content"
-					a:layout_width="wrap_content"/>
-
-			<ScrollView
-					a:layout_height="match_parent"
-					a:layout_width="match_parent"
-					a:scrollbars="vertical">
-
-				<HorizontalScrollView
-						a:layout_height="wrap_content"
-						a:layout_width="match_parent"
-						a:minHeight="300dp">
-
-					<org.solovyev.android.calculator.matrix.MatrixView
-							a:id="@+id/matrix_layout"
-							a:layout_height="match_parent"
-							a:layout_width="match_parent"
-							a:minWidth="300dp"/>
-
-				</HorizontalScrollView>
-
-			</ScrollView>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  xmlns:picker="http://schemas.android.com/apk/res-auto"
+			  a:id="@+id/main_fragment_layout"
+			  style="?cpp_fragment_layout_style"
+			  a:layout_width="match_parent"
+			  a:layout_height="match_parent">
+
+	<TextView
+			a:id="@+id/fragmentTitle"
+			a:layout_height="wrap_content"
+			a:layout_width="match_parent"
+			style="?cpp_fragment_title_style"/>
+
+	<include layout="@layout/ad"/>
+
+	<LinearLayout
+			a:layout_height="match_parent"
+			a:layout_width="match_parent"
+			a:orientation="vertical">
+
+		<org.solovyev.android.view.Picker
+				a:id="@+id/matrix_cols_count_picker"
+				a:layout_height="wrap_content"
+				a:layout_width="wrap_content"
+				a:layout_gravity="center"
+				picker:orientation="horizontal"/>
+
+		<LinearLayout
+				a:layout_height="match_parent"
+				a:layout_width="match_parent"
+				a:orientation="horizontal"
+				a:gravity="center">
+
+			<org.solovyev.android.view.Picker
+					a:id="@+id/matrix_rows_count_picker"
+					a:layout_height="wrap_content"
+					a:layout_width="wrap_content"/>
+
+			<ScrollView
+					a:layout_height="match_parent"
+					a:layout_width="match_parent"
+					a:scrollbars="vertical">
+
+				<HorizontalScrollView
+						a:layout_height="wrap_content"
+						a:layout_width="match_parent"
+						a:minHeight="300dp">
+
+					<org.solovyev.android.calculator.matrix.MatrixView
+							a:id="@+id/matrix_layout"
+							a:layout_height="match_parent"
+							a:layout_width="match_parent"
+							a:minWidth="300dp"/>
+
+				</HorizontalScrollView>
+
+			</ScrollView>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/matrix_edit_fragment_item.xml b/android-app/src/main/res/layout/matrix_edit_fragment_item.xml
similarity index 97%
rename from android-app/res/layout/matrix_edit_fragment_item.xml
rename to android-app/src/main/res/layout/matrix_edit_fragment_item.xml
index 4a8647d8..f1d4c823 100644
--- a/android-app/res/layout/matrix_edit_fragment_item.xml
+++ b/android-app/src/main/res/layout/matrix_edit_fragment_item.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_height="match_parent"
-			  a:layout_width="match_parent">
-
-	<EditText
-			a:id="@+id/matrix_element_edittext"
-			a:layout_height="match_parent"
-			a:layout_width="match_parent"
-			a:text="test"/>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:layout_height="match_parent"
+			  a:layout_width="match_parent">
+
+	<EditText
+			a:id="@+id/matrix_element_edittext"
+			a:layout_height="match_parent"
+			a:layout_width="match_parent"
+			a:text="test"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/notespp_announce.xml b/android-app/src/main/res/layout/notespp_announce.xml
similarity index 100%
rename from android-app/res/layout/notespp_announce.xml
rename to android-app/src/main/res/layout/notespp_announce.xml
diff --git a/android-app/res/layout/release_notes_fragment.xml b/android-app/src/main/res/layout/release_notes_fragment.xml
similarity index 96%
rename from android-app/res/layout/release_notes_fragment.xml
rename to android-app/src/main/res/layout/release_notes_fragment.xml
index 3df1e24f..475cd290 100644
--- a/android-app/res/layout/release_notes_fragment.xml
+++ b/android-app/src/main/res/layout/release_notes_fragment.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:orientation="vertical"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent"
-			  a:background="#ff000000">
-
-	<TextView
-			a:id="@+id/releaseNotesTextView"
-			a:layout_height="fill_parent"
-			a:layout_width="fill_parent"
-			a:layout_weight="1"
-			a:gravity="top|left"
-			a:scrollbars="vertical"
-			style="@style/cpp_about_style"/>
-
-	<!--
-			a:scrollbarFadeDuration="0" is not support in  android_1.6_compatibility
-			-->
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+			  a:orientation="vertical"
+			  a:layout_width="fill_parent"
+			  a:layout_height="fill_parent"
+			  a:background="#ff000000">
+
+	<TextView
+			a:id="@+id/releaseNotesTextView"
+			a:layout_height="fill_parent"
+			a:layout_width="fill_parent"
+			a:layout_weight="1"
+			a:gravity="top|left"
+			a:scrollbars="vertical"
+			style="@style/cpp_about_style"/>
+
+	<!--
+			a:scrollbarFadeDuration="0" is not support in  android_1.6_compatibility
+			-->
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/saved_history_item.xml b/android-app/src/main/res/layout/saved_history_item.xml
similarity index 100%
rename from android-app/res/layout/saved_history_item.xml
rename to android-app/src/main/res/layout/saved_history_item.xml
diff --git a/android-app/res/layout/tabs.xml b/android-app/src/main/res/layout/tabs.xml
similarity index 100%
rename from android-app/res/layout/tabs.xml
rename to android-app/src/main/res/layout/tabs.xml
diff --git a/android-app/res/layout/var_edit.xml b/android-app/src/main/res/layout/var_edit.xml
similarity index 96%
rename from android-app/res/layout/var_edit.xml
rename to android-app/src/main/res/layout/var_edit.xml
index 1f3599a4..c9748df0 100644
--- a/android-app/res/layout/var_edit.xml
+++ b/android-app/src/main/res/layout/var_edit.xml
@@ -1,122 +1,122 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			a:minWidth="300dp">
-
-	<LinearLayout
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			a:orientation="vertical">
-
-		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				a:padding="6dp"
-				style="@style/cpp_default_text_size"
-				a:text="@string/c_var_name"/>
-
-		<EditText
-				a:id="@+id/var_edit_name"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:inputType="text"/>
-
-		<TextView
-			a:id="@+id/var_toggle_greek_keyboard"
-			a:text="@string/cpp_var_show_greek_keyboard"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			a:padding="6dp"
-			style="@style/cpp_default_text_size" />
-
-		<LinearLayout
-			a:id="@+id/var_greek_keyboard"
-			a:visibility="gone"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="vertical"/>
-
-		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:padding="6dp"
-				a:text="@string/c_var_value"/>
-
-		<EditText
-				a:id="@+id/var_edit_value"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:inputType="numberDecimal"/>
-
-		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				a:padding="6dp"
-				style="@style/cpp_default_text_size"
-				a:text="@string/c_var_description"/>
-
-		<EditText
-				a:id="@+id/var_edit_description"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:inputType="text"/>
-
-		<LinearLayout
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent">
-
-			<Button
-					a:id="@+id/cancel_button"
-					a:layout_height="wrap_content"
-					a:layout_width="0dp"
-					a:layout_weight="1"
-					a:text="@string/c_cancel"/>
-
-			<Button
-					a:id="@+id/remove_button"
-					a:layout_height="wrap_content"
-					a:layout_width="0dp"
-					a:layout_weight="1"
-					a:text="@string/c_remove"/>
-
-			<Button
-					a:id="@+id/save_button"
-					a:layout_height="wrap_content"
-					a:layout_width="0dp"
-					a:layout_weight="1"
-					a:text="@string/c_save"/>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-</ScrollView>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
+			a:layout_height="wrap_content"
+			a:layout_width="match_parent"
+			a:minWidth="300dp">
+
+	<LinearLayout
+			a:layout_height="wrap_content"
+			a:layout_width="match_parent"
+			a:orientation="vertical">
+
+		<TextView
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				a:padding="6dp"
+				style="@style/cpp_default_text_size"
+				a:text="@string/c_var_name"/>
+
+		<EditText
+				a:id="@+id/var_edit_name"
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				style="@style/cpp_default_text_size"
+				a:inputType="text"/>
+
+		<TextView
+			a:id="@+id/var_toggle_greek_keyboard"
+			a:text="@string/cpp_var_show_greek_keyboard"
+			a:layout_height="wrap_content"
+			a:layout_width="match_parent"
+			a:padding="6dp"
+			style="@style/cpp_default_text_size" />
+
+		<LinearLayout
+			a:id="@+id/var_greek_keyboard"
+			a:visibility="gone"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:orientation="vertical"/>
+
+		<TextView
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				style="@style/cpp_default_text_size"
+				a:padding="6dp"
+				a:text="@string/c_var_value"/>
+
+		<EditText
+				a:id="@+id/var_edit_value"
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				style="@style/cpp_default_text_size"
+				a:inputType="numberDecimal"/>
+
+		<TextView
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				a:padding="6dp"
+				style="@style/cpp_default_text_size"
+				a:text="@string/c_var_description"/>
+
+		<EditText
+				a:id="@+id/var_edit_description"
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent"
+				style="@style/cpp_default_text_size"
+				a:inputType="text"/>
+
+		<LinearLayout
+				a:layout_height="wrap_content"
+				a:layout_width="match_parent">
+
+			<Button
+					a:id="@+id/cancel_button"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"
+					a:text="@string/c_cancel"/>
+
+			<Button
+					a:id="@+id/remove_button"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"
+					a:text="@string/c_remove"/>
+
+			<Button
+					a:id="@+id/save_button"
+					a:layout_height="wrap_content"
+					a:layout_width="0dp"
+					a:layout_weight="1"
+					a:text="@string/c_save"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+</ScrollView>
+
diff --git a/android-app/res/layout/vars_fragment.xml b/android-app/src/main/res/layout/vars_fragment.xml
similarity index 100%
rename from android-app/res/layout/vars_fragment.xml
rename to android-app/src/main/res/layout/vars_fragment.xml
diff --git a/android-app/res/menu/functions_menu.xml b/android-app/src/main/res/menu/functions_menu.xml
similarity index 100%
rename from android-app/res/menu/functions_menu.xml
rename to android-app/src/main/res/menu/functions_menu.xml
diff --git a/android-app/res/menu/history_menu.xml b/android-app/src/main/res/menu/history_menu.xml
similarity index 100%
rename from android-app/res/menu/history_menu.xml
rename to android-app/src/main/res/menu/history_menu.xml
diff --git a/android-app/res/menu/plot_menu.xml b/android-app/src/main/res/menu/plot_menu.xml
similarity index 100%
rename from android-app/res/menu/plot_menu.xml
rename to android-app/src/main/res/menu/plot_menu.xml
diff --git a/android-app/res/menu/vars_menu.xml b/android-app/src/main/res/menu/vars_menu.xml
similarity index 100%
rename from android-app/res/menu/vars_menu.xml
rename to android-app/src/main/res/menu/vars_menu.xml
diff --git a/android-app/res/values-large-hdpi/dimens.xml b/android-app/src/main/res/values-large-hdpi/dimens.xml
similarity index 97%
rename from android-app/res/values-large-hdpi/dimens.xml
rename to android-app/src/main/res/values-large-hdpi/dimens.xml
index 2ac09073..1d43d1f3 100644
--- a/android-app/res/values-large-hdpi/dimens.xml
+++ b/android-app/src/main/res/values-large-hdpi/dimens.xml
@@ -1,32 +1,32 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_editor_text_size">20sp</dimen>
-	<dimen name="cpp_editor_text_size_mobile">40sp</dimen>
-
-	<dimen name="cpp_display_text_size">20sp</dimen>
-	<dimen name="cpp_display_text_size_mobile">40sp</dimen>
-
-	<dimen name="cpp_keyboard_button_text_size">24dp</dimen>
-	<dimen name="cpp_keyboard_button_text_size_mobile">25dp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_editor_text_size">20sp</dimen>
+	<dimen name="cpp_editor_text_size_mobile">40sp</dimen>
+
+	<dimen name="cpp_display_text_size">20sp</dimen>
+	<dimen name="cpp_display_text_size_mobile">40sp</dimen>
+
+	<dimen name="cpp_keyboard_button_text_size">24dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">25dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-large-mdpi/dimens.xml b/android-app/src/main/res/values-large-mdpi/dimens.xml
similarity index 97%
rename from android-app/res/values-large-mdpi/dimens.xml
rename to android-app/src/main/res/values-large-mdpi/dimens.xml
index 63c290f6..6aa40741 100644
--- a/android-app/res/values-large-mdpi/dimens.xml
+++ b/android-app/src/main/res/values-large-mdpi/dimens.xml
@@ -1,32 +1,32 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_editor_text_size">25sp</dimen>
-	<dimen name="cpp_editor_text_size_mobile">45sp</dimen>
-
-	<dimen name="cpp_display_text_size">20sp</dimen>
-	<dimen name="cpp_display_text_size_mobile">35sp</dimen>
-
-	<dimen name="cpp_keyboard_button_text_size">35dp</dimen>
-	<dimen name="cpp_keyboard_button_text_size_mobile">45dp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_editor_text_size">25sp</dimen>
+	<dimen name="cpp_editor_text_size_mobile">45sp</dimen>
+
+	<dimen name="cpp_display_text_size">20sp</dimen>
+	<dimen name="cpp_display_text_size_mobile">35sp</dimen>
+
+	<dimen name="cpp_keyboard_button_text_size">35dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">45dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-large-tvdpi/dimens.xml b/android-app/src/main/res/values-large-tvdpi/dimens.xml
similarity index 97%
rename from android-app/res/values-large-tvdpi/dimens.xml
rename to android-app/src/main/res/values-large-tvdpi/dimens.xml
index 7ba4bb45..7a99ce9d 100644
--- a/android-app/res/values-large-tvdpi/dimens.xml
+++ b/android-app/src/main/res/values-large-tvdpi/dimens.xml
@@ -1,32 +1,32 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_editor_text_size">30sp</dimen>
-	<dimen name="cpp_editor_text_size_mobile">40sp</dimen>
-
-	<dimen name="cpp_display_text_size">30sp</dimen>
-	<dimen name="cpp_display_text_size_mobile">35sp</dimen>
-
-	<dimen name="cpp_keyboard_button_text_size">33dp</dimen>
-	<dimen name="cpp_keyboard_button_text_size_mobile">30dp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_editor_text_size">30sp</dimen>
+	<dimen name="cpp_editor_text_size_mobile">40sp</dimen>
+
+	<dimen name="cpp_display_text_size">30sp</dimen>
+	<dimen name="cpp_display_text_size_mobile">35sp</dimen>
+
+	<dimen name="cpp_keyboard_button_text_size">33dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">30dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-large/arrays.xml b/android-app/src/main/res/values-large/arrays.xml
similarity index 100%
rename from android-app/res/values-large/arrays.xml
rename to android-app/src/main/res/values-large/arrays.xml
diff --git a/android-app/res/values-large/dimens.xml b/android-app/src/main/res/values-large/dimens.xml
similarity index 97%
rename from android-app/res/values-large/dimens.xml
rename to android-app/src/main/res/values-large/dimens.xml
index 6101d7b2..20c363c0 100644
--- a/android-app/res/values-large/dimens.xml
+++ b/android-app/src/main/res/values-large/dimens.xml
@@ -1,29 +1,29 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_fragment_text_size">17sp</dimen>
-	<dimen name="cpp_fragment_title_text_size">25sp</dimen>
-
-	<dimen name="cpp_math_entity_text_size">20sp</dimen>
-	<dimen name="cpp_math_entity_description_text_size">17sp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_fragment_text_size">17sp</dimen>
+	<dimen name="cpp_fragment_title_text_size">25sp</dimen>
+
+	<dimen name="cpp_math_entity_text_size">20sp</dimen>
+	<dimen name="cpp_math_entity_description_text_size">17sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-normal-hdpi/dimens.xml b/android-app/src/main/res/values-normal-hdpi/dimens.xml
similarity index 97%
rename from android-app/res/values-normal-hdpi/dimens.xml
rename to android-app/src/main/res/values-normal-hdpi/dimens.xml
index 8871387d..8bf9d432 100644
--- a/android-app/res/values-normal-hdpi/dimens.xml
+++ b/android-app/src/main/res/values-normal-hdpi/dimens.xml
@@ -1,26 +1,26 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_keyboard_button_text_size">30dp</dimen>
-	<dimen name="cpp_keyboard_button_text_size_mobile">20dp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_keyboard_button_text_size">30dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">20dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-normal-mdpi/dimens.xml b/android-app/src/main/res/values-normal-mdpi/dimens.xml
similarity index 97%
rename from android-app/res/values-normal-mdpi/dimens.xml
rename to android-app/src/main/res/values-normal-mdpi/dimens.xml
index 82a56c62..9ba50728 100644
--- a/android-app/res/values-normal-mdpi/dimens.xml
+++ b/android-app/src/main/res/values-normal-mdpi/dimens.xml
@@ -1,26 +1,26 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_keyboard_button_text_size">24dp</dimen>
-	<dimen name="cpp_keyboard_button_text_size_mobile">25dp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_keyboard_button_text_size">24dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">25dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-normal-tvdpi/dimens.xml b/android-app/src/main/res/values-normal-tvdpi/dimens.xml
similarity index 97%
rename from android-app/res/values-normal-tvdpi/dimens.xml
rename to android-app/src/main/res/values-normal-tvdpi/dimens.xml
index 6a9251c2..f0b1d963 100644
--- a/android-app/res/values-normal-tvdpi/dimens.xml
+++ b/android-app/src/main/res/values-normal-tvdpi/dimens.xml
@@ -1,26 +1,26 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_keyboard_button_text_size">33dp</dimen>
-	<dimen name="cpp_keyboard_button_text_size_mobile">25dp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_keyboard_button_text_size">33dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">25dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-normal-xhdpi/dimens.xml b/android-app/src/main/res/values-normal-xhdpi/dimens.xml
similarity index 97%
rename from android-app/res/values-normal-xhdpi/dimens.xml
rename to android-app/src/main/res/values-normal-xhdpi/dimens.xml
index 9e168920..75bf8298 100644
--- a/android-app/res/values-normal-xhdpi/dimens.xml
+++ b/android-app/src/main/res/values-normal-xhdpi/dimens.xml
@@ -1,26 +1,26 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_keyboard_button_text_size">32dp</dimen>
-	<dimen name="cpp_keyboard_button_text_size_mobile">15dp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_keyboard_button_text_size">32dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">15dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-normal/dimens.xml b/android-app/src/main/res/values-normal/dimens.xml
similarity index 97%
rename from android-app/res/values-normal/dimens.xml
rename to android-app/src/main/res/values-normal/dimens.xml
index 6662050b..33b3de28 100644
--- a/android-app/res/values-normal/dimens.xml
+++ b/android-app/src/main/res/values-normal/dimens.xml
@@ -1,35 +1,35 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_fragment_text_size">15sp</dimen>
-	<dimen name="cpp_fragment_title_text_size">20sp</dimen>
-
-	<dimen name="cpp_math_entity_text_size">20sp</dimen>
-	<dimen name="cpp_math_entity_description_text_size">15sp</dimen>
-
-	<dimen name="cpp_editor_text_size">30sp</dimen>
-	<dimen name="cpp_editor_text_size_mobile">30sp</dimen>
-
-	<dimen name="cpp_display_text_size">30sp</dimen>
-	<dimen name="cpp_display_text_size_mobile">30sp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_fragment_text_size">15sp</dimen>
+	<dimen name="cpp_fragment_title_text_size">20sp</dimen>
+
+	<dimen name="cpp_math_entity_text_size">20sp</dimen>
+	<dimen name="cpp_math_entity_description_text_size">15sp</dimen>
+
+	<dimen name="cpp_editor_text_size">30sp</dimen>
+	<dimen name="cpp_editor_text_size_mobile">30sp</dimen>
+
+	<dimen name="cpp_display_text_size">30sp</dimen>
+	<dimen name="cpp_display_text_size_mobile">30sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-small-hdpi/dimens.xml b/android-app/src/main/res/values-small-hdpi/dimens.xml
similarity index 97%
rename from android-app/res/values-small-hdpi/dimens.xml
rename to android-app/src/main/res/values-small-hdpi/dimens.xml
index 71124efa..777da191 100644
--- a/android-app/res/values-small-hdpi/dimens.xml
+++ b/android-app/src/main/res/values-small-hdpi/dimens.xml
@@ -1,26 +1,26 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_keyboard_button_text_size">22dp</dimen>
-	<dimen name="cpp_keyboard_button_text_size_mobile">14dp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_keyboard_button_text_size">22dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">14dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-small-xhdpi/dimens.xml b/android-app/src/main/res/values-small-xhdpi/dimens.xml
similarity index 97%
rename from android-app/res/values-small-xhdpi/dimens.xml
rename to android-app/src/main/res/values-small-xhdpi/dimens.xml
index 76de4b17..1316eca1 100644
--- a/android-app/res/values-small-xhdpi/dimens.xml
+++ b/android-app/src/main/res/values-small-xhdpi/dimens.xml
@@ -1,26 +1,26 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_keyboard_button_text_size">20dp</dimen>
-	<dimen name="cpp_keyboard_button_text_size_mobile">10dp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_keyboard_button_text_size">20dp</dimen>
+	<dimen name="cpp_keyboard_button_text_size_mobile">10dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-small/dimens.xml b/android-app/src/main/res/values-small/dimens.xml
similarity index 97%
rename from android-app/res/values-small/dimens.xml
rename to android-app/src/main/res/values-small/dimens.xml
index 8a7f2b1e..87a3be2d 100644
--- a/android-app/res/values-small/dimens.xml
+++ b/android-app/src/main/res/values-small/dimens.xml
@@ -1,35 +1,35 @@
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<resources>
-	<dimen name="cpp_fragment_text_size">15sp</dimen>
-	<dimen name="cpp_fragment_title_text_size">20sp</dimen>
-
-	<dimen name="cpp_math_entity_text_size">16sp</dimen>
-	<dimen name="cpp_math_entity_description_text_size">12sp</dimen>
-
-	<dimen name="cpp_editor_text_size">20sp</dimen>
-	<dimen name="cpp_editor_text_size_mobile">20sp</dimen>
-
-	<dimen name="cpp_display_text_size">20sp</dimen>
-	<dimen name="cpp_display_text_size_mobile">20sp</dimen>
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<resources>
+	<dimen name="cpp_fragment_text_size">15sp</dimen>
+	<dimen name="cpp_fragment_title_text_size">20sp</dimen>
+
+	<dimen name="cpp_math_entity_text_size">16sp</dimen>
+	<dimen name="cpp_math_entity_description_text_size">12sp</dimen>
+
+	<dimen name="cpp_editor_text_size">20sp</dimen>
+	<dimen name="cpp_editor_text_size_mobile">20sp</dimen>
+
+	<dimen name="cpp_display_text_size">20sp</dimen>
+	<dimen name="cpp_display_text_size_mobile">20sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android-app/res/values-v14/dimens.xml b/android-app/src/main/res/values-v14/dimens.xml
similarity index 100%
rename from android-app/res/values-v14/dimens.xml
rename to android-app/src/main/res/values-v14/dimens.xml
diff --git a/android-app/res/values-xlarge-hdpi/dimens.xml b/android-app/src/main/res/values-xlarge-hdpi/dimens.xml
similarity index 100%
rename from android-app/res/values-xlarge-hdpi/dimens.xml
rename to android-app/src/main/res/values-xlarge-hdpi/dimens.xml
diff --git a/android-app/res/values-xlarge-mdpi/dimens.xml b/android-app/src/main/res/values-xlarge-mdpi/dimens.xml
similarity index 100%
rename from android-app/res/values-xlarge-mdpi/dimens.xml
rename to android-app/src/main/res/values-xlarge-mdpi/dimens.xml
diff --git a/android-app/res/values-xlarge/dimens.xml b/android-app/src/main/res/values-xlarge/dimens.xml
similarity index 100%
rename from android-app/res/values-xlarge/dimens.xml
rename to android-app/src/main/res/values-xlarge/dimens.xml
diff --git a/android-app/res/values/arrays.xml b/android-app/src/main/res/values/arrays.xml
similarity index 100%
rename from android-app/res/values/arrays.xml
rename to android-app/src/main/res/values/arrays.xml
diff --git a/android-app/res/values/preferences.xml b/android-app/src/main/res/values/preferences.xml
similarity index 100%
rename from android-app/res/values/preferences.xml
rename to android-app/src/main/res/values/preferences.xml
diff --git a/android-app/res/values/styles_history.xml b/android-app/src/main/res/values/styles_history.xml
similarity index 100%
rename from android-app/res/values/styles_history.xml
rename to android-app/src/main/res/values/styles_history.xml
diff --git a/android-app/res/values/styles_var.xml b/android-app/src/main/res/values/styles_var.xml
similarity index 100%
rename from android-app/res/values/styles_var.xml
rename to android-app/src/main/res/values/styles_var.xml
diff --git a/android-app/res/xml/calculator_widget_info_3x3.xml b/android-app/src/main/res/xml/calculator_widget_info_3x3.xml
similarity index 100%
rename from android-app/res/xml/calculator_widget_info_3x3.xml
rename to android-app/src/main/res/xml/calculator_widget_info_3x3.xml
diff --git a/android-app/res/xml/calculator_widget_info_3x4.xml b/android-app/src/main/res/xml/calculator_widget_info_3x4.xml
similarity index 100%
rename from android-app/res/xml/calculator_widget_info_3x4.xml
rename to android-app/src/main/res/xml/calculator_widget_info_3x4.xml
diff --git a/android-app/res/xml/calculator_widget_info_4x4.xml b/android-app/src/main/res/xml/calculator_widget_info_4x4.xml
similarity index 100%
rename from android-app/res/xml/calculator_widget_info_4x4.xml
rename to android-app/src/main/res/xml/calculator_widget_info_4x4.xml
diff --git a/android-app/res/xml/calculator_widget_info_4x5.xml b/android-app/src/main/res/xml/calculator_widget_info_4x5.xml
similarity index 100%
rename from android-app/res/xml/calculator_widget_info_4x5.xml
rename to android-app/src/main/res/xml/calculator_widget_info_4x5.xml
diff --git a/android-app/res/xml/preferences.xml b/android-app/src/main/res/xml/preferences.xml
similarity index 97%
rename from android-app/res/xml/preferences.xml
rename to android-app/src/main/res/xml/preferences.xml
index e31eef1b..34d216d6 100644
--- a/android-app/res/xml/preferences.xml
+++ b/android-app/src/main/res/xml/preferences.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
-
-	<Preference
-			a:key="@string/p_calc_ad_free_key"
-			a:title="@string/c_calc_ad_free_title"
-			a:summary="@string/c_calc_ad_free_summary"
-			a:defaultValue="false"/>
-
-	<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
-
-	<Preference
-		a:key="restart_wizard"
-		a:title="@string/cpp_restart_wizard"/>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
+
+	<Preference
+			a:key="@string/p_calc_ad_free_key"
+			a:title="@string/c_calc_ad_free_title"
+			a:summary="@string/c_calc_ad_free_summary"
+			a:defaultValue="false"/>
+
+	<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
+
+	<Preference
+		a:key="restart_wizard"
+		a:title="@string/cpp_restart_wizard"/>
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android-app/res/xml/preferences_appearance.xml b/android-app/src/main/res/xml/preferences_appearance.xml
similarity index 97%
rename from android-app/res/xml/preferences_appearance.xml
rename to android-app/src/main/res/xml/preferences_appearance.xml
index e7ad773c..2d9b82ad 100644
--- a/android-app/res/xml/preferences_appearance.xml
+++ b/android-app/src/main/res/xml/preferences_appearance.xml
@@ -1,129 +1,129 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android"
-				  xmlns:range="http://schemas.android.com/apk/res-auto">
-
-	<PreferenceScreen a:title="@string/c_prefs_appearance_category">
-
-		<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
-
-		<android.preference.CheckBoxPreference
-				a:key="@string/p_calc_color_display_key"
-				a:summary="@string/c_calc_color_display_summary"
-				a:title="@string/c_calc_color_display_title"
-				a:defaultValue="true"/>
-
-		<android.preference.CheckBoxPreference
-				a:key="@string/p_calc_haptic_feedback_key"
-				a:summary="@string/c_calc_haptic_feedback_summary"
-				a:title="@string/c_calc_haptic_feedback_title"
-				a:defaultValue="false"/>
-
-		<ListPreference
-				a:key="@string/p_calc_haptic_feedback_duration_key"
-				a:title="@string/p_calc_haptic_feedback_duration_title"
-				a:entries="@array/p_calc_haptic_feedback_duration_names"
-				a:summary="@string/p_calc_haptic_feedback_duration_summary"
-				a:entryValues="@array/p_calc_haptic_feedback_duration_values"/>
-
-		<ListPreference
-				a:key="@string/p_calc_multiplication_sign_key"
-				a:title="@string/c_calc_multiplication_sign"
-				a:entries="@array/p_multiplication_sign_values"
-				a:summary="@string/c_calc_multiplication_sign_summary"
-				a:entryValues="@array/p_multiplication_sign_values"/>
-
-		<ListPreference
-				a:key="@string/p_calc_theme_key"
-				a:title="@string/c_calc_theme"
-				a:entries="@array/p_theme_names"
-				a:summary="@string/c_calc_theme_summary"
-				a:entryValues="@array/p_theme_values"/>
-
-		<ListPreference
-				a:key="@string/p_calc_layout_key"
-				a:title="@string/c_calc_layout"
-				a:entries="@array/p_layout_names"
-				a:summary="@string/c_calc_layout_summary"
-				a:entryValues="@array/p_layout_values"/>
-
-
-		<org.solovyev.android.prefs.FloatRangeSeekBarPreference
-				a:key="@string/p_drag_distance_key"
-				a:title="@string/c_swipe_distance"
-				a:summary="@string/c_swipe_distance_summary"
-				a:text=" pxs"
-				a:defaultValue="35;350"
-				range:step="10"
-				range:boundaries="10;500"/>
-
-		<!--	  <org.solovyev.android.prefs.FloatRangeSeekBarPreference
-										a:key="@string/p_drag_duration_key"
-										a:title="Duration of drag event"
-										a:text=" ms"
-										a:defaultValue="40;2500"
-										range:steps="10"
-										range:boundaries="5;4000"/>
-
-								<org.solovyev.android.prefs.FloatRangeSeekBarPreference
-										a:key="@string/p_drag_angle_key"
-										a:title="Angle of drag event"
-										a:text=" degrees"
-										a:defaultValue="0;45"
-										range:steps="5"
-										range:boundaries="0;45"/>-->
-
-		<android.preference.CheckBoxPreference
-				a:key="autoOrientation"
-				a:title="@string/c_auto_orientation_title"
-				a:summary="@string/c_auto_orientation_summary"
-				a:defaultValue="true"/>
-
-
-		<android.preference.CheckBoxPreference
-				a:key="showEqualsButton"
-				a:title="@string/c_show_equals_button_title"
-				a:summary="@string/c_show_equals_button_summary"
-				a:defaultValue="true"/>
-
-		<android.preference.CheckBoxPreference
-				a:key="hideNumeralBaseDigits"
-				a:title="@string/c_hide_numeral_base_digits_title"
-				a:summary="@string/c_hide_numeral_base_digits_summary"
-				a:defaultValue="true"/>
-
-		<android.preference.CheckBoxPreference
-				a:key="history_show_intermediate_calculations"
-				a:title="@string/prefs_history_show_intermediate_calculations_title"
-				a:summary="@string/prefs_history_show_intermediate_calculations_summary"/>
-
-		<android.preference.CheckBoxPreference
-				a:key="preventScreenFromFading"
-				a:title="@string/prefs_prevent_screen_from_fading_title"
-				a:summary="@string/prefs_prevent_screen_from_fading_summary"/>
-
-	</PreferenceScreen>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android"
+				  xmlns:range="http://schemas.android.com/apk/res-auto">
+
+	<PreferenceScreen a:title="@string/c_prefs_appearance_category">
+
+		<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
+
+		<android.preference.CheckBoxPreference
+				a:key="@string/p_calc_color_display_key"
+				a:summary="@string/c_calc_color_display_summary"
+				a:title="@string/c_calc_color_display_title"
+				a:defaultValue="true"/>
+
+		<android.preference.CheckBoxPreference
+				a:key="@string/p_calc_haptic_feedback_key"
+				a:summary="@string/c_calc_haptic_feedback_summary"
+				a:title="@string/c_calc_haptic_feedback_title"
+				a:defaultValue="false"/>
+
+		<ListPreference
+				a:key="@string/p_calc_haptic_feedback_duration_key"
+				a:title="@string/p_calc_haptic_feedback_duration_title"
+				a:entries="@array/p_calc_haptic_feedback_duration_names"
+				a:summary="@string/p_calc_haptic_feedback_duration_summary"
+				a:entryValues="@array/p_calc_haptic_feedback_duration_values"/>
+
+		<ListPreference
+				a:key="@string/p_calc_multiplication_sign_key"
+				a:title="@string/c_calc_multiplication_sign"
+				a:entries="@array/p_multiplication_sign_values"
+				a:summary="@string/c_calc_multiplication_sign_summary"
+				a:entryValues="@array/p_multiplication_sign_values"/>
+
+		<ListPreference
+				a:key="@string/p_calc_theme_key"
+				a:title="@string/c_calc_theme"
+				a:entries="@array/p_theme_names"
+				a:summary="@string/c_calc_theme_summary"
+				a:entryValues="@array/p_theme_values"/>
+
+		<ListPreference
+				a:key="@string/p_calc_layout_key"
+				a:title="@string/c_calc_layout"
+				a:entries="@array/p_layout_names"
+				a:summary="@string/c_calc_layout_summary"
+				a:entryValues="@array/p_layout_values"/>
+
+
+		<org.solovyev.android.prefs.FloatRangeSeekBarPreference
+				a:key="@string/p_drag_distance_key"
+				a:title="@string/c_swipe_distance"
+				a:summary="@string/c_swipe_distance_summary"
+				a:text=" pxs"
+				a:defaultValue="35;350"
+				range:step="10"
+				range:boundaries="10;500"/>
+
+		<!--	  <org.solovyev.android.prefs.FloatRangeSeekBarPreference
+										a:key="@string/p_drag_duration_key"
+										a:title="Duration of drag event"
+										a:text=" ms"
+										a:defaultValue="40;2500"
+										range:steps="10"
+										range:boundaries="5;4000"/>
+
+								<org.solovyev.android.prefs.FloatRangeSeekBarPreference
+										a:key="@string/p_drag_angle_key"
+										a:title="Angle of drag event"
+										a:text=" degrees"
+										a:defaultValue="0;45"
+										range:steps="5"
+										range:boundaries="0;45"/>-->
+
+		<android.preference.CheckBoxPreference
+				a:key="autoOrientation"
+				a:title="@string/c_auto_orientation_title"
+				a:summary="@string/c_auto_orientation_summary"
+				a:defaultValue="true"/>
+
+
+		<android.preference.CheckBoxPreference
+				a:key="showEqualsButton"
+				a:title="@string/c_show_equals_button_title"
+				a:summary="@string/c_show_equals_button_summary"
+				a:defaultValue="true"/>
+
+		<android.preference.CheckBoxPreference
+				a:key="hideNumeralBaseDigits"
+				a:title="@string/c_hide_numeral_base_digits_title"
+				a:summary="@string/c_hide_numeral_base_digits_summary"
+				a:defaultValue="true"/>
+
+		<android.preference.CheckBoxPreference
+				a:key="history_show_intermediate_calculations"
+				a:title="@string/prefs_history_show_intermediate_calculations_title"
+				a:summary="@string/prefs_history_show_intermediate_calculations_summary"/>
+
+		<android.preference.CheckBoxPreference
+				a:key="preventScreenFromFading"
+				a:title="@string/prefs_prevent_screen_from_fading_title"
+				a:summary="@string/prefs_prevent_screen_from_fading_summary"/>
+
+	</PreferenceScreen>
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android-app/res/xml/preferences_calculations.xml b/android-app/src/main/res/xml/preferences_calculations.xml
similarity index 100%
rename from android-app/res/xml/preferences_calculations.xml
rename to android-app/src/main/res/xml/preferences_calculations.xml
diff --git a/android-app/res/xml/preferences_onscreen.xml b/android-app/src/main/res/xml/preferences_onscreen.xml
similarity index 100%
rename from android-app/res/xml/preferences_onscreen.xml
rename to android-app/src/main/res/xml/preferences_onscreen.xml
diff --git a/android-app/res/xml/preferences_other.xml b/android-app/src/main/res/xml/preferences_other.xml
similarity index 97%
rename from android-app/res/xml/preferences_other.xml
rename to android-app/src/main/res/xml/preferences_other.xml
index 7495f7f9..c7fd99b8 100644
--- a/android-app/res/xml/preferences_other.xml
+++ b/android-app/src/main/res/xml/preferences_other.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
-
-	<PreferenceScreen a:title="@string/c_prefs_other_category">
-
-		<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
-
-		<android.preference.CheckBoxPreference
-				a:key="@string/p_calc_show_release_notes_key"
-				a:summary="@string/c_calc_show_release_notes_summary"
-				a:title="@string/c_calc_show_release_notes_title"
-				a:defaultValue="true"/>
-
-		<android.preference.CheckBoxPreference
-				a:key="@string/p_calc_use_back_button_as_prev_key"
-				a:summary="@string/c_calc_use_back_button_as_prev_summary"
-				a:title="@string/c_calc_use_back_button_as_prev_title"
-				a:defaultValue="false"/>
-
-		<Preference
-				a:key="@string/p_clear_billing_info_key"
-				a:summary="@string/c_clear_billing_info_summary"
-				a:title="@string/c_clear_billing_info_title"/>
-
-	</PreferenceScreen>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
+
+	<PreferenceScreen a:title="@string/c_prefs_other_category">
+
+		<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
+
+		<android.preference.CheckBoxPreference
+				a:key="@string/p_calc_show_release_notes_key"
+				a:summary="@string/c_calc_show_release_notes_summary"
+				a:title="@string/c_calc_show_release_notes_title"
+				a:defaultValue="true"/>
+
+		<android.preference.CheckBoxPreference
+				a:key="@string/p_calc_use_back_button_as_prev_key"
+				a:summary="@string/c_calc_use_back_button_as_prev_summary"
+				a:title="@string/c_calc_use_back_button_as_prev_title"
+				a:defaultValue="false"/>
+
+		<Preference
+				a:key="@string/p_clear_billing_info_key"
+				a:summary="@string/c_clear_billing_info_summary"
+				a:title="@string/c_clear_billing_info_title"/>
+
+	</PreferenceScreen>
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android-app/res/xml/preferences_plot.xml b/android-app/src/main/res/xml/preferences_plot.xml
similarity index 100%
rename from android-app/res/xml/preferences_plot.xml
rename to android-app/src/main/res/xml/preferences_plot.xml
diff --git a/pom.xml b/pom.xml
index fb02ce8b..cf3ab52d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<acl.version>1.1.16</acl.version>
+		<acl.version>1.1.17</acl.version>
 		<jcl.version>1.0.7</jcl.version>
 		<jscl.version>1.0.8</jscl.version>
 	</properties>
@@ -269,15 +269,16 @@
 				</plugin>
 
 				<plugin>
-					<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+					<groupId>com.simpligility.maven.plugins</groupId>
 					<artifactId>android-maven-plugin</artifactId>
-					<version>3.8.0</version>
+					<version>4.1.0</version>
 					<configuration>
 
 						<sourceDirectories>
 							<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
 						</sourceDirectories>
 
+						<failOnConflictingLayouts>false</failOnConflictingLayouts>
 						<sdk>
 							<platform>17</platform>
 						</sdk>