diff --git a/calculatorpp-test/pom.xml b/app-android-test/pom.xml
similarity index 90%
rename from calculatorpp-test/pom.xml
rename to app-android-test/pom.xml
index a054d398..e7c0fedb 100644
--- a/calculatorpp-test/pom.xml
+++ b/app-android-test/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.solovyev.android</groupId>
-    <artifactId>calculatorpp-test</artifactId>
+    <artifactId>calculatorpp-app-android-test</artifactId>
     <name>Calculator++ Application (Test)</name>
 
 
diff --git a/calculatorpp/AndroidManifest.xml b/app-android/AndroidManifest.xml
similarity index 94%
rename from calculatorpp/AndroidManifest.xml
rename to app-android/AndroidManifest.xml
index 9fe203f6..a4f62aff 100644
--- a/calculatorpp/AndroidManifest.xml
+++ b/app-android/AndroidManifest.xml
@@ -1,165 +1,165 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="112" android:versionName="1.5.2" package="org.solovyev.android.calculator">
-
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="com.android.vending.BILLING"/>
-
-    <!--TODO: REMOVE IN PRODUCTION-->
-    <!--<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>-->
-
-    <!-- for onscreen -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-
-    <supports-screens android:smallScreens="true"/>
-    <supports-screens android:normalScreens="true"/>
-    <supports-screens android:largeScreens="true"/>
-    <supports-screens android:xlargeScreens="true"/>
-    <supports-screens android:anyDensity="true"/>
-
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
-
-    <application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
-
-        <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-
-        </activity>
-
-        <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivityMobile" android:windowSoftInputMode="adjustPan"/>
-
-        <!-- settings must use action bar icon-->
-        <activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".CalculatorPreferencesActivity"/>
-
-        <activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
-
-        <activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:label="@string/calculation_messages_dialog_title" android:launchMode="singleTask" android:name=".CalculatorMessagesDialog" android:theme="@style/Theme.Sherlock.Dialog"/>
-
-        <activity android:label="@string/c_about" android:name=".about.CalculatorAboutActivity"/>
-
-        <activity android:label="@string/c_help" android:name=".help.CalculatorHelpActivity"/>
-
-        <activity android:label="@string/c_functions" android:name=".math.edit.CalculatorFunctionsActivity"/>
-
-        <activity android:label="@string/c_operators" android:name=".math.edit.CalculatorOperatorsActivity"/>
-
-        <activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
-
-        <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
-
-        <activity android:name=".widget.CalculatorWidgetConfigurationActivity" android:theme="@style/cpp_metro_blue_theme">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
-            </intent-filter>
-        </activity>
-
-        <!-- settings must use action bar icon-->
-        <activity android:icon="@drawable/ab_icon" android:label="@string/c_settings" android:name=".plot.CalculatorPlotPreferenceActivity"/>
-
-        <!-- ONSCREEN CONFIG -->
-
-		<activity android:icon="@drawable/icon_onscreen" android:label="@string/c_app_name_on_screen" android:launchMode="singleInstance" android:name=".CalculatorOnscreenStartActivity">
-
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN"/>
-				<category android:name="android.intent.category.LAUNCHER"/>
-			</intent-filter>
-
-		</activity>
-
-        <service android:name=".onscreen.CalculatorOnscreenService">
-            <intent-filter>
-                <action android:name="org.solovyev.android.calculator.INIT"/>
-                <action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
-            </intent-filter>
-        </service>
-
-        <receiver android:name=".onscreen.CalculatorOnscreenBroadcastReceiver">
-            <intent-filter>
-				<action android:name="org.solovyev.android.calculator.INIT"/>
-				<action android:name="android.intent.action.BOOT_COMPLETED"/>
-				<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
-            </intent-filter>
-        </receiver>
-
-        <!-- WIDGET CONFIG -->
-
-        <receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x3_name" android:name=".widget.CalculatorWidgetProvider">
-
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
-				<action android:name="org.solovyev.android.calculator.INIT"/>
-				<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
-		</intent-filter>
-
-            <meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x3"/>
-        </receiver>
-
-        <receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x4_name" android:name=".widget.CalculatorWidgetProvider3x4">
-
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
-				<action android:name="org.solovyev.android.calculator.INIT"/>
-				<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
-            </intent-filter>
-
-            <meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x4"/>
-        </receiver>
-
-        <receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x4_name" android:name=".widget.CalculatorWidgetProvider4x4">
-
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
-				<action android:name="org.solovyev.android.calculator.INIT"/>
-				<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
-            </intent-filter>
-
-            <meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x4"/>
-        </receiver>
-
-        <receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x5_name" android:name=".widget.CalculatorWidgetProvider4x5">
-
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
-                <action android:name="org.solovyev.android.calculator.INIT"/>
-                <action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
-                <action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
-            </intent-filter>
-
-            <meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x5"/>
-        </receiver>
-
-        <!-- ADMOB + BILLING CONFIG -->
-
-        <activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" android:name="com.google.ads.AdActivity"/>
-
-        <service android:name="net.robotmedia.billing.BillingService"/>
-        <receiver android:name="net.robotmedia.billing.BillingReceiver">
-            <intent-filter>
-                <action android:name="com.android.vending.billing.IN_APP_NOTIFY"/>
-                <action android:name="com.android.vending.billing.RESPONSE_CODE"/>
-                <action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED"/>
-            </intent-filter>
-        </receiver>
-
-        <!-- ACRA CONFIG -->
-
-        <activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:launchMode="singleInstance" android:name="org.acra.CrashReportDialog" android:theme="@style/Theme.Sherlock.Dialog"/>
-
-    </application>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="112" android:versionName="1.5.3-SNAPSHOT" package="org.solovyev.android.calculator">
+
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="com.android.vending.BILLING"/>
+
+    <!--TODO: REMOVE IN PRODUCTION-->
+    <!--<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>-->
+
+    <!-- for onscreen -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
+    <supports-screens android:smallScreens="true"/>
+    <supports-screens android:normalScreens="true"/>
+    <supports-screens android:largeScreens="true"/>
+    <supports-screens android:xlargeScreens="true"/>
+    <supports-screens android:anyDensity="true"/>
+
+    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
+
+    <application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
+
+        <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+
+        </activity>
+
+        <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivityMobile" android:windowSoftInputMode="adjustPan"/>
+
+        <!-- settings must use action bar icon-->
+        <activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".CalculatorPreferencesActivity"/>
+
+        <activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
+
+        <activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:label="@string/calculation_messages_dialog_title" android:launchMode="singleTask" android:name=".CalculatorMessagesDialog" android:theme="@style/Theme.Sherlock.Dialog"/>
+
+        <activity android:label="@string/c_about" android:name=".about.CalculatorAboutActivity"/>
+
+        <activity android:label="@string/c_help" android:name=".help.CalculatorHelpActivity"/>
+
+        <activity android:label="@string/c_functions" android:name=".math.edit.CalculatorFunctionsActivity"/>
+
+        <activity android:label="@string/c_operators" android:name=".math.edit.CalculatorOperatorsActivity"/>
+
+        <activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
+
+        <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
+
+        <activity android:name=".widget.CalculatorWidgetConfigurationActivity" android:theme="@style/cpp_metro_blue_theme">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
+            </intent-filter>
+        </activity>
+
+        <!-- settings must use action bar icon-->
+        <activity android:icon="@drawable/ab_icon" android:label="@string/c_settings" android:name=".plot.CalculatorPlotPreferenceActivity"/>
+
+        <!-- ONSCREEN CONFIG -->
+
+		<activity android:icon="@drawable/icon_onscreen" android:label="@string/c_app_name_on_screen" android:launchMode="singleInstance" android:name=".CalculatorOnscreenStartActivity">
+
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN"/>
+				<category android:name="android.intent.category.LAUNCHER"/>
+			</intent-filter>
+
+		</activity>
+
+        <service android:name=".onscreen.CalculatorOnscreenService">
+            <intent-filter>
+                <action android:name="org.solovyev.android.calculator.INIT"/>
+                <action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
+            </intent-filter>
+        </service>
+
+        <receiver android:name=".onscreen.CalculatorOnscreenBroadcastReceiver">
+            <intent-filter>
+				<action android:name="org.solovyev.android.calculator.INIT"/>
+				<action android:name="android.intent.action.BOOT_COMPLETED"/>
+				<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- WIDGET CONFIG -->
+
+        <receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x3_name" android:name=".widget.CalculatorWidgetProvider">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+				<action android:name="org.solovyev.android.calculator.INIT"/>
+				<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
+		</intent-filter>
+
+            <meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x3"/>
+        </receiver>
+
+        <receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x4_name" android:name=".widget.CalculatorWidgetProvider3x4">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+				<action android:name="org.solovyev.android.calculator.INIT"/>
+				<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
+            </intent-filter>
+
+            <meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x4"/>
+        </receiver>
+
+        <receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x4_name" android:name=".widget.CalculatorWidgetProvider4x4">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+				<action android:name="org.solovyev.android.calculator.INIT"/>
+				<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
+            </intent-filter>
+
+            <meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x4"/>
+        </receiver>
+
+        <receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x5_name" android:name=".widget.CalculatorWidgetProvider4x5">
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+                <action android:name="org.solovyev.android.calculator.INIT"/>
+                <action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
+                <action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
+            </intent-filter>
+
+            <meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x5"/>
+        </receiver>
+
+        <!-- ADMOB + BILLING CONFIG -->
+
+        <activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" android:name="com.google.ads.AdActivity"/>
+
+        <service android:name="net.robotmedia.billing.BillingService"/>
+        <receiver android:name="net.robotmedia.billing.BillingReceiver">
+            <intent-filter>
+                <action android:name="com.android.vending.billing.IN_APP_NOTIFY"/>
+                <action android:name="com.android.vending.billing.RESPONSE_CODE"/>
+                <action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- ACRA CONFIG -->
+
+        <activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:launchMode="singleInstance" android:name="org.acra.CrashReportDialog" android:theme="@style/Theme.Sherlock.Dialog"/>
+
+    </application>
 </manifest>
\ No newline at end of file
diff --git a/calculatorpp/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip b/app-android/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
similarity index 100%
rename from calculatorpp/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
rename to app-android/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
diff --git a/calculatorpp/misc/doc/achartengine-0.7.0-javadocs.zip b/app-android/misc/doc/achartengine-0.7.0-javadocs.zip
similarity index 100%
rename from calculatorpp/misc/doc/achartengine-0.7.0-javadocs.zip
rename to app-android/misc/doc/achartengine-0.7.0-javadocs.zip
diff --git a/calculatorpp/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar b/app-android/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
similarity index 100%
rename from calculatorpp/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
rename to app-android/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
diff --git a/calculatorpp/misc/lib/achartengine-0.7.0.jar b/app-android/misc/lib/achartengine-0.7.0.jar
similarity index 100%
rename from calculatorpp/misc/lib/achartengine-0.7.0.jar
rename to app-android/misc/lib/achartengine-0.7.0.jar
diff --git a/calculatorpp/misc/lib/achartengine-0.7.1.jar b/app-android/misc/lib/achartengine-0.7.1.jar
similarity index 100%
rename from calculatorpp/misc/lib/achartengine-0.7.1.jar
rename to app-android/misc/lib/achartengine-0.7.1.jar
diff --git a/calculatorpp/misc/other/prepare_avds.sh b/app-android/misc/other/prepare_avds.sh
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/other/prepare_avds.sh
rename to app-android/misc/other/prepare_avds.sh
diff --git a/calculatorpp/misc/other/remove_avds.sh b/app-android/misc/other/remove_avds.sh
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/other/remove_avds.sh
rename to app-android/misc/other/remove_avds.sh
diff --git a/calculatorpp/misc/other/take_screenshots.py b/app-android/misc/other/take_screenshots.py
similarity index 100%
rename from calculatorpp/misc/other/take_screenshots.py
rename to app-android/misc/other/take_screenshots.py
diff --git a/calculatorpp/misc/other/take_screenshots.sh b/app-android/misc/other/take_screenshots.sh
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/other/take_screenshots.sh
rename to app-android/misc/other/take_screenshots.sh
diff --git a/calculatorpp/misc/other/take_screenshots2.sh b/app-android/misc/other/take_screenshots2.sh
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/other/take_screenshots2.sh
rename to app-android/misc/other/take_screenshots2.sh
diff --git a/calculatorpp/misc/other/wait_device.py b/app-android/misc/other/wait_device.py
similarity index 100%
rename from calculatorpp/misc/other/wait_device.py
rename to app-android/misc/other/wait_device.py
diff --git a/calculatorpp/misc/res/calculatorpp/01_main_screen_port.png b/app-android/misc/res/calculatorpp/01_main_screen_port.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/01_main_screen_port.png
rename to app-android/misc/res/calculatorpp/01_main_screen_port.png
diff --git a/calculatorpp/misc/res/calculatorpp/01_main_screen_port_sm.png b/app-android/misc/res/calculatorpp/01_main_screen_port_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/01_main_screen_port_sm.png
rename to app-android/misc/res/calculatorpp/01_main_screen_port_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/02_main_screen_land.png b/app-android/misc/res/calculatorpp/02_main_screen_land.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/02_main_screen_land.png
rename to app-android/misc/res/calculatorpp/02_main_screen_land.png
diff --git a/calculatorpp/misc/res/calculatorpp/03_main_screen_port_with_expression.png b/app-android/misc/res/calculatorpp/03_main_screen_port_with_expression.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/03_main_screen_port_with_expression.png
rename to app-android/misc/res/calculatorpp/03_main_screen_port_with_expression.png
diff --git a/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu.png b/app-android/misc/res/calculatorpp/04_plot_graph_menu.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/04_plot_graph_menu.png
rename to app-android/misc/res/calculatorpp/04_plot_graph_menu.png
diff --git a/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu_sm.png b/app-android/misc/res/calculatorpp/04_plot_graph_menu_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/04_plot_graph_menu_sm.png
rename to app-android/misc/res/calculatorpp/04_plot_graph_menu_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/05_graph_screen.png b/app-android/misc/res/calculatorpp/05_graph_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/05_graph_screen.png
rename to app-android/misc/res/calculatorpp/05_graph_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/05_graph_screen_sm.png b/app-android/misc/res/calculatorpp/05_graph_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/05_graph_screen_sm.png
rename to app-android/misc/res/calculatorpp/05_graph_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/06_constants_screen.png b/app-android/misc/res/calculatorpp/06_constants_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/06_constants_screen.png
rename to app-android/misc/res/calculatorpp/06_constants_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/06_constants_screen_sm.png b/app-android/misc/res/calculatorpp/06_constants_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/06_constants_screen_sm.png
rename to app-android/misc/res/calculatorpp/06_constants_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/07_constant_create_dialog.png b/app-android/misc/res/calculatorpp/07_constant_create_dialog.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/07_constant_create_dialog.png
rename to app-android/misc/res/calculatorpp/07_constant_create_dialog.png
diff --git a/calculatorpp/misc/res/calculatorpp/08_constants_context_menu.png b/app-android/misc/res/calculatorpp/08_constants_context_menu.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/08_constants_context_menu.png
rename to app-android/misc/res/calculatorpp/08_constants_context_menu.png
diff --git a/calculatorpp/misc/res/calculatorpp/09_functions_screen.png b/app-android/misc/res/calculatorpp/09_functions_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/09_functions_screen.png
rename to app-android/misc/res/calculatorpp/09_functions_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/09_functions_screen_sm.png b/app-android/misc/res/calculatorpp/09_functions_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/09_functions_screen_sm.png
rename to app-android/misc/res/calculatorpp/09_functions_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/10_history_screen.png b/app-android/misc/res/calculatorpp/10_history_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/10_history_screen.png
rename to app-android/misc/res/calculatorpp/10_history_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/10_history_screen_sm.png b/app-android/misc/res/calculatorpp/10_history_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/10_history_screen_sm.png
rename to app-android/misc/res/calculatorpp/10_history_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/11_history_item_context_menu.png b/app-android/misc/res/calculatorpp/11_history_item_context_menu.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/11_history_item_context_menu.png
rename to app-android/misc/res/calculatorpp/11_history_item_context_menu.png
diff --git a/calculatorpp/misc/res/calculatorpp/12_saved_history_tab.png b/app-android/misc/res/calculatorpp/12_saved_history_tab.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/12_saved_history_tab.png
rename to app-android/misc/res/calculatorpp/12_saved_history_tab.png
diff --git a/calculatorpp/misc/res/calculatorpp/13_saved_history_item_context_menu.png b/app-android/misc/res/calculatorpp/13_saved_history_item_context_menu.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/13_saved_history_item_context_menu.png
rename to app-android/misc/res/calculatorpp/13_saved_history_item_context_menu.png
diff --git a/calculatorpp/misc/res/calculatorpp/14_about_screen.png b/app-android/misc/res/calculatorpp/14_about_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/14_about_screen.png
rename to app-android/misc/res/calculatorpp/14_about_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/14_about_screen_sm.png b/app-android/misc/res/calculatorpp/14_about_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/14_about_screen_sm.png
rename to app-android/misc/res/calculatorpp/14_about_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/15_release_notes_tab.png b/app-android/misc/res/calculatorpp/15_release_notes_tab.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/15_release_notes_tab.png
rename to app-android/misc/res/calculatorpp/15_release_notes_tab.png
diff --git a/calculatorpp/misc/res/calculatorpp/16_help_screen.png b/app-android/misc/res/calculatorpp/16_help_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/16_help_screen.png
rename to app-android/misc/res/calculatorpp/16_help_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/16_help_screen_sm.png b/app-android/misc/res/calculatorpp/16_help_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/16_help_screen_sm.png
rename to app-android/misc/res/calculatorpp/16_help_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/17_hints_tab.png b/app-android/misc/res/calculatorpp/17_hints_tab.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/17_hints_tab.png
rename to app-android/misc/res/calculatorpp/17_hints_tab.png
diff --git a/calculatorpp/misc/res/calculatorpp/18_preferences.png b/app-android/misc/res/calculatorpp/18_preferences.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/18_preferences.png
rename to app-android/misc/res/calculatorpp/18_preferences.png
diff --git a/calculatorpp/misc/res/calculatorpp/18_preferences_02.png b/app-android/misc/res/calculatorpp/18_preferences_02.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/18_preferences_02.png
rename to app-android/misc/res/calculatorpp/18_preferences_02.png
diff --git a/calculatorpp/misc/res/calculatorpp/18_preferences_03.png b/app-android/misc/res/calculatorpp/18_preferences_03.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/18_preferences_03.png
rename to app-android/misc/res/calculatorpp/18_preferences_03.png
diff --git a/calculatorpp/misc/res/calculatorpp/18_preferences_sm.png b/app-android/misc/res/calculatorpp/18_preferences_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/18_preferences_sm.png
rename to app-android/misc/res/calculatorpp/18_preferences_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/plan.png b/app-android/misc/res/calculatorpp/plan.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/plan.png
rename to app-android/misc/res/calculatorpp/plan.png
diff --git a/calculatorpp/misc/res/calculatorpp/plan.xcf b/app-android/misc/res/calculatorpp/plan.xcf
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/plan.xcf
rename to app-android/misc/res/calculatorpp/plan.xcf
diff --git a/calculatorpp/misc/res/icon-green.png b/app-android/misc/res/icon-green.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/res/icon-green.png
rename to app-android/misc/res/icon-green.png
diff --git a/calculatorpp/misc/res/icon-hi-res.png b/app-android/misc/res/icon-hi-res.png
similarity index 100%
rename from calculatorpp/misc/res/icon-hi-res.png
rename to app-android/misc/res/icon-hi-res.png
diff --git a/calculatorpp/misc/res/icon-promo.png b/app-android/misc/res/icon-promo.png
similarity index 100%
rename from calculatorpp/misc/res/icon-promo.png
rename to app-android/misc/res/icon-promo.png
diff --git a/calculatorpp/misc/res/icon.png b/app-android/misc/res/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/res/icon.png
rename to app-android/misc/res/icon.png
diff --git a/calculatorpp/misc/res/kb_facebook.png b/app-android/misc/res/kb_facebook.png
similarity index 100%
rename from calculatorpp/misc/res/kb_facebook.png
rename to app-android/misc/res/kb_facebook.png
diff --git a/calculatorpp/misc/res/kb_facebook_icon.png b/app-android/misc/res/kb_facebook_icon.png
similarity index 100%
rename from calculatorpp/misc/res/kb_facebook_icon.png
rename to app-android/misc/res/kb_facebook_icon.png
diff --git a/calculatorpp/misc/res/logo-admob.png b/app-android/misc/res/logo-admob.png
similarity index 100%
rename from calculatorpp/misc/res/logo-admob.png
rename to app-android/misc/res/logo-admob.png
diff --git a/calculatorpp/misc/res/logo-scaled.png b/app-android/misc/res/logo-scaled.png
similarity index 100%
rename from calculatorpp/misc/res/logo-scaled.png
rename to app-android/misc/res/logo-scaled.png
diff --git a/calculatorpp/misc/res/logo-small.png b/app-android/misc/res/logo-small.png
similarity index 100%
rename from calculatorpp/misc/res/logo-small.png
rename to app-android/misc/res/logo-small.png
diff --git a/calculatorpp/misc/res/logo.cdr b/app-android/misc/res/logo.cdr
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/res/logo.cdr
rename to app-android/misc/res/logo.cdr
diff --git a/calculatorpp/misc/res/logo.png b/app-android/misc/res/logo.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/res/logo.png
rename to app-android/misc/res/logo.png
diff --git a/calculatorpp/misc/res/widget.png b/app-android/misc/res/widget.png
similarity index 100%
rename from calculatorpp/misc/res/widget.png
rename to app-android/misc/res/widget.png
diff --git a/calculatorpp/misc/res/work/Backup_of_logo.cdr b/app-android/misc/res/work/Backup_of_logo.cdr
similarity index 100%
rename from calculatorpp/misc/res/work/Backup_of_logo.cdr
rename to app-android/misc/res/work/Backup_of_logo.cdr
diff --git a/calculatorpp/misc/res/work/header.png b/app-android/misc/res/work/header.png
similarity index 100%
rename from calculatorpp/misc/res/work/header.png
rename to app-android/misc/res/work/header.png
diff --git a/calculatorpp/misc/res/work/header_bg.png b/app-android/misc/res/work/header_bg.png
similarity index 100%
rename from calculatorpp/misc/res/work/header_bg.png
rename to app-android/misc/res/work/header_bg.png
diff --git a/calculatorpp/misc/res/work/header_sm.png b/app-android/misc/res/work/header_sm.png
similarity index 100%
rename from calculatorpp/misc/res/work/header_sm.png
rename to app-android/misc/res/work/header_sm.png
diff --git a/calculatorpp/misc/res/work/heart_original.png b/app-android/misc/res/work/heart_original.png
similarity index 100%
rename from calculatorpp/misc/res/work/heart_original.png
rename to app-android/misc/res/work/heart_original.png
diff --git a/calculatorpp/misc/res/work/icon.png b/app-android/misc/res/work/icon.png
similarity index 100%
rename from calculatorpp/misc/res/work/icon.png
rename to app-android/misc/res/work/icon.png
diff --git a/calculatorpp/misc/res/work/icon_favicon_light_blue.ico b/app-android/misc/res/work/icon_favicon_light_blue.ico
similarity index 100%
rename from calculatorpp/misc/res/work/icon_favicon_light_blue.ico
rename to app-android/misc/res/work/icon_favicon_light_blue.ico
diff --git a/calculatorpp/misc/res/work/icon_favicon_light_blue.png b/app-android/misc/res/work/icon_favicon_light_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/icon_favicon_light_blue.png
rename to app-android/misc/res/work/icon_favicon_light_blue.png
diff --git a/calculatorpp/misc/res/work/icon_favicon_purple.ico b/app-android/misc/res/work/icon_favicon_purple.ico
similarity index 100%
rename from calculatorpp/misc/res/work/icon_favicon_purple.ico
rename to app-android/misc/res/work/icon_favicon_purple.ico
diff --git a/calculatorpp/misc/res/work/icon_small.png b/app-android/misc/res/work/icon_small.png
similarity index 100%
rename from calculatorpp/misc/res/work/icon_small.png
rename to app-android/misc/res/work/icon_small.png
diff --git a/calculatorpp/misc/res/work/log11o.psd b/app-android/misc/res/work/log11o.psd
similarity index 100%
rename from calculatorpp/misc/res/work/log11o.psd
rename to app-android/misc/res/work/log11o.psd
diff --git a/calculatorpp/misc/res/work/logo.cdr b/app-android/misc/res/work/logo.cdr
similarity index 100%
rename from calculatorpp/misc/res/work/logo.cdr
rename to app-android/misc/res/work/logo.cdr
diff --git a/calculatorpp/misc/res/work/logo.png b/app-android/misc/res/work/logo.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo.png
rename to app-android/misc/res/work/logo.png
diff --git a/calculatorpp/misc/res/work/logoFULL copy.png b/app-android/misc/res/work/logoFULL copy.png
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL copy.png
rename to app-android/misc/res/work/logoFULL copy.png
diff --git a/calculatorpp/misc/res/work/logoFULL.pdf b/app-android/misc/res/work/logoFULL.pdf
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL.pdf
rename to app-android/misc/res/work/logoFULL.pdf
diff --git a/calculatorpp/misc/res/work/logoFULL.png b/app-android/misc/res/work/logoFULL.png
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL.png
rename to app-android/misc/res/work/logoFULL.png
diff --git a/calculatorpp/misc/res/work/logoFULL_banner.png b/app-android/misc/res/work/logoFULL_banner.png
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL_banner.png
rename to app-android/misc/res/work/logoFULL_banner.png
diff --git a/calculatorpp/misc/res/work/logoFULL_small.png b/app-android/misc/res/work/logoFULL_small.png
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL_small.png
rename to app-android/misc/res/work/logoFULL_small.png
diff --git a/calculatorpp/misc/res/work/logo_black.png b/app-android/misc/res/work/logo_black.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo_black.png
rename to app-android/misc/res/work/logo_black.png
diff --git a/calculatorpp/misc/res/work/logo_blue.png b/app-android/misc/res/work/logo_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo_blue.png
rename to app-android/misc/res/work/logo_blue.png
diff --git a/calculatorpp/misc/res/work/logo_light_blue.png b/app-android/misc/res/work/logo_light_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo_light_blue.png
rename to app-android/misc/res/work/logo_light_blue.png
diff --git a/calculatorpp/misc/res/work/logo_purple.png b/app-android/misc/res/work/logo_purple.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo_purple.png
rename to app-android/misc/res/work/logo_purple.png
diff --git a/calculatorpp/misc/res/work/promo_logo.png b/app-android/misc/res/work/promo_logo.png
similarity index 100%
rename from calculatorpp/misc/res/work/promo_logo.png
rename to app-android/misc/res/work/promo_logo.png
diff --git a/calculatorpp/misc/res/work/text_logo.png b/app-android/misc/res/work/text_logo.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo.png
rename to app-android/misc/res/work/text_logo.png
diff --git a/calculatorpp/misc/res/work/text_logo_blue.png b/app-android/misc/res/work/text_logo_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo_blue.png
rename to app-android/misc/res/work/text_logo_blue.png
diff --git a/calculatorpp/misc/res/work/text_logo_light_blue.png b/app-android/misc/res/work/text_logo_light_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo_light_blue.png
rename to app-android/misc/res/work/text_logo_light_blue.png
diff --git a/calculatorpp/misc/res/work/text_logo_light_blue_cpp_forum.png b/app-android/misc/res/work/text_logo_light_blue_cpp_forum.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo_light_blue_cpp_forum.png
rename to app-android/misc/res/work/text_logo_light_blue_cpp_forum.png
diff --git a/calculatorpp/misc/res/work/text_logo_purple.png b/app-android/misc/res/work/text_logo_purple.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo_purple.png
rename to app-android/misc/res/work/text_logo_purple.png
diff --git a/calculatorpp/misc/src/achartengine-0.7.0.jar b/app-android/misc/src/achartengine-0.7.0.jar
similarity index 100%
rename from calculatorpp/misc/src/achartengine-0.7.0.jar
rename to app-android/misc/src/achartengine-0.7.0.jar
diff --git a/calculatorpp/misc/src/bsh.jar b/app-android/misc/src/bsh.jar
similarity index 100%
rename from calculatorpp/misc/src/bsh.jar
rename to app-android/misc/src/bsh.jar
diff --git a/calculatorpp/pom.xml b/app-android/pom.xml
similarity index 99%
rename from calculatorpp/pom.xml
rename to app-android/pom.xml
index d01ac953..a40e5f96 100644
--- a/calculatorpp/pom.xml
+++ b/app-android/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.solovyev.android</groupId>
-    <artifactId>calculatorpp</artifactId>
+    <artifactId>calculatorpp-app-android</artifactId>
     <packaging>apk</packaging>
     <name>Calculator++ Application</name>
 
diff --git a/calculatorpp/proguard.cfg b/app-android/proguard.cfg
similarity index 100%
rename from calculatorpp/proguard.cfg
rename to app-android/proguard.cfg
diff --git a/calculatorpp/project.properties b/app-android/project.properties
similarity index 100%
rename from calculatorpp/project.properties
rename to app-android/project.properties
diff --git a/calculatorpp/res/drawable-hdpi/ab_add.png b/app-android/res/drawable-hdpi/ab_add.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/ab_add.png
rename to app-android/res/drawable-hdpi/ab_add.png
diff --git a/calculatorpp/res/drawable-hdpi/ab_icon.png b/app-android/res/drawable-hdpi/ab_icon.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/ab_icon.png
rename to app-android/res/drawable-hdpi/ab_icon.png
diff --git a/calculatorpp/res/drawable-hdpi/ab_icon_long.png b/app-android/res/drawable-hdpi/ab_icon_long.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/ab_icon_long.png
rename to app-android/res/drawable-hdpi/ab_icon_long.png
diff --git a/calculatorpp/res/drawable-hdpi/ab_settings.png b/app-android/res/drawable-hdpi/ab_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/ab_settings.png
rename to app-android/res/drawable-hdpi/ab_settings.png
diff --git a/calculatorpp/res/drawable-hdpi/icon.png b/app-android/res/drawable-hdpi/icon.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/icon.png
rename to app-android/res/drawable-hdpi/icon.png
diff --git a/calculatorpp/res/drawable-hdpi/icon_onscreen.png b/app-android/res/drawable-hdpi/icon_onscreen.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/icon_onscreen.png
rename to app-android/res/drawable-hdpi/icon_onscreen.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_copy.png b/app-android/res/drawable-hdpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_copy.png
rename to app-android/res/drawable-hdpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_delete.png b/app-android/res/drawable-hdpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_delete.png
rename to app-android/res/drawable-hdpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_facebook.png b/app-android/res/drawable-hdpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_facebook.png
rename to app-android/res/drawable-hdpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_heart.png b/app-android/res/drawable-hdpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_heart.png
rename to app-android/res/drawable-hdpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_logo.png b/app-android/res/drawable-hdpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_logo.png
rename to app-android/res/drawable-hdpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_paste.png b/app-android/res/drawable-hdpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_paste.png
rename to app-android/res/drawable-hdpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_settings.png b/app-android/res/drawable-hdpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_settings.png
rename to app-android/res/drawable-hdpi/kb_settings.png
diff --git a/calculatorpp/res/drawable-hdpi/logo.png b/app-android/res/drawable-hdpi/logo.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/logo.png
rename to app-android/res/drawable-hdpi/logo.png
diff --git a/calculatorpp/res/drawable-ldpi/ab_add.png b/app-android/res/drawable-ldpi/ab_add.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/ab_add.png
rename to app-android/res/drawable-ldpi/ab_add.png
diff --git a/calculatorpp/res/drawable-ldpi/ab_icon.png b/app-android/res/drawable-ldpi/ab_icon.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/ab_icon.png
rename to app-android/res/drawable-ldpi/ab_icon.png
diff --git a/calculatorpp/res/drawable-ldpi/ab_settings.png b/app-android/res/drawable-ldpi/ab_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/ab_settings.png
rename to app-android/res/drawable-ldpi/ab_settings.png
diff --git a/calculatorpp/res/drawable-ldpi/icon.png b/app-android/res/drawable-ldpi/icon.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/icon.png
rename to app-android/res/drawable-ldpi/icon.png
diff --git a/calculatorpp/res/drawable-ldpi/icon_onscreen.png b/app-android/res/drawable-ldpi/icon_onscreen.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/icon_onscreen.png
rename to app-android/res/drawable-ldpi/icon_onscreen.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_copy.png b/app-android/res/drawable-ldpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_copy.png
rename to app-android/res/drawable-ldpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_delete.png b/app-android/res/drawable-ldpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_delete.png
rename to app-android/res/drawable-ldpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_facebook.png b/app-android/res/drawable-ldpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_facebook.png
rename to app-android/res/drawable-ldpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_heart.png b/app-android/res/drawable-ldpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_heart.png
rename to app-android/res/drawable-ldpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_logo.png b/app-android/res/drawable-ldpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_logo.png
rename to app-android/res/drawable-ldpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_paste.png b/app-android/res/drawable-ldpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_paste.png
rename to app-android/res/drawable-ldpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_settings.png b/app-android/res/drawable-ldpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_settings.png
rename to app-android/res/drawable-ldpi/kb_settings.png
diff --git a/calculatorpp/res/drawable-ldpi/logo.png b/app-android/res/drawable-ldpi/logo.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/logo.png
rename to app-android/res/drawable-ldpi/logo.png
diff --git a/calculatorpp/res/drawable-mdpi/ab_add.png b/app-android/res/drawable-mdpi/ab_add.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/ab_add.png
rename to app-android/res/drawable-mdpi/ab_add.png
diff --git a/calculatorpp/res/drawable-mdpi/ab_icon.png b/app-android/res/drawable-mdpi/ab_icon.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/ab_icon.png
rename to app-android/res/drawable-mdpi/ab_icon.png
diff --git a/calculatorpp/res/drawable-mdpi/ab_settings.png b/app-android/res/drawable-mdpi/ab_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/ab_settings.png
rename to app-android/res/drawable-mdpi/ab_settings.png
diff --git a/calculatorpp/res/drawable-mdpi/icon.png b/app-android/res/drawable-mdpi/icon.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/icon.png
rename to app-android/res/drawable-mdpi/icon.png
diff --git a/calculatorpp/res/drawable-mdpi/icon_onscreen.png b/app-android/res/drawable-mdpi/icon_onscreen.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/icon_onscreen.png
rename to app-android/res/drawable-mdpi/icon_onscreen.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_copy.png b/app-android/res/drawable-mdpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_copy.png
rename to app-android/res/drawable-mdpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_delete.png b/app-android/res/drawable-mdpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_delete.png
rename to app-android/res/drawable-mdpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_facebook.png b/app-android/res/drawable-mdpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_facebook.png
rename to app-android/res/drawable-mdpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_heart.png b/app-android/res/drawable-mdpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_heart.png
rename to app-android/res/drawable-mdpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_logo.png b/app-android/res/drawable-mdpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_logo.png
rename to app-android/res/drawable-mdpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_paste.png b/app-android/res/drawable-mdpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_paste.png
rename to app-android/res/drawable-mdpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_settings.png b/app-android/res/drawable-mdpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_settings.png
rename to app-android/res/drawable-mdpi/kb_settings.png
diff --git a/calculatorpp/res/drawable-mdpi/logo.png b/app-android/res/drawable-mdpi/logo.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/logo.png
rename to app-android/res/drawable-mdpi/logo.png
diff --git a/calculatorpp/res/drawable-nodpi/cpp_onscreen_button_close.png b/app-android/res/drawable-nodpi/cpp_onscreen_button_close.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/cpp_onscreen_button_close.png
rename to app-android/res/drawable-nodpi/cpp_onscreen_button_close.png
diff --git a/calculatorpp/res/drawable-nodpi/cpp_onscreen_button_fold.png b/app-android/res/drawable-nodpi/cpp_onscreen_button_fold.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/cpp_onscreen_button_fold.png
rename to app-android/res/drawable-nodpi/cpp_onscreen_button_fold.png
diff --git a/calculatorpp/res/drawable-nodpi/cpp_onscreen_button_minimize.png b/app-android/res/drawable-nodpi/cpp_onscreen_button_minimize.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/cpp_onscreen_button_minimize.png
rename to app-android/res/drawable-nodpi/cpp_onscreen_button_minimize.png
diff --git a/calculatorpp/res/drawable-nodpi/cpp_onscreen_header_logo.png b/app-android/res/drawable-nodpi/cpp_onscreen_header_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/cpp_onscreen_header_logo.png
rename to app-android/res/drawable-nodpi/cpp_onscreen_header_logo.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png b/app-android/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
rename to app-android/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png b/app-android/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
rename to app-android/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png b/app-android/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
rename to app-android/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png b/app-android/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
rename to app-android/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__list_focused_holo.9.png b/app-android/res/drawable-nodpi/default_abs__list_focused_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__list_focused_holo.9.png
rename to app-android/res/drawable-nodpi/default_abs__list_focused_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png b/app-android/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
rename to app-android/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png b/app-android/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
rename to app-android/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png b/app-android/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
rename to app-android/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png b/app-android/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
rename to app-android/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png b/app-android/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
rename to app-android/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__tab_selected_holo.9.png b/app-android/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
rename to app-android/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png b/app-android/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
rename to app-android/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png b/app-android/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
rename to app-android/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png b/app-android/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
rename to app-android/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png b/app-android/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
rename to app-android/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png b/app-android/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
rename to app-android/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png b/app-android/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
rename to app-android/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png b/app-android/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
rename to app-android/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png b/app-android/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
rename to app-android/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png b/app-android/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
rename to app-android/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/widget_preview.png b/app-android/res/drawable-nodpi/widget_preview.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/widget_preview.png
rename to app-android/res/drawable-nodpi/widget_preview.png
diff --git a/calculatorpp/res/drawable-xhdpi/ab_add.png b/app-android/res/drawable-xhdpi/ab_add.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/ab_add.png
rename to app-android/res/drawable-xhdpi/ab_add.png
diff --git a/calculatorpp/res/drawable-xhdpi/ab_icon.png b/app-android/res/drawable-xhdpi/ab_icon.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/ab_icon.png
rename to app-android/res/drawable-xhdpi/ab_icon.png
diff --git a/calculatorpp/res/drawable-xhdpi/ab_settings.png b/app-android/res/drawable-xhdpi/ab_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/ab_settings.png
rename to app-android/res/drawable-xhdpi/ab_settings.png
diff --git a/calculatorpp/res/drawable-xhdpi/ic_menu_preferences.png b/app-android/res/drawable-xhdpi/ic_menu_preferences.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/ic_menu_preferences.png
rename to app-android/res/drawable-xhdpi/ic_menu_preferences.png
diff --git a/calculatorpp/res/drawable-xhdpi/icon.png b/app-android/res/drawable-xhdpi/icon.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/icon.png
rename to app-android/res/drawable-xhdpi/icon.png
diff --git a/calculatorpp/res/drawable-xhdpi/icon_onscreen.png b/app-android/res/drawable-xhdpi/icon_onscreen.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/icon_onscreen.png
rename to app-android/res/drawable-xhdpi/icon_onscreen.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_copy.png b/app-android/res/drawable-xhdpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_copy.png
rename to app-android/res/drawable-xhdpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_delete.png b/app-android/res/drawable-xhdpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_delete.png
rename to app-android/res/drawable-xhdpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_facebook.png b/app-android/res/drawable-xhdpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_facebook.png
rename to app-android/res/drawable-xhdpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_heart.png b/app-android/res/drawable-xhdpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_heart.png
rename to app-android/res/drawable-xhdpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_logo.png b/app-android/res/drawable-xhdpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_logo.png
rename to app-android/res/drawable-xhdpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_paste.png b/app-android/res/drawable-xhdpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_paste.png
rename to app-android/res/drawable-xhdpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_settings.png b/app-android/res/drawable-xhdpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_settings.png
rename to app-android/res/drawable-xhdpi/kb_settings.png
diff --git a/calculatorpp/res/drawable-xhdpi/logo.png b/app-android/res/drawable-xhdpi/logo.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/logo.png
rename to app-android/res/drawable-xhdpi/logo.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_copy.png b/app-android/res/drawable-xlarge-hdpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_copy.png
rename to app-android/res/drawable-xlarge-hdpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_delete.png b/app-android/res/drawable-xlarge-hdpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_delete.png
rename to app-android/res/drawable-xlarge-hdpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_facebook.png b/app-android/res/drawable-xlarge-hdpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_facebook.png
rename to app-android/res/drawable-xlarge-hdpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_heart.png b/app-android/res/drawable-xlarge-hdpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_heart.png
rename to app-android/res/drawable-xlarge-hdpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_logo.png b/app-android/res/drawable-xlarge-hdpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_logo.png
rename to app-android/res/drawable-xlarge-hdpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_paste.png b/app-android/res/drawable-xlarge-hdpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_paste.png
rename to app-android/res/drawable-xlarge-hdpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_settings.png b/app-android/res/drawable-xlarge-hdpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_settings.png
rename to app-android/res/drawable-xlarge-hdpi/kb_settings.png
diff --git a/calculatorpp/res/drawable/blue_button.xml b/app-android/res/drawable/blue_button.xml
similarity index 100%
rename from calculatorpp/res/drawable/blue_button.xml
rename to app-android/res/drawable/blue_button.xml
diff --git a/calculatorpp/res/drawable/blue_button_dark.xml b/app-android/res/drawable/blue_button_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/blue_button_dark.xml
rename to app-android/res/drawable/blue_button_dark.xml
diff --git a/calculatorpp/res/drawable/blue_button_dark_shape.xml b/app-android/res/drawable/blue_button_dark_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/blue_button_dark_shape.xml
rename to app-android/res/drawable/blue_button_dark_shape.xml
diff --git a/calculatorpp/res/drawable/blue_button_shape.xml b/app-android/res/drawable/blue_button_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/blue_button_shape.xml
rename to app-android/res/drawable/blue_button_shape.xml
diff --git a/calculatorpp/res/drawable/default_abs__btn_cab_done_holo_dark.xml b/app-android/res/drawable/default_abs__btn_cab_done_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__btn_cab_done_holo_dark.xml
rename to app-android/res/drawable/default_abs__btn_cab_done_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__item_background_holo_dark.xml b/app-android/res/drawable/default_abs__item_background_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__item_background_holo_dark.xml
rename to app-android/res/drawable/default_abs__item_background_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml b/app-android/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
rename to app-android/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__list_selector_holo_dark.xml b/app-android/res/drawable/default_abs__list_selector_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__list_selector_holo_dark.xml
rename to app-android/res/drawable/default_abs__list_selector_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__spinner_ab_holo_dark.xml b/app-android/res/drawable/default_abs__spinner_ab_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__spinner_ab_holo_dark.xml
rename to app-android/res/drawable/default_abs__spinner_ab_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__tab_indicator_ab_holo.xml b/app-android/res/drawable/default_abs__tab_indicator_ab_holo.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__tab_indicator_ab_holo.xml
rename to app-android/res/drawable/default_abs__tab_indicator_ab_holo.xml
diff --git a/calculatorpp/res/drawable/gray_button.xml b/app-android/res/drawable/gray_button.xml
similarity index 100%
rename from calculatorpp/res/drawable/gray_button.xml
rename to app-android/res/drawable/gray_button.xml
diff --git a/calculatorpp/res/drawable/gray_button_dark.xml b/app-android/res/drawable/gray_button_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/gray_button_dark.xml
rename to app-android/res/drawable/gray_button_dark.xml
diff --git a/calculatorpp/res/drawable/gray_button_dark_shape.xml b/app-android/res/drawable/gray_button_dark_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/gray_button_dark_shape.xml
rename to app-android/res/drawable/gray_button_dark_shape.xml
diff --git a/calculatorpp/res/drawable/gray_button_shape.xml b/app-android/res/drawable/gray_button_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/gray_button_shape.xml
rename to app-android/res/drawable/gray_button_shape.xml
diff --git a/calculatorpp/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml b/app-android/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
rename to app-android/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
diff --git a/calculatorpp/res/drawable/metro_blue_button.xml b/app-android/res/drawable/metro_blue_button.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_blue_button.xml
rename to app-android/res/drawable/metro_blue_button.xml
diff --git a/calculatorpp/res/drawable/metro_blue_button_shape.xml b/app-android/res/drawable/metro_blue_button_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_blue_button_shape.xml
rename to app-android/res/drawable/metro_blue_button_shape.xml
diff --git a/calculatorpp/res/drawable/metro_blue_list_item.xml b/app-android/res/drawable/metro_blue_list_item.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_blue_list_item.xml
rename to app-android/res/drawable/metro_blue_list_item.xml
diff --git a/calculatorpp/res/drawable/metro_button_dark.xml b/app-android/res/drawable/metro_button_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_dark.xml
rename to app-android/res/drawable/metro_button_dark.xml
diff --git a/calculatorpp/res/drawable/metro_button_dark_shape.xml b/app-android/res/drawable/metro_button_dark_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_dark_shape.xml
rename to app-android/res/drawable/metro_button_dark_shape.xml
diff --git a/calculatorpp/res/drawable/metro_button_green.xml b/app-android/res/drawable/metro_button_green.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_green.xml
rename to app-android/res/drawable/metro_button_green.xml
diff --git a/calculatorpp/res/drawable/metro_button_green_shape.xml b/app-android/res/drawable/metro_button_green_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_green_shape.xml
rename to app-android/res/drawable/metro_button_green_shape.xml
diff --git a/calculatorpp/res/drawable/metro_button_light.xml b/app-android/res/drawable/metro_button_light.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_light.xml
rename to app-android/res/drawable/metro_button_light.xml
diff --git a/calculatorpp/res/drawable/metro_button_light_shape.xml b/app-android/res/drawable/metro_button_light_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_light_shape.xml
rename to app-android/res/drawable/metro_button_light_shape.xml
diff --git a/calculatorpp/res/drawable/metro_button_pressed.xml b/app-android/res/drawable/metro_button_pressed.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_pressed.xml
rename to app-android/res/drawable/metro_button_pressed.xml
diff --git a/calculatorpp/res/drawable/metro_button_purple.xml b/app-android/res/drawable/metro_button_purple.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_purple.xml
rename to app-android/res/drawable/metro_button_purple.xml
diff --git a/calculatorpp/res/drawable/metro_button_purple_shape.xml b/app-android/res/drawable/metro_button_purple_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_purple_shape.xml
rename to app-android/res/drawable/metro_button_purple_shape.xml
diff --git a/calculatorpp/res/drawable/metro_green_list_item.xml b/app-android/res/drawable/metro_green_list_item.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_green_list_item.xml
rename to app-android/res/drawable/metro_green_list_item.xml
diff --git a/calculatorpp/res/drawable/metro_purple_list_item.xml b/app-android/res/drawable/metro_purple_list_item.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_purple_list_item.xml
rename to app-android/res/drawable/metro_purple_list_item.xml
diff --git a/calculatorpp/res/drawable/pane_background.xml b/app-android/res/drawable/pane_background.xml
similarity index 100%
rename from calculatorpp/res/drawable/pane_background.xml
rename to app-android/res/drawable/pane_background.xml
diff --git a/calculatorpp/res/drawable/violet_button.xml b/app-android/res/drawable/violet_button.xml
similarity index 100%
rename from calculatorpp/res/drawable/violet_button.xml
rename to app-android/res/drawable/violet_button.xml
diff --git a/calculatorpp/res/drawable/violet_button_dark.xml b/app-android/res/drawable/violet_button_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/violet_button_dark.xml
rename to app-android/res/drawable/violet_button_dark.xml
diff --git a/calculatorpp/res/drawable/violet_button_dark_shape.xml b/app-android/res/drawable/violet_button_dark_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/violet_button_dark_shape.xml
rename to app-android/res/drawable/violet_button_dark_shape.xml
diff --git a/calculatorpp/res/drawable/violet_button_shape.xml b/app-android/res/drawable/violet_button_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/violet_button_shape.xml
rename to app-android/res/drawable/violet_button_shape.xml
diff --git a/calculatorpp/res/layout-land/calc_keyboard.xml b/app-android/res/layout-land/calc_keyboard.xml
similarity index 100%
rename from calculatorpp/res/layout-land/calc_keyboard.xml
rename to app-android/res/layout-land/calc_keyboard.xml
diff --git a/calculatorpp/res/layout-land/calc_keyboard_mobile.xml b/app-android/res/layout-land/calc_keyboard_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout-land/calc_keyboard_mobile.xml
rename to app-android/res/layout-land/calc_keyboard_mobile.xml
diff --git a/calculatorpp/res/layout-land/main_calculator.xml b/app-android/res/layout-land/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-land/main_calculator.xml
rename to app-android/res/layout-land/main_calculator.xml
diff --git a/calculatorpp/res/layout-land/main_calculator_mobile.xml b/app-android/res/layout-land/main_calculator_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout-land/main_calculator_mobile.xml
rename to app-android/res/layout-land/main_calculator_mobile.xml
diff --git a/calculatorpp/res/layout-land/main_first_pane.xml b/app-android/res/layout-land/main_first_pane.xml
similarity index 100%
rename from calculatorpp/res/layout-land/main_first_pane.xml
rename to app-android/res/layout-land/main_first_pane.xml
diff --git a/calculatorpp/res/layout-land/main_first_pane_mobile.xml b/app-android/res/layout-land/main_first_pane_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout-land/main_first_pane_mobile.xml
rename to app-android/res/layout-land/main_first_pane_mobile.xml
diff --git a/calculatorpp/res/layout-large-land/calc_keyboard.xml b/app-android/res/layout-large-land/calc_keyboard.xml
similarity index 100%
rename from calculatorpp/res/layout-large-land/calc_keyboard.xml
rename to app-android/res/layout-large-land/calc_keyboard.xml
diff --git a/calculatorpp/res/layout-large-land/main_calculator.xml b/app-android/res/layout-large-land/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-large-land/main_calculator.xml
rename to app-android/res/layout-large-land/main_calculator.xml
diff --git a/calculatorpp/res/layout-large/calc_display.xml b/app-android/res/layout-large/calc_display.xml
similarity index 100%
rename from calculatorpp/res/layout-large/calc_display.xml
rename to app-android/res/layout-large/calc_display.xml
diff --git a/calculatorpp/res/layout-large/calc_editor.xml b/app-android/res/layout-large/calc_editor.xml
similarity index 100%
rename from calculatorpp/res/layout-large/calc_editor.xml
rename to app-android/res/layout-large/calc_editor.xml
diff --git a/calculatorpp/res/layout-large/calc_keyboard.xml b/app-android/res/layout-large/calc_keyboard.xml
similarity index 100%
rename from calculatorpp/res/layout-large/calc_keyboard.xml
rename to app-android/res/layout-large/calc_keyboard.xml
diff --git a/calculatorpp/res/layout-large/main_calculator.xml b/app-android/res/layout-large/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-large/main_calculator.xml
rename to app-android/res/layout-large/main_calculator.xml
diff --git a/calculatorpp/res/layout-xlarge-land/calc_keyboard.xml b/app-android/res/layout-xlarge-land/calc_keyboard.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge-land/calc_keyboard.xml
rename to app-android/res/layout-xlarge-land/calc_keyboard.xml
diff --git a/calculatorpp/res/layout-xlarge-land/main_calculator.xml b/app-android/res/layout-xlarge-land/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge-land/main_calculator.xml
rename to app-android/res/layout-xlarge-land/main_calculator.xml
diff --git a/calculatorpp/res/layout-xlarge/calc_display.xml b/app-android/res/layout-xlarge/calc_display.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge/calc_display.xml
rename to app-android/res/layout-xlarge/calc_display.xml
diff --git a/calculatorpp/res/layout-xlarge/calc_editor.xml b/app-android/res/layout-xlarge/calc_editor.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge/calc_editor.xml
rename to app-android/res/layout-xlarge/calc_editor.xml
diff --git a/calculatorpp/res/layout-xlarge/calc_keyboard.xml b/app-android/res/layout-xlarge/calc_keyboard.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge/calc_keyboard.xml
rename to app-android/res/layout-xlarge/calc_keyboard.xml
diff --git a/calculatorpp/res/layout-xlarge/main_calculator.xml b/app-android/res/layout-xlarge/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge/main_calculator.xml
rename to app-android/res/layout-xlarge/main_calculator.xml
diff --git a/calculatorpp/res/layout/about_fragment.xml b/app-android/res/layout/about_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/about_fragment.xml
rename to app-android/res/layout/about_fragment.xml
diff --git a/calculatorpp/res/layout/ad.xml b/app-android/res/layout/ad.xml
similarity index 100%
rename from calculatorpp/res/layout/ad.xml
rename to app-android/res/layout/ad.xml
diff --git a/calculatorpp/res/layout/admob_pref.xml b/app-android/res/layout/admob_pref.xml
similarity index 100%
rename from calculatorpp/res/layout/admob_pref.xml
rename to app-android/res/layout/admob_pref.xml
diff --git a/calculatorpp/res/layout/calc_clear_button.xml b/app-android/res/layout/calc_clear_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_clear_button.xml
rename to app-android/res/layout/calc_clear_button.xml
diff --git a/calculatorpp/res/layout/calc_copy_button.xml b/app-android/res/layout/calc_copy_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_copy_button.xml
rename to app-android/res/layout/calc_copy_button.xml
diff --git a/calculatorpp/res/layout/calc_display.xml b/app-android/res/layout/calc_display.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_display.xml
rename to app-android/res/layout/calc_display.xml
diff --git a/calculatorpp/res/layout/calc_display_mobile.xml b/app-android/res/layout/calc_display_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_display_mobile.xml
rename to app-android/res/layout/calc_display_mobile.xml
diff --git a/calculatorpp/res/layout/calc_division_button.xml b/app-android/res/layout/calc_division_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_division_button.xml
rename to app-android/res/layout/calc_division_button.xml
diff --git a/calculatorpp/res/layout/calc_donate_button.xml b/app-android/res/layout/calc_donate_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_donate_button.xml
rename to app-android/res/layout/calc_donate_button.xml
diff --git a/calculatorpp/res/layout/calc_dot_button.xml b/app-android/res/layout/calc_dot_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_dot_button.xml
rename to app-android/res/layout/calc_dot_button.xml
diff --git a/calculatorpp/res/layout/calc_editor.xml b/app-android/res/layout/calc_editor.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_editor.xml
rename to app-android/res/layout/calc_editor.xml
diff --git a/calculatorpp/res/layout/calc_editor_mobile.xml b/app-android/res/layout/calc_editor_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_editor_mobile.xml
rename to app-android/res/layout/calc_editor_mobile.xml
diff --git a/calculatorpp/res/layout/calc_eight_digit_button.xml b/app-android/res/layout/calc_eight_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_eight_digit_button.xml
rename to app-android/res/layout/calc_eight_digit_button.xml
diff --git a/calculatorpp/res/layout/calc_empty_button.xml b/app-android/res/layout/calc_empty_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_empty_button.xml
rename to app-android/res/layout/calc_empty_button.xml
diff --git a/calculatorpp/res/layout/calc_equals_button.xml b/app-android/res/layout/calc_equals_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_equals_button.xml
rename to app-android/res/layout/calc_equals_button.xml
diff --git a/calculatorpp/res/layout/calc_erase_button.xml b/app-android/res/layout/calc_erase_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_erase_button.xml
rename to app-android/res/layout/calc_erase_button.xml
diff --git a/calculatorpp/res/layout/calc_five_digit_button.xml b/app-android/res/layout/calc_five_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_five_digit_button.xml
rename to app-android/res/layout/calc_five_digit_button.xml
diff --git a/calculatorpp/res/layout/calc_four_digit_button.xml b/app-android/res/layout/calc_four_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_four_digit_button.xml
rename to app-android/res/layout/calc_four_digit_button.xml
diff --git a/calculatorpp/res/layout/calc_functions_button.xml b/app-android/res/layout/calc_functions_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_functions_button.xml
rename to app-android/res/layout/calc_functions_button.xml
diff --git a/calculatorpp/res/layout/calc_history_button.xml b/app-android/res/layout/calc_history_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_history_button.xml
rename to app-android/res/layout/calc_history_button.xml
diff --git a/calculatorpp/res/layout/calc_keyboard.xml b/app-android/res/layout/calc_keyboard.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_keyboard.xml
rename to app-android/res/layout/calc_keyboard.xml
diff --git a/calculatorpp/res/layout/calc_keyboard_mobile.xml b/app-android/res/layout/calc_keyboard_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_keyboard_mobile.xml
rename to app-android/res/layout/calc_keyboard_mobile.xml
diff --git a/calculatorpp/res/layout/calc_left_button.xml b/app-android/res/layout/calc_left_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_left_button.xml
rename to app-android/res/layout/calc_left_button.xml
diff --git a/calculatorpp/res/layout/calc_multiplication_button.xml b/app-android/res/layout/calc_multiplication_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_multiplication_button.xml
rename to app-android/res/layout/calc_multiplication_button.xml
diff --git a/calculatorpp/res/layout/calc_nine_digit_button.xml b/app-android/res/layout/calc_nine_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_nine_digit_button.xml
rename to app-android/res/layout/calc_nine_digit_button.xml
diff --git a/calculatorpp/res/layout/calc_one_digit_button.xml b/app-android/res/layout/calc_one_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_one_digit_button.xml
rename to app-android/res/layout/calc_one_digit_button.xml
diff --git a/calculatorpp/res/layout/calc_operators_button.xml b/app-android/res/layout/calc_operators_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_operators_button.xml
rename to app-android/res/layout/calc_operators_button.xml
diff --git a/calculatorpp/res/layout/calc_paste_button.xml b/app-android/res/layout/calc_paste_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_paste_button.xml
rename to app-android/res/layout/calc_paste_button.xml
diff --git a/calculatorpp/res/layout/calc_plot_view.xml b/app-android/res/layout/calc_plot_view.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_plot_view.xml
rename to app-android/res/layout/calc_plot_view.xml
diff --git a/calculatorpp/res/layout/calc_plus_button.xml b/app-android/res/layout/calc_plus_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_plus_button.xml
rename to app-android/res/layout/calc_plus_button.xml
diff --git a/calculatorpp/res/layout/calc_right_button.xml b/app-android/res/layout/calc_right_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_right_button.xml
rename to app-android/res/layout/calc_right_button.xml
diff --git a/calculatorpp/res/layout/calc_round_brackets_button.xml b/app-android/res/layout/calc_round_brackets_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_round_brackets_button.xml
rename to app-android/res/layout/calc_round_brackets_button.xml
diff --git a/calculatorpp/res/layout/calc_seven_digit_button.xml b/app-android/res/layout/calc_seven_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_seven_digit_button.xml
rename to app-android/res/layout/calc_seven_digit_button.xml
diff --git a/calculatorpp/res/layout/calc_six_digit_button.xml b/app-android/res/layout/calc_six_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_six_digit_button.xml
rename to app-android/res/layout/calc_six_digit_button.xml
diff --git a/calculatorpp/res/layout/calc_subtraction_button.xml b/app-android/res/layout/calc_subtraction_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_subtraction_button.xml
rename to app-android/res/layout/calc_subtraction_button.xml
diff --git a/calculatorpp/res/layout/calc_three_digit_button.xml b/app-android/res/layout/calc_three_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_three_digit_button.xml
rename to app-android/res/layout/calc_three_digit_button.xml
diff --git a/calculatorpp/res/layout/calc_title.xml b/app-android/res/layout/calc_title.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_title.xml
rename to app-android/res/layout/calc_title.xml
diff --git a/calculatorpp/res/layout/calc_two_digit_button.xml b/app-android/res/layout/calc_two_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_two_digit_button.xml
rename to app-android/res/layout/calc_two_digit_button.xml
diff --git a/calculatorpp/res/layout/calc_vars_button.xml b/app-android/res/layout/calc_vars_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_vars_button.xml
rename to app-android/res/layout/calc_vars_button.xml
diff --git a/calculatorpp/res/layout/calc_zero_digit_button.xml b/app-android/res/layout/calc_zero_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_zero_digit_button.xml
rename to app-android/res/layout/calc_zero_digit_button.xml
diff --git a/calculatorpp/res/layout/calculator_messages_dialog.xml b/app-android/res/layout/calculator_messages_dialog.xml
similarity index 100%
rename from calculatorpp/res/layout/calculator_messages_dialog.xml
rename to app-android/res/layout/calculator_messages_dialog.xml
diff --git a/calculatorpp/res/layout/calculator_messages_dialog_message.xml b/app-android/res/layout/calculator_messages_dialog_message.xml
similarity index 100%
rename from calculatorpp/res/layout/calculator_messages_dialog_message.xml
rename to app-android/res/layout/calculator_messages_dialog_message.xml
diff --git a/calculatorpp/res/layout/display_error_message.xml b/app-android/res/layout/display_error_message.xml
similarity index 100%
rename from calculatorpp/res/layout/display_error_message.xml
rename to app-android/res/layout/display_error_message.xml
diff --git a/calculatorpp/res/layout/drag_button_calibration.xml b/app-android/res/layout/drag_button_calibration.xml
similarity index 100%
rename from calculatorpp/res/layout/drag_button_calibration.xml
rename to app-android/res/layout/drag_button_calibration.xml
diff --git a/calculatorpp/res/layout/feedback.xml b/app-android/res/layout/feedback.xml
similarity index 100%
rename from calculatorpp/res/layout/feedback.xml
rename to app-android/res/layout/feedback.xml
diff --git a/calculatorpp/res/layout/function_add_param.xml b/app-android/res/layout/function_add_param.xml
similarity index 100%
rename from calculatorpp/res/layout/function_add_param.xml
rename to app-android/res/layout/function_add_param.xml
diff --git a/calculatorpp/res/layout/function_edit.xml b/app-android/res/layout/function_edit.xml
similarity index 100%
rename from calculatorpp/res/layout/function_edit.xml
rename to app-android/res/layout/function_edit.xml
diff --git a/calculatorpp/res/layout/function_edit_param.xml b/app-android/res/layout/function_edit_param.xml
similarity index 100%
rename from calculatorpp/res/layout/function_edit_param.xml
rename to app-android/res/layout/function_edit_param.xml
diff --git a/calculatorpp/res/layout/help_faq_fragment.xml b/app-android/res/layout/help_faq_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/help_faq_fragment.xml
rename to app-android/res/layout/help_faq_fragment.xml
diff --git a/calculatorpp/res/layout/help_hints_fragment.xml b/app-android/res/layout/help_hints_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/help_hints_fragment.xml
rename to app-android/res/layout/help_hints_fragment.xml
diff --git a/calculatorpp/res/layout/help_screens_fragment.xml b/app-android/res/layout/help_screens_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/help_screens_fragment.xml
rename to app-android/res/layout/help_screens_fragment.xml
diff --git a/calculatorpp/res/layout/history_edit.xml b/app-android/res/layout/history_edit.xml
similarity index 100%
rename from calculatorpp/res/layout/history_edit.xml
rename to app-android/res/layout/history_edit.xml
diff --git a/calculatorpp/res/layout/history_fragment.xml b/app-android/res/layout/history_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/history_fragment.xml
rename to app-android/res/layout/history_fragment.xml
diff --git a/calculatorpp/res/layout/history_item.xml b/app-android/res/layout/history_item.xml
similarity index 100%
rename from calculatorpp/res/layout/history_item.xml
rename to app-android/res/layout/history_item.xml
diff --git a/calculatorpp/res/layout/main_calculator.xml b/app-android/res/layout/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout/main_calculator.xml
rename to app-android/res/layout/main_calculator.xml
diff --git a/calculatorpp/res/layout/main_calculator_mobile.xml b/app-android/res/layout/main_calculator_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout/main_calculator_mobile.xml
rename to app-android/res/layout/main_calculator_mobile.xml
diff --git a/calculatorpp/res/layout/main_empty.xml b/app-android/res/layout/main_empty.xml
similarity index 100%
rename from calculatorpp/res/layout/main_empty.xml
rename to app-android/res/layout/main_empty.xml
diff --git a/calculatorpp/res/layout/main_empty_multi_pane.xml b/app-android/res/layout/main_empty_multi_pane.xml
similarity index 100%
rename from calculatorpp/res/layout/main_empty_multi_pane.xml
rename to app-android/res/layout/main_empty_multi_pane.xml
diff --git a/calculatorpp/res/layout/math_entities_fragment.xml b/app-android/res/layout/math_entities_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/math_entities_fragment.xml
rename to app-android/res/layout/math_entities_fragment.xml
diff --git a/calculatorpp/res/layout/math_entity.xml b/app-android/res/layout/math_entity.xml
similarity index 100%
rename from calculatorpp/res/layout/math_entity.xml
rename to app-android/res/layout/math_entity.xml
diff --git a/calculatorpp/res/layout/notespp_announce.xml b/app-android/res/layout/notespp_announce.xml
similarity index 100%
rename from calculatorpp/res/layout/notespp_announce.xml
rename to app-android/res/layout/notespp_announce.xml
diff --git a/calculatorpp/res/layout/onscreen_display.xml b/app-android/res/layout/onscreen_display.xml
similarity index 100%
rename from calculatorpp/res/layout/onscreen_display.xml
rename to app-android/res/layout/onscreen_display.xml
diff --git a/calculatorpp/res/layout/onscreen_editor.xml b/app-android/res/layout/onscreen_editor.xml
similarity index 100%
rename from calculatorpp/res/layout/onscreen_editor.xml
rename to app-android/res/layout/onscreen_editor.xml
diff --git a/calculatorpp/res/layout/onscreen_footer.xml b/app-android/res/layout/onscreen_footer.xml
similarity index 100%
rename from calculatorpp/res/layout/onscreen_footer.xml
rename to app-android/res/layout/onscreen_footer.xml
diff --git a/calculatorpp/res/layout/onscreen_header.xml b/app-android/res/layout/onscreen_header.xml
similarity index 100%
rename from calculatorpp/res/layout/onscreen_header.xml
rename to app-android/res/layout/onscreen_header.xml
diff --git a/calculatorpp/res/layout/onscreen_keyboard.xml b/app-android/res/layout/onscreen_keyboard.xml
similarity index 100%
rename from calculatorpp/res/layout/onscreen_keyboard.xml
rename to app-android/res/layout/onscreen_keyboard.xml
diff --git a/calculatorpp/res/layout/onscreen_layout.xml b/app-android/res/layout/onscreen_layout.xml
similarity index 100%
rename from calculatorpp/res/layout/onscreen_layout.xml
rename to app-android/res/layout/onscreen_layout.xml
diff --git a/calculatorpp/res/layout/plot_fragment.xml b/app-android/res/layout/plot_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/plot_fragment.xml
rename to app-android/res/layout/plot_fragment.xml
diff --git a/calculatorpp/res/layout/release_notes_fragment.xml b/app-android/res/layout/release_notes_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/release_notes_fragment.xml
rename to app-android/res/layout/release_notes_fragment.xml
diff --git a/calculatorpp/res/layout/saved_history_item.xml b/app-android/res/layout/saved_history_item.xml
similarity index 100%
rename from calculatorpp/res/layout/saved_history_item.xml
rename to app-android/res/layout/saved_history_item.xml
diff --git a/calculatorpp/res/layout/tabs.xml b/app-android/res/layout/tabs.xml
similarity index 100%
rename from calculatorpp/res/layout/tabs.xml
rename to app-android/res/layout/tabs.xml
diff --git a/calculatorpp/res/layout/unit_converter.xml b/app-android/res/layout/unit_converter.xml
similarity index 100%
rename from calculatorpp/res/layout/unit_converter.xml
rename to app-android/res/layout/unit_converter.xml
diff --git a/calculatorpp/res/layout/var_edit.xml b/app-android/res/layout/var_edit.xml
similarity index 100%
rename from calculatorpp/res/layout/var_edit.xml
rename to app-android/res/layout/var_edit.xml
diff --git a/calculatorpp/res/layout/vars_fragment.xml b/app-android/res/layout/vars_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/vars_fragment.xml
rename to app-android/res/layout/vars_fragment.xml
diff --git a/calculatorpp/res/layout/widget_app_button.xml b/app-android/res/layout/widget_app_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_app_button.xml
rename to app-android/res/layout/widget_app_button.xml
diff --git a/calculatorpp/res/layout/widget_clear_button.xml b/app-android/res/layout/widget_clear_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_clear_button.xml
rename to app-android/res/layout/widget_clear_button.xml
diff --git a/calculatorpp/res/layout/widget_copy_button.xml b/app-android/res/layout/widget_copy_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_copy_button.xml
rename to app-android/res/layout/widget_copy_button.xml
diff --git a/calculatorpp/res/layout/widget_display.xml b/app-android/res/layout/widget_display.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_display.xml
rename to app-android/res/layout/widget_display.xml
diff --git a/calculatorpp/res/layout/widget_division_button.xml b/app-android/res/layout/widget_division_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_division_button.xml
rename to app-android/res/layout/widget_division_button.xml
diff --git a/calculatorpp/res/layout/widget_dot_button.xml b/app-android/res/layout/widget_dot_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_dot_button.xml
rename to app-android/res/layout/widget_dot_button.xml
diff --git a/calculatorpp/res/layout/widget_editor.xml b/app-android/res/layout/widget_editor.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_editor.xml
rename to app-android/res/layout/widget_editor.xml
diff --git a/calculatorpp/res/layout/widget_eight_digit_button.xml b/app-android/res/layout/widget_eight_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_eight_digit_button.xml
rename to app-android/res/layout/widget_eight_digit_button.xml
diff --git a/calculatorpp/res/layout/widget_equals_button.xml b/app-android/res/layout/widget_equals_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_equals_button.xml
rename to app-android/res/layout/widget_equals_button.xml
diff --git a/calculatorpp/res/layout/widget_erase_button.xml b/app-android/res/layout/widget_erase_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_erase_button.xml
rename to app-android/res/layout/widget_erase_button.xml
diff --git a/calculatorpp/res/layout/widget_five_digit_button.xml b/app-android/res/layout/widget_five_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_five_digit_button.xml
rename to app-android/res/layout/widget_five_digit_button.xml
diff --git a/calculatorpp/res/layout/widget_four_digit_button.xml b/app-android/res/layout/widget_four_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_four_digit_button.xml
rename to app-android/res/layout/widget_four_digit_button.xml
diff --git a/calculatorpp/res/layout/widget_functions_button.xml b/app-android/res/layout/widget_functions_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_functions_button.xml
rename to app-android/res/layout/widget_functions_button.xml
diff --git a/calculatorpp/res/layout/widget_history_button.xml b/app-android/res/layout/widget_history_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_history_button.xml
rename to app-android/res/layout/widget_history_button.xml
diff --git a/calculatorpp/res/layout/widget_keyboard.xml b/app-android/res/layout/widget_keyboard.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_keyboard.xml
rename to app-android/res/layout/widget_keyboard.xml
diff --git a/calculatorpp/res/layout/widget_layout.xml b/app-android/res/layout/widget_layout.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_layout.xml
rename to app-android/res/layout/widget_layout.xml
diff --git a/calculatorpp/res/layout/widget_left_button.xml b/app-android/res/layout/widget_left_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_left_button.xml
rename to app-android/res/layout/widget_left_button.xml
diff --git a/calculatorpp/res/layout/widget_like_button.xml b/app-android/res/layout/widget_like_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_like_button.xml
rename to app-android/res/layout/widget_like_button.xml
diff --git a/calculatorpp/res/layout/widget_multiplication_button.xml b/app-android/res/layout/widget_multiplication_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_multiplication_button.xml
rename to app-android/res/layout/widget_multiplication_button.xml
diff --git a/calculatorpp/res/layout/widget_nine_digit_button.xml b/app-android/res/layout/widget_nine_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_nine_digit_button.xml
rename to app-android/res/layout/widget_nine_digit_button.xml
diff --git a/calculatorpp/res/layout/widget_one_digit_button.xml b/app-android/res/layout/widget_one_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_one_digit_button.xml
rename to app-android/res/layout/widget_one_digit_button.xml
diff --git a/calculatorpp/res/layout/widget_paste_button.xml b/app-android/res/layout/widget_paste_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_paste_button.xml
rename to app-android/res/layout/widget_paste_button.xml
diff --git a/calculatorpp/res/layout/widget_percent_button.xml b/app-android/res/layout/widget_percent_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_percent_button.xml
rename to app-android/res/layout/widget_percent_button.xml
diff --git a/calculatorpp/res/layout/widget_plus_button.xml b/app-android/res/layout/widget_plus_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_plus_button.xml
rename to app-android/res/layout/widget_plus_button.xml
diff --git a/calculatorpp/res/layout/widget_power_button.xml b/app-android/res/layout/widget_power_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_power_button.xml
rename to app-android/res/layout/widget_power_button.xml
diff --git a/calculatorpp/res/layout/widget_right_button.xml b/app-android/res/layout/widget_right_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_right_button.xml
rename to app-android/res/layout/widget_right_button.xml
diff --git a/calculatorpp/res/layout/widget_round_brackets_button.xml b/app-android/res/layout/widget_round_brackets_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_round_brackets_button.xml
rename to app-android/res/layout/widget_round_brackets_button.xml
diff --git a/calculatorpp/res/layout/widget_settings_button.xml b/app-android/res/layout/widget_settings_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_settings_button.xml
rename to app-android/res/layout/widget_settings_button.xml
diff --git a/calculatorpp/res/layout/widget_seven_digit_button.xml b/app-android/res/layout/widget_seven_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_seven_digit_button.xml
rename to app-android/res/layout/widget_seven_digit_button.xml
diff --git a/calculatorpp/res/layout/widget_six_digit_button.xml b/app-android/res/layout/widget_six_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_six_digit_button.xml
rename to app-android/res/layout/widget_six_digit_button.xml
diff --git a/calculatorpp/res/layout/widget_subtraction_button.xml b/app-android/res/layout/widget_subtraction_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_subtraction_button.xml
rename to app-android/res/layout/widget_subtraction_button.xml
diff --git a/calculatorpp/res/layout/widget_three_digit_button.xml b/app-android/res/layout/widget_three_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_three_digit_button.xml
rename to app-android/res/layout/widget_three_digit_button.xml
diff --git a/calculatorpp/res/layout/widget_two_digit_button.xml b/app-android/res/layout/widget_two_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_two_digit_button.xml
rename to app-android/res/layout/widget_two_digit_button.xml
diff --git a/calculatorpp/res/layout/widget_vars_button.xml b/app-android/res/layout/widget_vars_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_vars_button.xml
rename to app-android/res/layout/widget_vars_button.xml
diff --git a/calculatorpp/res/layout/widget_zero_digit_button.xml b/app-android/res/layout/widget_zero_digit_button.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_zero_digit_button.xml
rename to app-android/res/layout/widget_zero_digit_button.xml
diff --git a/calculatorpp/res/menu/functions_menu.xml b/app-android/res/menu/functions_menu.xml
similarity index 100%
rename from calculatorpp/res/menu/functions_menu.xml
rename to app-android/res/menu/functions_menu.xml
diff --git a/calculatorpp/res/menu/history_menu.xml b/app-android/res/menu/history_menu.xml
similarity index 100%
rename from calculatorpp/res/menu/history_menu.xml
rename to app-android/res/menu/history_menu.xml
diff --git a/calculatorpp/res/menu/plot_menu.xml b/app-android/res/menu/plot_menu.xml
similarity index 100%
rename from calculatorpp/res/menu/plot_menu.xml
rename to app-android/res/menu/plot_menu.xml
diff --git a/calculatorpp/res/menu/vars_menu.xml b/app-android/res/menu/vars_menu.xml
similarity index 100%
rename from calculatorpp/res/menu/vars_menu.xml
rename to app-android/res/menu/vars_menu.xml
diff --git a/calculatorpp/res/values-es/text_about.xml b/app-android/res/values-es/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_about.xml
rename to app-android/res/values-es/text_about.xml
diff --git a/calculatorpp/res/values-es/text_functions.xml b/app-android/res/values-es/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_functions.xml
rename to app-android/res/values-es/text_functions.xml
diff --git a/calculatorpp/res/values-es/text_help.xml b/app-android/res/values-es/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_help.xml
rename to app-android/res/values-es/text_help.xml
diff --git a/calculatorpp/res/values-es/text_operators.xml b/app-android/res/values-es/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_operators.xml
rename to app-android/res/values-es/text_operators.xml
diff --git a/calculatorpp/res/values-es/text_strings.xml b/app-android/res/values-es/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_strings.xml
rename to app-android/res/values-es/text_strings.xml
diff --git a/calculatorpp/res/values-es/text_vars.xml b/app-android/res/values-es/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_vars.xml
rename to app-android/res/values-es/text_vars.xml
diff --git a/calculatorpp/res/values-it/text_about.xml b/app-android/res/values-it/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_about.xml
rename to app-android/res/values-it/text_about.xml
diff --git a/calculatorpp/res/values-it/text_functions.xml b/app-android/res/values-it/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_functions.xml
rename to app-android/res/values-it/text_functions.xml
diff --git a/calculatorpp/res/values-it/text_help.xml b/app-android/res/values-it/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_help.xml
rename to app-android/res/values-it/text_help.xml
diff --git a/calculatorpp/res/values-it/text_operators.xml b/app-android/res/values-it/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_operators.xml
rename to app-android/res/values-it/text_operators.xml
diff --git a/calculatorpp/res/values-it/text_strings.xml b/app-android/res/values-it/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_strings.xml
rename to app-android/res/values-it/text_strings.xml
diff --git a/calculatorpp/res/values-it/text_vars.xml b/app-android/res/values-it/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_vars.xml
rename to app-android/res/values-it/text_vars.xml
diff --git a/calculatorpp/res/values-large-hdpi/dimens.xml b/app-android/res/values-large-hdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-large-hdpi/dimens.xml
rename to app-android/res/values-large-hdpi/dimens.xml
diff --git a/calculatorpp/res/values-large-mdpi/dimens.xml b/app-android/res/values-large-mdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-large-mdpi/dimens.xml
rename to app-android/res/values-large-mdpi/dimens.xml
diff --git a/calculatorpp/res/values-large-tvdpi/dimens.xml b/app-android/res/values-large-tvdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-large-tvdpi/dimens.xml
rename to app-android/res/values-large-tvdpi/dimens.xml
diff --git a/calculatorpp/res/values-large/dimens.xml b/app-android/res/values-large/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-large/dimens.xml
rename to app-android/res/values-large/dimens.xml
diff --git a/calculatorpp/res/values-normal-hdpi/dimens.xml b/app-android/res/values-normal-hdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-normal-hdpi/dimens.xml
rename to app-android/res/values-normal-hdpi/dimens.xml
diff --git a/calculatorpp/res/values-normal-mdpi/dimens.xml b/app-android/res/values-normal-mdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-normal-mdpi/dimens.xml
rename to app-android/res/values-normal-mdpi/dimens.xml
diff --git a/calculatorpp/res/values-normal-tvdpi/dimens.xml b/app-android/res/values-normal-tvdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-normal-tvdpi/dimens.xml
rename to app-android/res/values-normal-tvdpi/dimens.xml
diff --git a/calculatorpp/res/values-normal-xhdpi/dimens.xml b/app-android/res/values-normal-xhdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-normal-xhdpi/dimens.xml
rename to app-android/res/values-normal-xhdpi/dimens.xml
diff --git a/calculatorpp/res/values-normal/dimens.xml b/app-android/res/values-normal/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-normal/dimens.xml
rename to app-android/res/values-normal/dimens.xml
diff --git a/calculatorpp/res/values-ru/text_about.xml b/app-android/res/values-ru/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_about.xml
rename to app-android/res/values-ru/text_about.xml
diff --git a/calculatorpp/res/values-ru/text_functions.xml b/app-android/res/values-ru/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_functions.xml
rename to app-android/res/values-ru/text_functions.xml
diff --git a/calculatorpp/res/values-ru/text_help.xml b/app-android/res/values-ru/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_help.xml
rename to app-android/res/values-ru/text_help.xml
diff --git a/calculatorpp/res/values-ru/text_operators.xml b/app-android/res/values-ru/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_operators.xml
rename to app-android/res/values-ru/text_operators.xml
diff --git a/calculatorpp/res/values-ru/text_preferences.xml b/app-android/res/values-ru/text_preferences.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_preferences.xml
rename to app-android/res/values-ru/text_preferences.xml
diff --git a/calculatorpp/res/values-ru/text_strings.xml b/app-android/res/values-ru/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_strings.xml
rename to app-android/res/values-ru/text_strings.xml
diff --git a/calculatorpp/res/values-ru/text_vars.xml b/app-android/res/values-ru/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_vars.xml
rename to app-android/res/values-ru/text_vars.xml
diff --git a/calculatorpp/res/values-small-hdpi/dimens.xml b/app-android/res/values-small-hdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-small-hdpi/dimens.xml
rename to app-android/res/values-small-hdpi/dimens.xml
diff --git a/calculatorpp/res/values-small-xhdpi/dimens.xml b/app-android/res/values-small-xhdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-small-xhdpi/dimens.xml
rename to app-android/res/values-small-xhdpi/dimens.xml
diff --git a/calculatorpp/res/values-small/dimens.xml b/app-android/res/values-small/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-small/dimens.xml
rename to app-android/res/values-small/dimens.xml
diff --git a/calculatorpp/res/values-uk/text_about.xml b/app-android/res/values-uk/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_about.xml
rename to app-android/res/values-uk/text_about.xml
diff --git a/calculatorpp/res/values-uk/text_functions.xml b/app-android/res/values-uk/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_functions.xml
rename to app-android/res/values-uk/text_functions.xml
diff --git a/calculatorpp/res/values-uk/text_help.xml b/app-android/res/values-uk/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_help.xml
rename to app-android/res/values-uk/text_help.xml
diff --git a/calculatorpp/res/values-uk/text_operators.xml b/app-android/res/values-uk/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_operators.xml
rename to app-android/res/values-uk/text_operators.xml
diff --git a/calculatorpp/res/values-uk/text_preferences.xml b/app-android/res/values-uk/text_preferences.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_preferences.xml
rename to app-android/res/values-uk/text_preferences.xml
diff --git a/calculatorpp/res/values-uk/text_strings.xml b/app-android/res/values-uk/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_strings.xml
rename to app-android/res/values-uk/text_strings.xml
diff --git a/calculatorpp/res/values-uk/text_vars.xml b/app-android/res/values-uk/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_vars.xml
rename to app-android/res/values-uk/text_vars.xml
diff --git a/calculatorpp/res/values-v14/dimens.xml b/app-android/res/values-v14/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-v14/dimens.xml
rename to app-android/res/values-v14/dimens.xml
diff --git a/calculatorpp/res/values-xlarge-hdpi/dimens.xml b/app-android/res/values-xlarge-hdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-xlarge-hdpi/dimens.xml
rename to app-android/res/values-xlarge-hdpi/dimens.xml
diff --git a/calculatorpp/res/values-xlarge-mdpi/dimens.xml b/app-android/res/values-xlarge-mdpi/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-xlarge-mdpi/dimens.xml
rename to app-android/res/values-xlarge-mdpi/dimens.xml
diff --git a/calculatorpp/res/values-xlarge/dimens.xml b/app-android/res/values-xlarge/dimens.xml
similarity index 100%
rename from calculatorpp/res/values-xlarge/dimens.xml
rename to app-android/res/values-xlarge/dimens.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_about.xml b/app-android/res/values-zh-rtw/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_about.xml
rename to app-android/res/values-zh-rtw/text_about.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_functions.xml b/app-android/res/values-zh-rtw/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_functions.xml
rename to app-android/res/values-zh-rtw/text_functions.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_help.xml b/app-android/res/values-zh-rtw/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_help.xml
rename to app-android/res/values-zh-rtw/text_help.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_operators.xml b/app-android/res/values-zh-rtw/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_operators.xml
rename to app-android/res/values-zh-rtw/text_operators.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_preferences.xml b/app-android/res/values-zh-rtw/text_preferences.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_preferences.xml
rename to app-android/res/values-zh-rtw/text_preferences.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_strings.xml b/app-android/res/values-zh-rtw/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_strings.xml
rename to app-android/res/values-zh-rtw/text_strings.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_vars.xml b/app-android/res/values-zh-rtw/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_vars.xml
rename to app-android/res/values-zh-rtw/text_vars.xml
diff --git a/calculatorpp/res/values/arrays.xml b/app-android/res/values/arrays.xml
similarity index 100%
rename from calculatorpp/res/values/arrays.xml
rename to app-android/res/values/arrays.xml
diff --git a/calculatorpp/res/values/attributes.xml b/app-android/res/values/attributes.xml
similarity index 100%
rename from calculatorpp/res/values/attributes.xml
rename to app-android/res/values/attributes.xml
diff --git a/calculatorpp/res/values/colors.xml b/app-android/res/values/colors.xml
similarity index 100%
rename from calculatorpp/res/values/colors.xml
rename to app-android/res/values/colors.xml
diff --git a/calculatorpp/res/values/dimens.xml b/app-android/res/values/dimens.xml
similarity index 100%
rename from calculatorpp/res/values/dimens.xml
rename to app-android/res/values/dimens.xml
diff --git a/calculatorpp/res/values/preferences.xml b/app-android/res/values/preferences.xml
similarity index 100%
rename from calculatorpp/res/values/preferences.xml
rename to app-android/res/values/preferences.xml
diff --git a/calculatorpp/res/values/styles.xml b/app-android/res/values/styles.xml
similarity index 100%
rename from calculatorpp/res/values/styles.xml
rename to app-android/res/values/styles.xml
diff --git a/calculatorpp/res/values/styles_history.xml b/app-android/res/values/styles_history.xml
similarity index 100%
rename from calculatorpp/res/values/styles_history.xml
rename to app-android/res/values/styles_history.xml
diff --git a/calculatorpp/res/values/styles_var.xml b/app-android/res/values/styles_var.xml
similarity index 100%
rename from calculatorpp/res/values/styles_var.xml
rename to app-android/res/values/styles_var.xml
diff --git a/calculatorpp/res/values/text_about.xml b/app-android/res/values/text_about.xml
similarity index 100%
rename from calculatorpp/res/values/text_about.xml
rename to app-android/res/values/text_about.xml
diff --git a/calculatorpp/res/values/text_functions.xml b/app-android/res/values/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values/text_functions.xml
rename to app-android/res/values/text_functions.xml
diff --git a/calculatorpp/res/values/text_help.xml b/app-android/res/values/text_help.xml
similarity index 100%
rename from calculatorpp/res/values/text_help.xml
rename to app-android/res/values/text_help.xml
diff --git a/calculatorpp/res/values/text_operators.xml b/app-android/res/values/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values/text_operators.xml
rename to app-android/res/values/text_operators.xml
diff --git a/calculatorpp/res/values/text_preferences.xml b/app-android/res/values/text_preferences.xml
similarity index 100%
rename from calculatorpp/res/values/text_preferences.xml
rename to app-android/res/values/text_preferences.xml
diff --git a/calculatorpp/res/values/text_strings.xml b/app-android/res/values/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values/text_strings.xml
rename to app-android/res/values/text_strings.xml
diff --git a/calculatorpp/res/values/text_vars.xml b/app-android/res/values/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values/text_vars.xml
rename to app-android/res/values/text_vars.xml
diff --git a/calculatorpp/res/values/theme_gray.xml b/app-android/res/values/theme_gray.xml
similarity index 100%
rename from calculatorpp/res/values/theme_gray.xml
rename to app-android/res/values/theme_gray.xml
diff --git a/calculatorpp/res/values/theme_light_blue.xml b/app-android/res/values/theme_light_blue.xml
similarity index 100%
rename from calculatorpp/res/values/theme_light_blue.xml
rename to app-android/res/values/theme_light_blue.xml
diff --git a/calculatorpp/res/values/theme_metro_blue.xml b/app-android/res/values/theme_metro_blue.xml
similarity index 100%
rename from calculatorpp/res/values/theme_metro_blue.xml
rename to app-android/res/values/theme_metro_blue.xml
diff --git a/calculatorpp/res/values/theme_metro_green.xml b/app-android/res/values/theme_metro_green.xml
similarity index 100%
rename from calculatorpp/res/values/theme_metro_green.xml
rename to app-android/res/values/theme_metro_green.xml
diff --git a/calculatorpp/res/values/theme_metro_purple.xml b/app-android/res/values/theme_metro_purple.xml
similarity index 100%
rename from calculatorpp/res/values/theme_metro_purple.xml
rename to app-android/res/values/theme_metro_purple.xml
diff --git a/calculatorpp/res/values/theme_violet.xml b/app-android/res/values/theme_violet.xml
similarity index 100%
rename from calculatorpp/res/values/theme_violet.xml
rename to app-android/res/values/theme_violet.xml
diff --git a/calculatorpp/res/xml/calculator_widget_info_3x3.xml b/app-android/res/xml/calculator_widget_info_3x3.xml
similarity index 100%
rename from calculatorpp/res/xml/calculator_widget_info_3x3.xml
rename to app-android/res/xml/calculator_widget_info_3x3.xml
diff --git a/calculatorpp/res/xml/calculator_widget_info_3x4.xml b/app-android/res/xml/calculator_widget_info_3x4.xml
similarity index 100%
rename from calculatorpp/res/xml/calculator_widget_info_3x4.xml
rename to app-android/res/xml/calculator_widget_info_3x4.xml
diff --git a/calculatorpp/res/xml/calculator_widget_info_4x4.xml b/app-android/res/xml/calculator_widget_info_4x4.xml
similarity index 100%
rename from calculatorpp/res/xml/calculator_widget_info_4x4.xml
rename to app-android/res/xml/calculator_widget_info_4x4.xml
diff --git a/calculatorpp/res/xml/calculator_widget_info_4x5.xml b/app-android/res/xml/calculator_widget_info_4x5.xml
similarity index 100%
rename from calculatorpp/res/xml/calculator_widget_info_4x5.xml
rename to app-android/res/xml/calculator_widget_info_4x5.xml
diff --git a/calculatorpp/res/xml/preferences.xml b/app-android/res/xml/preferences.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences.xml
rename to app-android/res/xml/preferences.xml
diff --git a/calculatorpp/res/xml/preferences_appearance.xml b/app-android/res/xml/preferences_appearance.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_appearance.xml
rename to app-android/res/xml/preferences_appearance.xml
diff --git a/calculatorpp/res/xml/preferences_calculations.xml b/app-android/res/xml/preferences_calculations.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_calculations.xml
rename to app-android/res/xml/preferences_calculations.xml
diff --git a/calculatorpp/res/xml/preferences_onscreen.xml b/app-android/res/xml/preferences_onscreen.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_onscreen.xml
rename to app-android/res/xml/preferences_onscreen.xml
diff --git a/calculatorpp/res/xml/preferences_other.xml b/app-android/res/xml/preferences_other.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_other.xml
rename to app-android/res/xml/preferences_other.xml
diff --git a/calculatorpp/res/xml/preferences_plot.xml b/app-android/res/xml/preferences_plot.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_plot.xml
rename to app-android/res/xml/preferences_plot.xml
diff --git a/calculatorpp/src/main/java/org/solovyev/android/AndroidUtils2.java b/app-android/src/main/java/org/solovyev/android/AndroidUtils2.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/AndroidUtils2.java
rename to app-android/src/main/java/org/solovyev/android/AndroidUtils2.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java b/app-android/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorClipboard.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorClipboard.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorClipboard.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorClipboard.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorEditorView.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorKeyboard.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorKeyboard.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorKeyboard.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorKeyboard.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorNotifier.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorNotifier.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorNotifier.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorNotifier.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidFunctionCategory.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidFunctionCategory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidFunctionCategory.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidFunctionCategory.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidOperatorCategory.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidOperatorCategory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidOperatorCategory.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidOperatorCategory.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidVarCategory.java b/app-android/src/main/java/org/solovyev/android/calculator/AndroidVarCategory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidVarCategory.java
rename to app-android/src/main/java/org/solovyev/android/calculator/AndroidVarCategory.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityMobile.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivityMobile.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityMobile.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorActivityMobile.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayMenuItem.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorDisplayMenuItem.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayMenuItem.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorDisplayMenuItem.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayOnClickListener.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorDisplayOnClickListener.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayOnClickListener.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorDisplayOnClickListener.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFixableMessage.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorFixableMessage.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFixableMessage.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorFixableMessage.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorFragmentActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorFragmentActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelper.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelper.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelper.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelper.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorOnscreenStartActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorOnscreenStartActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorOnscreenStartActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorOnscreenStartActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java b/app-android/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java b/app-android/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/ConversionMenuItem.java b/app-android/src/main/java/org/solovyev/android/calculator/ConversionMenuItem.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/ConversionMenuItem.java
rename to app-android/src/main/java/org/solovyev/android/calculator/ConversionMenuItem.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java b/app-android/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
rename to app-android/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java b/app-android/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
rename to app-android/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java b/app-android/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
rename to app-android/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java b/app-android/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java
rename to app-android/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/ParcelableCalculatorDisplayViewState.java b/app-android/src/main/java/org/solovyev/android/calculator/ParcelableCalculatorDisplayViewState.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/ParcelableCalculatorDisplayViewState.java
rename to app-android/src/main/java/org/solovyev/android/calculator/ParcelableCalculatorDisplayViewState.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/ParcelableCalculatorEditorViewState.java b/app-android/src/main/java/org/solovyev/android/calculator/ParcelableCalculatorEditorViewState.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/ParcelableCalculatorEditorViewState.java
rename to app-android/src/main/java/org/solovyev/android/calculator/ParcelableCalculatorEditorViewState.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java b/app-android/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
rename to app-android/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/TextHelper.java b/app-android/src/main/java/org/solovyev/android/calculator/about/TextHelper.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/TextHelper.java
rename to app-android/src/main/java/org/solovyev/android/calculator/about/TextHelper.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/external/AndroidExternalListenersContainer.java b/app-android/src/main/java/org/solovyev/android/calculator/external/AndroidExternalListenersContainer.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/external/AndroidExternalListenersContainer.java
rename to app-android/src/main/java/org/solovyev/android/calculator/external/AndroidExternalListenersContainer.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/external/DefaultExternalCalculatorIntentHandler.java b/app-android/src/main/java/org/solovyev/android/calculator/external/DefaultExternalCalculatorIntentHandler.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/external/DefaultExternalCalculatorIntentHandler.java
rename to app-android/src/main/java/org/solovyev/android/calculator/external/DefaultExternalCalculatorIntentHandler.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorIntentHandler.java b/app-android/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorIntentHandler.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorIntentHandler.java
rename to app-android/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorIntentHandler.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorStateUpdater.java b/app-android/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorStateUpdater.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorStateUpdater.java
rename to app-android/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorStateUpdater.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionEditorSaver.java b/app-android/src/main/java/org/solovyev/android/calculator/function/FunctionEditorSaver.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionEditorSaver.java
rename to app-android/src/main/java/org/solovyev/android/calculator/function/FunctionEditorSaver.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionParamEditText.java b/app-android/src/main/java/org/solovyev/android/calculator/function/FunctionParamEditText.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionParamEditText.java
rename to app-android/src/main/java/org/solovyev/android/calculator/function/FunctionParamEditText.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java b/app-android/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java
rename to app-android/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpFaqFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpFaqFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpFaqFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpFaqFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpHintsFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpHintsFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpHintsFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpHintsFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpScreensFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpScreensFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpScreensFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpScreensFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/AndroidCalculatorHistory.java b/app-android/src/main/java/org/solovyev/android/calculator/history/AndroidCalculatorHistory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/AndroidCalculatorHistory.java
rename to app-android/src/main/java/org/solovyev/android/calculator/history/AndroidCalculatorHistory.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorSavedHistoryFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/history/CalculatorSavedHistoryFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorSavedHistoryFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/history/CalculatorSavedHistoryFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java b/app-android/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
rename to app-android/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java b/app-android/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java
rename to app-android/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java b/app-android/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
rename to app-android/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java b/app-android/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java
rename to app-android/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java b/app-android/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
rename to app-android/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java b/app-android/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java
rename to app-android/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidMathEntityDao.java b/app-android/src/main/java/org/solovyev/android/calculator/model/AndroidMathEntityDao.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidMathEntityDao.java
rename to app-android/src/main/java/org/solovyev/android/calculator/model/AndroidMathEntityDao.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/Messages.java b/app-android/src/main/java/org/solovyev/android/calculator/model/Messages.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/model/Messages.java
rename to app-android/src/main/java/org/solovyev/android/calculator/model/Messages.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenBroadcastReceiver.java b/app-android/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenBroadcastReceiver.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenBroadcastReceiver.java
rename to app-android/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenBroadcastReceiver.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java b/app-android/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
rename to app-android/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java b/app-android/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
rename to app-android/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenViewDef.java b/app-android/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenViewDef.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenViewDef.java
rename to app-android/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenViewDef.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/OnscreenViewListener.java b/app-android/src/main/java/org/solovyev/android/calculator/onscreen/OnscreenViewListener.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/OnscreenViewListener.java
rename to app-android/src/main/java/org/solovyev/android/calculator/onscreen/OnscreenViewListener.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java b/app-android/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
rename to app-android/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotPreferenceActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotPreferenceActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotPreferenceActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotPreferenceActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/GraphLineColor.java b/app-android/src/main/java/org/solovyev/android/calculator/plot/GraphLineColor.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/GraphLineColor.java
rename to app-android/src/main/java/org/solovyev/android/calculator/plot/GraphLineColor.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java b/app-android/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java
rename to app-android/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java b/app-android/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
rename to app-android/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java b/app-android/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
rename to app-android/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/CalculatorAdditionalTitle.java b/app-android/src/main/java/org/solovyev/android/calculator/view/CalculatorAdditionalTitle.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/view/CalculatorAdditionalTitle.java
rename to app-android/src/main/java/org/solovyev/android/calculator/view/CalculatorAdditionalTitle.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java b/app-android/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java
rename to app-android/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java b/app-android/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
rename to app-android/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/OnDragListenerVibrator.java b/app-android/src/main/java/org/solovyev/android/calculator/view/OnDragListenerVibrator.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/view/OnDragListenerVibrator.java
rename to app-android/src/main/java/org/solovyev/android/calculator/view/OnDragListenerVibrator.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java b/app-android/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java
rename to app-android/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java b/app-android/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java
rename to app-android/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java b/app-android/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
rename to app-android/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetConfigurationActivity.java b/app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetConfigurationActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetConfigurationActivity.java
rename to app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetConfigurationActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java b/app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java
rename to app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java b/app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
rename to app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java b/app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java
rename to app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java b/app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java
rename to app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java b/app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java
rename to app-android/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java b/app-android/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java
rename to app-android/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/fragments/FragmentUtils.java b/app-android/src/main/java/org/solovyev/android/fragments/FragmentUtils.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/fragments/FragmentUtils.java
rename to app-android/src/main/java/org/solovyev/android/fragments/FragmentUtils.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java b/app-android/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java
rename to app-android/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java b/app-android/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java
rename to app-android/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java b/app-android/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
rename to app-android/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorppTestRunner.java b/app-android/src/test/java/org/solovyev/android/calculator/CalculatorppTestRunner.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorppTestRunner.java
rename to app-android/src/test/java/org/solovyev/android/calculator/CalculatorppTestRunner.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java b/app-android/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
rename to app-android/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java b/app-android/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
rename to app-android/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/model/VarTest.java b/app-android/src/test/java/org/solovyev/android/calculator/model/VarTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/model/VarTest.java
rename to app-android/src/test/java/org/solovyev/android/calculator/model/VarTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java b/app-android/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java
rename to app-android/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java b/app-android/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
rename to app-android/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java b/app-android/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
rename to app-android/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
diff --git a/calculatorpp-core/pom.xml b/core/pom.xml
similarity index 100%
rename from calculatorpp-core/pom.xml
rename to core/pom.xml
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java b/core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractNumberBuilder.java b/core/src/main/java/org/solovyev/android/calculator/AbstractNumberBuilder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractNumberBuilder.java
rename to core/src/main/java/org/solovyev/android/calculator/AbstractNumberBuilder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/Calculator.java b/core/src/main/java/org/solovyev/android/calculator/Calculator.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/Calculator.java
rename to core/src/main/java/org/solovyev/android/calculator/Calculator.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorButtonActions.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorButtonActions.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorButtonActions.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorButtonActions.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorClipboard.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorClipboard.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorClipboard.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorClipboard.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayView.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayView.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayView.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayView.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewState.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewState.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorView.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorView.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorView.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorView.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewState.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewState.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewStateImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewStateImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewStateImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewStateImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngine.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEngine.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngine.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEngine.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvalException.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEvalException.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvalException.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEvalException.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventContainer.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventContainer.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventHolder.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventHolder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventHolder.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventHolder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventListener.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventListener.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventListener.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventListener.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFailure.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorFailure.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFailure.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorFailure.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFailureImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorFailureImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFailureImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorFailureImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFixableError.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorFixableError.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFixableError.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorFixableError.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFunctionsMathRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorFunctionsMathRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFunctionsMathRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorFunctionsMathRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorInput.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorInput.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorInput.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorInput.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorInputImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorInputImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorInputImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorInputImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboard.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboard.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboard.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboard.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMathEngine.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorMathEngine.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMathEngine.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorMathEngine.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMathRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorMathRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMathRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorMathRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMessage.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorMessage.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMessage.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorMessage.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMessages.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorMessages.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMessages.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorMessages.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorNotifier.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorNotifier.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorNotifier.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorNotifier.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutput.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorOutput.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutput.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorOutput.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutputImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorOutputImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutputImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorOutputImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferenceService.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorPreferenceService.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferenceService.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorPreferenceService.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorUtils.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorUtils.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorUtils.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorUtils.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/Change.java b/core/src/main/java/org/solovyev/android/calculator/Change.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/Change.java
rename to core/src/main/java/org/solovyev/android/calculator/Change.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ChangeImpl.java b/core/src/main/java/org/solovyev/android/calculator/ChangeImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ChangeImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/ChangeImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ConversionFailure.java b/core/src/main/java/org/solovyev/android/calculator/ConversionFailure.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ConversionFailure.java
rename to core/src/main/java/org/solovyev/android/calculator/ConversionFailure.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ConversionFailureImpl.java b/core/src/main/java/org/solovyev/android/calculator/ConversionFailureImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ConversionFailureImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/ConversionFailureImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/DummyCalculatorClipboard.java b/core/src/main/java/org/solovyev/android/calculator/DummyCalculatorClipboard.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/DummyCalculatorClipboard.java
rename to core/src/main/java/org/solovyev/android/calculator/DummyCalculatorClipboard.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/DummyCalculatorNotifier.java b/core/src/main/java/org/solovyev/android/calculator/DummyCalculatorNotifier.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/DummyCalculatorNotifier.java
rename to core/src/main/java/org/solovyev/android/calculator/DummyCalculatorNotifier.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/Editor.java b/core/src/main/java/org/solovyev/android/calculator/Editor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/Editor.java
rename to core/src/main/java/org/solovyev/android/calculator/Editor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/FunctionCategory.java b/core/src/main/java/org/solovyev/android/calculator/FunctionCategory.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/FunctionCategory.java
rename to core/src/main/java/org/solovyev/android/calculator/FunctionCategory.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ListCalculatorEventContainer.java b/core/src/main/java/org/solovyev/android/calculator/ListCalculatorEventContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ListCalculatorEventContainer.java
rename to core/src/main/java/org/solovyev/android/calculator/ListCalculatorEventContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/LiteNumberBuilder.java b/core/src/main/java/org/solovyev/android/calculator/LiteNumberBuilder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/LiteNumberBuilder.java
rename to core/src/main/java/org/solovyev/android/calculator/LiteNumberBuilder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/Locator.java b/core/src/main/java/org/solovyev/android/calculator/Locator.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/Locator.java
rename to core/src/main/java/org/solovyev/android/calculator/Locator.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathEntityDao.java b/core/src/main/java/org/solovyev/android/calculator/MathEntityDao.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathEntityDao.java
rename to core/src/main/java/org/solovyev/android/calculator/MathEntityDao.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathEntityPersistenceContainer.java b/core/src/main/java/org/solovyev/android/calculator/MathEntityPersistenceContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathEntityPersistenceContainer.java
rename to core/src/main/java/org/solovyev/android/calculator/MathEntityPersistenceContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathPersistenceEntity.java b/core/src/main/java/org/solovyev/android/calculator/MathPersistenceEntity.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathPersistenceEntity.java
rename to core/src/main/java/org/solovyev/android/calculator/MathPersistenceEntity.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/NumberBuilder.java b/core/src/main/java/org/solovyev/android/calculator/NumberBuilder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/NumberBuilder.java
rename to core/src/main/java/org/solovyev/android/calculator/NumberBuilder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java b/core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java
rename to core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/PreparedExpression.java b/core/src/main/java/org/solovyev/android/calculator/PreparedExpression.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/PreparedExpression.java
rename to core/src/main/java/org/solovyev/android/calculator/PreparedExpression.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java b/core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java
rename to core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ToJsclTextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/ToJsclTextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ToJsclTextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/ToJsclTextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/VarCategory.java b/core/src/main/java/org/solovyev/android/calculator/VarCategory.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/VarCategory.java
rename to core/src/main/java/org/solovyev/android/calculator/VarCategory.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/external/CalculatorExternalListenersContainer.java b/core/src/main/java/org/solovyev/android/calculator/external/CalculatorExternalListenersContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/external/CalculatorExternalListenersContainer.java
rename to core/src/main/java/org/solovyev/android/calculator/external/CalculatorExternalListenersContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java b/core/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java
rename to core/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java b/core/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java
rename to core/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java b/core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
rename to core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryImpl.java b/core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java b/core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java
rename to core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java b/core/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java
rename to core/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/History.java b/core/src/main/java/org/solovyev/android/calculator/history/History.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/History.java
rename to core/src/main/java/org/solovyev/android/calculator/history/History.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java b/core/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java
rename to core/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java b/core/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
rename to core/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/math/MathType.java b/core/src/main/java/org/solovyev/android/calculator/math/MathType.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/math/MathType.java
rename to core/src/main/java/org/solovyev/android/calculator/math/MathType.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/AFunction.java b/core/src/main/java/org/solovyev/android/calculator/model/AFunction.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/AFunction.java
rename to core/src/main/java/org/solovyev/android/calculator/model/AFunction.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Functions.java b/core/src/main/java/org/solovyev/android/calculator/model/Functions.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Functions.java
rename to core/src/main/java/org/solovyev/android/calculator/model/Functions.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java b/core/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
rename to core/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Var.java b/core/src/main/java/org/solovyev/android/calculator/model/Var.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Var.java
rename to core/src/main/java/org/solovyev/android/calculator/model/Var.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Vars.java b/core/src/main/java/org/solovyev/android/calculator/model/Vars.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Vars.java
rename to core/src/main/java/org/solovyev/android/calculator/model/Vars.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/DummyTextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/text/DummyTextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/DummyTextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/text/DummyTextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/FromJsclSimplifyTextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/text/FromJsclSimplifyTextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/FromJsclSimplifyTextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/text/FromJsclSimplifyTextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/TextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/text/TextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/TextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/text/TextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/units/CalculatorNumeralBase.java b/core/src/main/java/org/solovyev/android/calculator/units/CalculatorNumeralBase.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/units/CalculatorNumeralBase.java
rename to core/src/main/java/org/solovyev/android/calculator/units/CalculatorNumeralBase.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/common/utils/ListListenersContainer.java b/core/src/main/java/org/solovyev/common/utils/ListListenersContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/common/utils/ListListenersContainer.java
rename to core/src/main/java/org/solovyev/common/utils/ListListenersContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/ConversionException.java b/core/src/main/java/org/solovyev/math/units/ConversionException.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/ConversionException.java
rename to core/src/main/java/org/solovyev/math/units/ConversionException.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/ConversionUtils.java b/core/src/main/java/org/solovyev/math/units/ConversionUtils.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/ConversionUtils.java
rename to core/src/main/java/org/solovyev/math/units/ConversionUtils.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/Unit.java b/core/src/main/java/org/solovyev/math/units/Unit.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/Unit.java
rename to core/src/main/java/org/solovyev/math/units/Unit.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/UnitConverter.java b/core/src/main/java/org/solovyev/math/units/UnitConverter.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/UnitConverter.java
rename to core/src/main/java/org/solovyev/math/units/UnitConverter.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/UnitImpl.java b/core/src/main/java/org/solovyev/math/units/UnitImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/UnitImpl.java
rename to core/src/main/java/org/solovyev/math/units/UnitImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/UnitType.java b/core/src/main/java/org/solovyev/math/units/UnitType.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/UnitType.java
rename to core/src/main/java/org/solovyev/math/units/UnitType.java
diff --git a/calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages.properties b/core/src/main/resources/org/solovyev/android/calculator/messages.properties
similarity index 100%
rename from calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages.properties
rename to core/src/main/resources/org/solovyev/android/calculator/messages.properties
diff --git a/calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties
similarity index 100%
rename from calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties
rename to core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties
diff --git a/calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
similarity index 100%
rename from calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
rename to core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
diff --git a/calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_zh.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_zh.properties
similarity index 100%
rename from calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_zh.properties
rename to core/src/main/resources/org/solovyev/android/calculator/messages_zh.properties
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java b/core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java
rename to core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImplTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorEditorImplTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorEditorImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorEditorImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorEditorImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorEditorViewStateImplTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorEditorViewStateImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorEditorViewStateImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorEditorViewStateImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorImplTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/FromJsclSimplifyTextProcessorTest.java b/core/src/test/java/org/solovyev/android/calculator/FromJsclSimplifyTextProcessorTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/FromJsclSimplifyTextProcessorTest.java
rename to core/src/test/java/org/solovyev/android/calculator/FromJsclSimplifyTextProcessorTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java b/core/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java b/core/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java
rename to core/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java b/core/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
rename to core/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/AndroidCalculatorEngineTest.java b/core/src/test/java/org/solovyev/android/calculator/model/AndroidCalculatorEngineTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/AndroidCalculatorEngineTest.java
rename to core/src/test/java/org/solovyev/android/calculator/model/AndroidCalculatorEngineTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java b/core/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java
rename to core/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java b/core/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
rename to core/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java b/core/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
rename to core/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
diff --git a/calculatorpp-core/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv b/core/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv
similarity index 100%
rename from calculatorpp-core/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv
rename to core/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv
diff --git a/pom.xml b/pom.xml
index 7a3d5cf8..6b531925 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,9 @@
     </scm>
 
     <modules>
-        <module>calculatorpp</module>
-        <module>calculatorpp-test</module>
-        <module>calculatorpp-core</module>
+        <module>app-android</module>
+        <module>app-android-test</module>
+        <module>core</module>
     </modules>
 
     <properties>