diff --git a/calculatorpp-service/pom.xml b/calculatorpp-service/pom.xml
index ff0be12d..236f1951 100644
--- a/calculatorpp-service/pom.xml
+++ b/calculatorpp-service/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.solovyev.android</groupId>
         <artifactId>calculatorpp-parent</artifactId>
-        <version>1.2.34</version>
+        <version>1.3.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -15,6 +15,7 @@
     <artifactId>calculatorpp-service</artifactId>
     <version>0.1</version>
     <packaging>apklib</packaging>
+    <name>Calculator++ Service</name>
 
     <dependencies>
 
diff --git a/calculatorpp-test/pom.xml b/calculatorpp-test/pom.xml
index 7d8c8815..b28bdfe3 100644
--- a/calculatorpp-test/pom.xml
+++ b/calculatorpp-test/pom.xml
@@ -6,13 +6,14 @@
     <parent>
         <groupId>org.solovyev.android</groupId>
         <artifactId>calculatorpp-parent</artifactId>
-        <version>1.2.34</version>
+        <version>1.3.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.solovyev.android</groupId>
     <artifactId>calculatorpp-test</artifactId>
+    <name>Calculator++ Application (Test)</name>
 
 
 
diff --git a/calculatorpp/AndroidManifest.xml b/calculatorpp/AndroidManifest.xml
index 5ef95790..d4c1b468 100644
--- a/calculatorpp/AndroidManifest.xml
+++ b/calculatorpp/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="81" android:versionName="1.2.34" package="org.solovyev.android.calculator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="81" android:versionName="1.3.1" package="org.solovyev.android.calculator">
 
 	<uses-permission android:name="android.permission.VIBRATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
@@ -8,7 +8,7 @@
 
 	<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">
+	<application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication">
 
 		<activity android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
 
diff --git a/calculatorpp/src/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip b/calculatorpp/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
similarity index 100%
rename from calculatorpp/src/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
rename to calculatorpp/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
diff --git a/calculatorpp/src/misc/doc/achartengine-0.7.0-javadocs.zip b/calculatorpp/misc/doc/achartengine-0.7.0-javadocs.zip
similarity index 100%
rename from calculatorpp/src/misc/doc/achartengine-0.7.0-javadocs.zip
rename to calculatorpp/misc/doc/achartengine-0.7.0-javadocs.zip
diff --git a/calculatorpp/src/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar b/calculatorpp/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
similarity index 100%
rename from calculatorpp/src/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
rename to calculatorpp/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
diff --git a/calculatorpp/src/misc/lib/achartengine-0.7.0.jar b/calculatorpp/misc/lib/achartengine-0.7.0.jar
similarity index 100%
rename from calculatorpp/src/misc/lib/achartengine-0.7.0.jar
rename to calculatorpp/misc/lib/achartengine-0.7.0.jar
diff --git a/calculatorpp/src/misc/res/calculatorpp/01_main_screen_port.png b/calculatorpp/misc/res/calculatorpp/01_main_screen_port.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/01_main_screen_port.png
rename to calculatorpp/misc/res/calculatorpp/01_main_screen_port.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/01_main_screen_port_sm.png b/calculatorpp/misc/res/calculatorpp/01_main_screen_port_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/01_main_screen_port_sm.png
rename to calculatorpp/misc/res/calculatorpp/01_main_screen_port_sm.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/02_main_screen_land.png b/calculatorpp/misc/res/calculatorpp/02_main_screen_land.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/02_main_screen_land.png
rename to calculatorpp/misc/res/calculatorpp/02_main_screen_land.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/03_main_screen_port_with_expression.png b/calculatorpp/misc/res/calculatorpp/03_main_screen_port_with_expression.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/03_main_screen_port_with_expression.png
rename to calculatorpp/misc/res/calculatorpp/03_main_screen_port_with_expression.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/04_plot_graph_menu.png b/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/04_plot_graph_menu.png
rename to calculatorpp/misc/res/calculatorpp/04_plot_graph_menu.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/04_plot_graph_menu_sm.png b/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/04_plot_graph_menu_sm.png
rename to calculatorpp/misc/res/calculatorpp/04_plot_graph_menu_sm.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/05_graph_screen.png b/calculatorpp/misc/res/calculatorpp/05_graph_screen.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/05_graph_screen.png
rename to calculatorpp/misc/res/calculatorpp/05_graph_screen.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/05_graph_screen_sm.png b/calculatorpp/misc/res/calculatorpp/05_graph_screen_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/05_graph_screen_sm.png
rename to calculatorpp/misc/res/calculatorpp/05_graph_screen_sm.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/06_constants_screen.png b/calculatorpp/misc/res/calculatorpp/06_constants_screen.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/06_constants_screen.png
rename to calculatorpp/misc/res/calculatorpp/06_constants_screen.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/06_constants_screen_sm.png b/calculatorpp/misc/res/calculatorpp/06_constants_screen_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/06_constants_screen_sm.png
rename to calculatorpp/misc/res/calculatorpp/06_constants_screen_sm.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/07_constant_create_dialog.png b/calculatorpp/misc/res/calculatorpp/07_constant_create_dialog.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/07_constant_create_dialog.png
rename to calculatorpp/misc/res/calculatorpp/07_constant_create_dialog.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/08_constants_context_menu.png b/calculatorpp/misc/res/calculatorpp/08_constants_context_menu.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/08_constants_context_menu.png
rename to calculatorpp/misc/res/calculatorpp/08_constants_context_menu.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/09_functions_screen.png b/calculatorpp/misc/res/calculatorpp/09_functions_screen.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/09_functions_screen.png
rename to calculatorpp/misc/res/calculatorpp/09_functions_screen.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/09_functions_screen_sm.png b/calculatorpp/misc/res/calculatorpp/09_functions_screen_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/09_functions_screen_sm.png
rename to calculatorpp/misc/res/calculatorpp/09_functions_screen_sm.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/10_history_screen.png b/calculatorpp/misc/res/calculatorpp/10_history_screen.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/10_history_screen.png
rename to calculatorpp/misc/res/calculatorpp/10_history_screen.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/10_history_screen_sm.png b/calculatorpp/misc/res/calculatorpp/10_history_screen_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/10_history_screen_sm.png
rename to calculatorpp/misc/res/calculatorpp/10_history_screen_sm.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/11_history_item_context_menu.png b/calculatorpp/misc/res/calculatorpp/11_history_item_context_menu.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/11_history_item_context_menu.png
rename to calculatorpp/misc/res/calculatorpp/11_history_item_context_menu.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/12_saved_history_tab.png b/calculatorpp/misc/res/calculatorpp/12_saved_history_tab.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/12_saved_history_tab.png
rename to calculatorpp/misc/res/calculatorpp/12_saved_history_tab.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/13_saved_history_item_context_menu.png b/calculatorpp/misc/res/calculatorpp/13_saved_history_item_context_menu.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/13_saved_history_item_context_menu.png
rename to calculatorpp/misc/res/calculatorpp/13_saved_history_item_context_menu.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/14_about_screen.png b/calculatorpp/misc/res/calculatorpp/14_about_screen.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/14_about_screen.png
rename to calculatorpp/misc/res/calculatorpp/14_about_screen.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/14_about_screen_sm.png b/calculatorpp/misc/res/calculatorpp/14_about_screen_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/14_about_screen_sm.png
rename to calculatorpp/misc/res/calculatorpp/14_about_screen_sm.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/15_release_notes_tab.png b/calculatorpp/misc/res/calculatorpp/15_release_notes_tab.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/15_release_notes_tab.png
rename to calculatorpp/misc/res/calculatorpp/15_release_notes_tab.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/16_help_screen.png b/calculatorpp/misc/res/calculatorpp/16_help_screen.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/16_help_screen.png
rename to calculatorpp/misc/res/calculatorpp/16_help_screen.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/16_help_screen_sm.png b/calculatorpp/misc/res/calculatorpp/16_help_screen_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/16_help_screen_sm.png
rename to calculatorpp/misc/res/calculatorpp/16_help_screen_sm.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/17_hints_tab.png b/calculatorpp/misc/res/calculatorpp/17_hints_tab.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/17_hints_tab.png
rename to calculatorpp/misc/res/calculatorpp/17_hints_tab.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/18_preferences.png b/calculatorpp/misc/res/calculatorpp/18_preferences.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/18_preferences.png
rename to calculatorpp/misc/res/calculatorpp/18_preferences.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/18_preferences_02.png b/calculatorpp/misc/res/calculatorpp/18_preferences_02.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/18_preferences_02.png
rename to calculatorpp/misc/res/calculatorpp/18_preferences_02.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/18_preferences_03.png b/calculatorpp/misc/res/calculatorpp/18_preferences_03.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/18_preferences_03.png
rename to calculatorpp/misc/res/calculatorpp/18_preferences_03.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/18_preferences_sm.png b/calculatorpp/misc/res/calculatorpp/18_preferences_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/18_preferences_sm.png
rename to calculatorpp/misc/res/calculatorpp/18_preferences_sm.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/plan.png b/calculatorpp/misc/res/calculatorpp/plan.png
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/plan.png
rename to calculatorpp/misc/res/calculatorpp/plan.png
diff --git a/calculatorpp/src/misc/res/calculatorpp/plan.xcf b/calculatorpp/misc/res/calculatorpp/plan.xcf
similarity index 100%
rename from calculatorpp/src/misc/res/calculatorpp/plan.xcf
rename to calculatorpp/misc/res/calculatorpp/plan.xcf
diff --git a/calculatorpp/src/misc/res/icon-hi-res.png b/calculatorpp/misc/res/icon-hi-res.png
similarity index 100%
rename from calculatorpp/src/misc/res/icon-hi-res.png
rename to calculatorpp/misc/res/icon-hi-res.png
diff --git a/calculatorpp/src/misc/res/icon-promo.png b/calculatorpp/misc/res/icon-promo.png
similarity index 100%
rename from calculatorpp/src/misc/res/icon-promo.png
rename to calculatorpp/misc/res/icon-promo.png
diff --git a/calculatorpp/src/misc/res/icon.png b/calculatorpp/misc/res/icon.png
similarity index 100%
rename from calculatorpp/src/misc/res/icon.png
rename to calculatorpp/misc/res/icon.png
diff --git a/calculatorpp/src/misc/res/logo-scaled.png b/calculatorpp/misc/res/logo-scaled.png
similarity index 100%
rename from calculatorpp/src/misc/res/logo-scaled.png
rename to calculatorpp/misc/res/logo-scaled.png
diff --git a/calculatorpp/src/misc/res/logo.cdr b/calculatorpp/misc/res/logo.cdr
similarity index 100%
rename from calculatorpp/src/misc/res/logo.cdr
rename to calculatorpp/misc/res/logo.cdr
diff --git a/calculatorpp/src/misc/res/logo.png b/calculatorpp/misc/res/logo.png
similarity index 100%
rename from calculatorpp/src/misc/res/logo.png
rename to calculatorpp/misc/res/logo.png
diff --git a/calculatorpp/src/misc/res/work/Backup_of_logo.cdr b/calculatorpp/misc/res/work/Backup_of_logo.cdr
similarity index 100%
rename from calculatorpp/src/misc/res/work/Backup_of_logo.cdr
rename to calculatorpp/misc/res/work/Backup_of_logo.cdr
diff --git a/calculatorpp/src/misc/res/work/header.png b/calculatorpp/misc/res/work/header.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/header.png
rename to calculatorpp/misc/res/work/header.png
diff --git a/calculatorpp/src/misc/res/work/header_bg.png b/calculatorpp/misc/res/work/header_bg.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/header_bg.png
rename to calculatorpp/misc/res/work/header_bg.png
diff --git a/calculatorpp/src/misc/res/work/header_sm.png b/calculatorpp/misc/res/work/header_sm.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/header_sm.png
rename to calculatorpp/misc/res/work/header_sm.png
diff --git a/calculatorpp/src/misc/res/work/heart_original.png b/calculatorpp/misc/res/work/heart_original.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/heart_original.png
rename to calculatorpp/misc/res/work/heart_original.png
diff --git a/calculatorpp/src/misc/res/work/icon.png b/calculatorpp/misc/res/work/icon.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/icon.png
rename to calculatorpp/misc/res/work/icon.png
diff --git a/calculatorpp/src/misc/res/work/icon_favicon_light_blue.ico b/calculatorpp/misc/res/work/icon_favicon_light_blue.ico
similarity index 100%
rename from calculatorpp/src/misc/res/work/icon_favicon_light_blue.ico
rename to calculatorpp/misc/res/work/icon_favicon_light_blue.ico
diff --git a/calculatorpp/src/misc/res/work/icon_favicon_light_blue.png b/calculatorpp/misc/res/work/icon_favicon_light_blue.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/icon_favicon_light_blue.png
rename to calculatorpp/misc/res/work/icon_favicon_light_blue.png
diff --git a/calculatorpp/src/misc/res/work/icon_favicon_purple.ico b/calculatorpp/misc/res/work/icon_favicon_purple.ico
similarity index 100%
rename from calculatorpp/src/misc/res/work/icon_favicon_purple.ico
rename to calculatorpp/misc/res/work/icon_favicon_purple.ico
diff --git a/calculatorpp/src/misc/res/work/icon_small.png b/calculatorpp/misc/res/work/icon_small.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/icon_small.png
rename to calculatorpp/misc/res/work/icon_small.png
diff --git a/calculatorpp/src/misc/res/work/log11o.psd b/calculatorpp/misc/res/work/log11o.psd
similarity index 100%
rename from calculatorpp/src/misc/res/work/log11o.psd
rename to calculatorpp/misc/res/work/log11o.psd
diff --git a/calculatorpp/src/misc/res/work/logo.cdr b/calculatorpp/misc/res/work/logo.cdr
similarity index 100%
rename from calculatorpp/src/misc/res/work/logo.cdr
rename to calculatorpp/misc/res/work/logo.cdr
diff --git a/calculatorpp/src/misc/res/work/logo.png b/calculatorpp/misc/res/work/logo.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/logo.png
rename to calculatorpp/misc/res/work/logo.png
diff --git a/calculatorpp/src/misc/res/work/logoFULL copy.png b/calculatorpp/misc/res/work/logoFULL copy.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/logoFULL copy.png
rename to calculatorpp/misc/res/work/logoFULL copy.png
diff --git a/calculatorpp/src/misc/res/work/logoFULL.pdf b/calculatorpp/misc/res/work/logoFULL.pdf
similarity index 100%
rename from calculatorpp/src/misc/res/work/logoFULL.pdf
rename to calculatorpp/misc/res/work/logoFULL.pdf
diff --git a/calculatorpp/src/misc/res/work/logoFULL.png b/calculatorpp/misc/res/work/logoFULL.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/logoFULL.png
rename to calculatorpp/misc/res/work/logoFULL.png
diff --git a/calculatorpp/src/misc/res/work/logoFULL_banner.png b/calculatorpp/misc/res/work/logoFULL_banner.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/logoFULL_banner.png
rename to calculatorpp/misc/res/work/logoFULL_banner.png
diff --git a/calculatorpp/src/misc/res/work/logoFULL_small.png b/calculatorpp/misc/res/work/logoFULL_small.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/logoFULL_small.png
rename to calculatorpp/misc/res/work/logoFULL_small.png
diff --git a/calculatorpp/src/misc/res/work/logo_black.png b/calculatorpp/misc/res/work/logo_black.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/logo_black.png
rename to calculatorpp/misc/res/work/logo_black.png
diff --git a/calculatorpp/src/misc/res/work/logo_blue.png b/calculatorpp/misc/res/work/logo_blue.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/logo_blue.png
rename to calculatorpp/misc/res/work/logo_blue.png
diff --git a/calculatorpp/src/misc/res/work/logo_light_blue.png b/calculatorpp/misc/res/work/logo_light_blue.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/logo_light_blue.png
rename to calculatorpp/misc/res/work/logo_light_blue.png
diff --git a/calculatorpp/src/misc/res/work/logo_purple.png b/calculatorpp/misc/res/work/logo_purple.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/logo_purple.png
rename to calculatorpp/misc/res/work/logo_purple.png
diff --git a/calculatorpp/src/misc/res/work/promo_logo.png b/calculatorpp/misc/res/work/promo_logo.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/promo_logo.png
rename to calculatorpp/misc/res/work/promo_logo.png
diff --git a/calculatorpp/src/misc/res/work/text_logo.png b/calculatorpp/misc/res/work/text_logo.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/text_logo.png
rename to calculatorpp/misc/res/work/text_logo.png
diff --git a/calculatorpp/src/misc/res/work/text_logo_blue.png b/calculatorpp/misc/res/work/text_logo_blue.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/text_logo_blue.png
rename to calculatorpp/misc/res/work/text_logo_blue.png
diff --git a/calculatorpp/src/misc/res/work/text_logo_light_blue.png b/calculatorpp/misc/res/work/text_logo_light_blue.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/text_logo_light_blue.png
rename to calculatorpp/misc/res/work/text_logo_light_blue.png
diff --git a/calculatorpp/src/misc/res/work/text_logo_light_blue_cpp_forum.png b/calculatorpp/misc/res/work/text_logo_light_blue_cpp_forum.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/text_logo_light_blue_cpp_forum.png
rename to calculatorpp/misc/res/work/text_logo_light_blue_cpp_forum.png
diff --git a/calculatorpp/src/misc/res/work/text_logo_purple.png b/calculatorpp/misc/res/work/text_logo_purple.png
similarity index 100%
rename from calculatorpp/src/misc/res/work/text_logo_purple.png
rename to calculatorpp/misc/res/work/text_logo_purple.png
diff --git a/calculatorpp/src/misc/src/achartengine-0.7.0.jar b/calculatorpp/misc/src/achartengine-0.7.0.jar
similarity index 100%
rename from calculatorpp/src/misc/src/achartengine-0.7.0.jar
rename to calculatorpp/misc/src/achartengine-0.7.0.jar
diff --git a/calculatorpp/src/misc/src/bsh.jar b/calculatorpp/misc/src/bsh.jar
similarity index 100%
rename from calculatorpp/src/misc/src/bsh.jar
rename to calculatorpp/misc/src/bsh.jar
diff --git a/calculatorpp/pom.xml b/calculatorpp/pom.xml
index aafbad05..e83dc844 100644
--- a/calculatorpp/pom.xml
+++ b/calculatorpp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.solovyev.android</groupId>
         <artifactId>calculatorpp-parent</artifactId>
-        <version>1.2.34</version>
+        <version>1.3.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -14,39 +14,54 @@
     <groupId>org.solovyev.android</groupId>
     <artifactId>calculatorpp</artifactId>
     <packaging>apk</packaging>
-
-    <repositories>
-        <repository>
-            <id>congrace.de</id>
-            <name>releases</name>
-            <url>http://nexus.congrace.de/nexus/content/repositories/releases/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
+    <name>Calculator++ Application</name>
 
     <dependencies>
 
+        <!-- OWN -->
         <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-            <scope>test</scope>
+            <groupId>org.solovyev</groupId>
+            <artifactId>common-core</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.solovyev</groupId>
-            <artifactId>common</artifactId>
+            <artifactId>common-text</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.solovyev.android</groupId>
-            <artifactId>common</artifactId>
+            <artifactId>android-common-core</artifactId>
+            <type>apklib</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.solovyev.android</groupId>
+            <artifactId>android-common-ads</artifactId>
+            <type>apklib</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.solovyev.android</groupId>
+            <artifactId>android-common-view</artifactId>
+            <type>apklib</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.solovyev.android</groupId>
+            <artifactId>android-common-preferences</artifactId>
+            <type>apklib</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.solovyev.android</groupId>
+            <artifactId>android-common-other</artifactId>
+            <type>apklib</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.solovyev.android</groupId>
+            <artifactId>android-common-menu</artifactId>
             <type>apklib</type>
         </dependency>
 
@@ -69,6 +84,21 @@
             </exclusions>
         </dependency>
 
+        <!--OTHER-->
+
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>net.sf.opencsv</groupId>
             <artifactId>opencsv</artifactId>
@@ -101,7 +131,7 @@
         <dependency>
             <groupId>admob</groupId>
             <artifactId>admob</artifactId>
-            <version>6.0.0</version>
+            <version>6.1.0</version>
         </dependency>
 
         <dependency>
@@ -127,13 +157,26 @@
 
     <build>
 
+
         <plugins>
 
             <plugin>
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
-
+                <extensions>true</extensions>
+                <configuration>
+                    <manifest>
+                        <debuggable>true</debuggable>
+                    </manifest>
+                </configuration>
                 <executions>
+                    <execution>
+                        <id>manifestUpdate</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>manifest-update</goal>
+                        </goals>
+                    </execution>
                     <execution>
                         <id>alignApk</id>
                         <phase>package</phase>
@@ -142,26 +185,6 @@
                         </goals>
                     </execution>
                 </executions>
-
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>properties-maven-plugin</artifactId>
-                <version>1.0-alpha-2</version>
-                <executions>
-                    <execution>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>read-project-properties</goal>
-                        </goals>
-                        <configuration>
-                            <files>
-                                <file>${project.basedir}/src/misc/env/jarsigner.properties</file>
-                            </files>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
 
         </plugins>
@@ -170,27 +193,6 @@
 
     <profiles>
 
-        <profile>
-            <id>development</id>
-            <!-- using this since activeByDefault does not work well with multiple profiles -->
-            <activation>
-                <property>
-                    <name>environment</name>
-                    <value>!production</value>
-                </property>
-            </activation>
-            <properties>
-                <deployment.stage>In Development</deployment.stage>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>production</id>
-            <properties>
-                <deployment.stage>In Production</deployment.stage>
-            </properties>
-        </profile>
-
         <profile>
             <id>release</id>
             <!-- via this activation the profile is automatically used when the release is done with the maven release
@@ -205,6 +207,41 @@
             <build>
                 <plugins>
 
+                    <plugin>
+                        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                        <artifactId>android-maven-plugin</artifactId>
+
+                        <executions>
+                            <execution>
+                                <id>alignApk</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>zipalign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>properties-maven-plugin</artifactId>
+                        <version>1.0-alpha-2</version>
+                        <executions>
+                            <execution>
+                                <phase>initialize</phase>
+                                <goals>
+                                    <goal>read-project-properties</goal>
+                                </goals>
+                                <configuration>
+                                    <files>
+                                        <file>${project.basedir}/misc/env/jarsigner.properties</file>
+                                    </files>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-jarsigner-plugin</artifactId>
diff --git a/calculatorpp/proguard.cfg b/calculatorpp/proguard.cfg
new file mode 100644
index 00000000..fcaec6a6
--- /dev/null
+++ b/calculatorpp/proguard.cfg
@@ -0,0 +1,56 @@
+-target 1.6
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-repackageclasses ''
+-allowaccessmodification
+-optimizations !code/simplification/arithmetic
+-keepattributes *Annotation*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+
+-keep public class * extends android.view.View {
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+    public void set*(...);
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.content.Context {
+   public void *(android.view.View);
+   public void *(android.view.MenuItem);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+    static android.os.Parcelable$Creator CREATOR;
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-dontwarn javax.xml.stream.**
+-dontwarn com.bea.xml.stream.**
+-dontwarn sun.misc.Unsafe
+-dontwarn android.annotation.TargetApi
+
+-keep class org.simpleframework.xml.** { *; }
+-keep class com.actionbarsherlock.** { *; }
+-keep class * implements  org.solovyev.android.calculator.model.MathPersistenceEntity
diff --git a/calculatorpp/project.properties b/calculatorpp/project.properties
index 499b5e32..1b733b09 100644
--- a/calculatorpp/project.properties
+++ b/calculatorpp/project.properties
@@ -9,6 +9,11 @@
 
 # Project target.
 target=android-15
-android.library.reference.1=../calculatorpp-service
-android.library.reference.2=gen-external-apklibs/org.solovyev.android_common_0.1.
+android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.0
+android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.0
+android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.0
+android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0
+android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0
+android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.0
+
 
diff --git a/calculatorpp/res/xml/preferences.xml b/calculatorpp/res/xml/preferences.xml
index 5a279369..77fe5063 100644
--- a/calculatorpp/res/xml/preferences.xml
+++ b/calculatorpp/res/xml/preferences.xml
@@ -116,7 +116,7 @@
 				a:summary="@string/c_swipe_distance_summary"
 				a:text=" pxs"
 				a:defaultValue="35;350"
-				range:steps="10"
+				range:step="10"
 				range:boundaries="10;500"/>
 
 		<!--	  <org.solovyev.android.prefs.FloatRangeSeekBarPreference
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index 991ea00e..2c72260f 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -46,11 +46,11 @@ import org.solovyev.android.menu.LayoutActivityMenu;
 import org.solovyev.android.prefs.Preference;
 import org.solovyev.android.view.ColorButton;
 import org.solovyev.android.view.drag.*;
-import org.solovyev.common.utils.Announcer;
-import org.solovyev.common.utils.EqualsTool;
-import org.solovyev.common.utils.Point2d;
-import org.solovyev.common.utils.StringUtils;
-import org.solovyev.common.utils.history.HistoryAction;
+import org.solovyev.common.Announcer;
+import org.solovyev.common.equals.EqualsTool;
+import org.solovyev.common.math.Point2d;
+import org.solovyev.common.text.StringUtils;
+import org.solovyev.common.history.HistoryAction;
 
 public class CalculatorActivity extends Activity implements FontSizeAdjuster, SharedPreferences.OnSharedPreferenceChangeListener, ServiceConnection {
 
@@ -469,7 +469,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
                 dialogShown = showSpecialWindow(preferences, CalculatorPreferences.Gui.notesppAnnounceShown, R.layout.notespp_announce, R.id.notespp_announce);
             }
 
-			ResourceCache.instance.init(R.id.class, this);
+			ResourceCache.instance.initCaptions(this, R.id.class);
 
 			initialized = true;
 		}
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
index 67951e3f..52aee8cb 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
@@ -15,7 +15,7 @@ import org.solovyev.android.calculator.math.edit.CalculatorOperatorsActivity;
 import org.solovyev.android.calculator.math.edit.CalculatorVarsTabActivity;
 import org.solovyev.android.calculator.math.edit.CalculatorVarsActivity;
 import org.solovyev.android.calculator.plot.CalculatorPlotActivity;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 /**
  * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
index 8ec44603..77b21101 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
@@ -27,8 +27,8 @@ import org.solovyev.android.calculator.view.UnitConverterViewBuilder;
 import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.android.menu.LabeledMenuItem;
 import org.solovyev.android.view.AutoResizeTextView;
-import org.solovyev.common.utils.CollectionsUtils;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.collections.CollectionsUtils;
+import org.solovyev.common.text.StringUtils;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
index c1a0c8ec..013b5a09 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
@@ -19,7 +19,7 @@ import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.CalculatorParseException;
 import org.solovyev.android.calculator.model.TextProcessor;
 import org.solovyev.android.calculator.view.TextHighlighter;
-import org.solovyev.common.utils.CollectionsUtils;
+import org.solovyev.common.collections.CollectionsUtils;
 
 /**
  * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
index d4f2b32e..39a96822 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
@@ -13,7 +13,7 @@ import org.solovyev.android.menu.IdentifiableMenuItem;
  * Date: 4/23/12
  * Time: 2:25 PM
  */
-enum CalculatorMenu implements IdentifiableMenuItem {
+enum CalculatorMenu implements IdentifiableMenuItem<MenuItem> {
 
     settings(R.id.main_menu_item_settings){
         @Override
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorModel.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
index 50bd0a76..bc78f737 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
@@ -31,10 +31,10 @@ import org.solovyev.android.calculator.model.CalculatorParseException;
 import org.solovyev.android.history.HistoryControl;
 import org.solovyev.android.menu.AMenuBuilder;
 import org.solovyev.android.menu.MenuImpl;
+import org.solovyev.common.MutableObject;
+import org.solovyev.common.history.HistoryAction;
 import org.solovyev.common.msg.Message;
-import org.solovyev.common.utils.MutableObject;
-import org.solovyev.common.utils.StringUtils;
-import org.solovyev.common.utils.history.HistoryAction;
+import org.solovyev.common.text.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -329,19 +329,19 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
 
 	}
 
-	@Override
-	public void doHistoryAction(@NotNull HistoryAction historyAction) {
-		synchronized (CalculatorHistory.instance) {
-			if (CalculatorHistory.instance.isActionAvailable(historyAction)) {
-				final CalculatorHistoryState newState = CalculatorHistory.instance.doAction(historyAction, getCurrentHistoryState());
-				if (newState != null) {
-					setCurrentHistoryState(newState);
-				}
-			}
-		}
-	}
+    @Override
+    public void doHistoryAction(@NotNull HistoryAction historyAction) {
+        synchronized (CalculatorHistory.instance) {
+            if (CalculatorHistory.instance.isActionAvailable(historyAction)) {
+                final CalculatorHistoryState newState = CalculatorHistory.instance.doAction(historyAction, getCurrentHistoryState());
+                if (newState != null) {
+                    setCurrentHistoryState(newState);
+                }
+            }
+        }
+    }
 
-	@Override
+    @Override
 	public void setCurrentHistoryState(@NotNull CalculatorHistoryState editorHistoryState) {
 		synchronized (CalculatorHistory.instance) {
 			Log.d(this.getClass().getName(), "Saved history found: " + editorHistoryState);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
index 8ffc4fc9..27d98f3e 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
@@ -8,14 +8,14 @@ package org.solovyev.android.calculator;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.solovyev.common.utils.Finder;
+import org.solovyev.common.JPredicate;
 
 /**
  * User: serso
  * Date: 10/3/11
  * Time: 12:54 AM
  */
-public class CharacterAtPositionFinder implements Finder<Character> {
+public class CharacterAtPositionFinder implements JPredicate<Character> {
 
 	private int i;
 
@@ -28,7 +28,7 @@ public class CharacterAtPositionFinder implements Finder<Character> {
 	}
 
 	@Override
-	public boolean isFound(@Nullable Character s) {
+	public boolean apply(@Nullable Character s) {
 		return s != null && s.equals(targetString.charAt(i));
 	}
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
index 401d400f..2a7f62cf 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
@@ -12,7 +12,7 @@ import org.solovyev.android.view.drag.DragDirection;
 import org.solovyev.android.view.drag.SimpleOnDragListener;
 import org.solovyev.android.view.drag.DirectionDragButton;
 import org.solovyev.android.view.drag.DragButton;
-import org.solovyev.common.utils.Point2d;
+import org.solovyev.common.math.Point2d;
 
 /**
  * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
index 936bb202..185b1603 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
@@ -11,7 +11,7 @@ import org.solovyev.android.view.drag.DragDirection;
 import org.solovyev.android.view.drag.SimpleOnDragListener;
 import org.solovyev.android.view.drag.DirectionDragButton;
 import org.solovyev.android.view.drag.DragButton;
-import org.solovyev.common.utils.Point2d;
+import org.solovyev.common.math.Point2d;
 
 /**
  * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
index f2fc386a..7efb1c6f 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
@@ -12,7 +12,7 @@ import org.solovyev.android.view.drag.DragDirection;
 import org.solovyev.android.view.drag.SimpleOnDragListener;
 import org.solovyev.android.view.drag.DirectionDragButton;
 import org.solovyev.android.view.drag.DragButton;
-import org.solovyev.common.utils.Point2d;
+import org.solovyev.common.math.Point2d;
 
 /**
  * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java
index b164cf88..130d96d1 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java
@@ -18,7 +18,7 @@ import org.solovyev.android.AndroidUtils;
 import org.solovyev.android.ResourceCache;
 import org.solovyev.android.calculator.CalculatorActivity;
 import org.solovyev.android.calculator.R;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 /**
  * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
index fea99c8d..3069aafd 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
@@ -25,7 +25,12 @@ import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.jscl.JsclOperation;
 import org.solovyev.android.menu.AMenuBuilder;
 import org.solovyev.android.menu.MenuImpl;
-import org.solovyev.common.utils.*;
+import org.solovyev.common.collections.CollectionsUtils;
+import org.solovyev.common.equals.Equalizer;
+import org.solovyev.common.filter.Filter;
+import org.solovyev.common.filter.FilterRule;
+import org.solovyev.common.filter.FilterRulesChain;
+import org.solovyev.common.text.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
index 78808c88..c4967038 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
@@ -12,9 +12,9 @@ import android.preference.PreferenceManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.R;
-import org.solovyev.common.utils.history.HistoryAction;
-import org.solovyev.common.utils.history.HistoryHelper;
-import org.solovyev.common.utils.history.SimpleHistoryHelper;
+import org.solovyev.common.history.HistoryAction;
+import org.solovyev.common.history.HistoryHelper;
+import org.solovyev.common.history.SimpleHistoryHelper;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
index 46f57c31..e8dedbd4 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
@@ -13,7 +13,7 @@ import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.R;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
index 8b937780..3811c198 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
@@ -20,7 +20,7 @@ import android.widget.Toast;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.menu.LabeledMenuItem;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 /**
 * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/MathType.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/MathType.java
index b9321fdc..91e8d451 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/MathType.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/MathType.java
@@ -10,11 +10,11 @@ import jscl.NumeralBase;
 import jscl.math.function.Constants;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.solovyev.common.JPredicate;
 import org.solovyev.common.StartsWithFinder;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.CalculatorParseException;
-import org.solovyev.common.utils.CollectionsUtils;
-import org.solovyev.common.utils.Finder;
+import org.solovyev.common.collections.CollectionsUtils;
 
 import java.util.*;
 
@@ -425,7 +425,7 @@ public enum MathType {
 		}
 	}
 
-	private static class EndsWithFinder implements Finder<String> {
+	private static class EndsWithFinder implements JPredicate<String> {
 
 		private int i;
 
@@ -437,7 +437,7 @@ public enum MathType {
 		}
 
 		@Override
-		public boolean isFound(@Nullable String s) {
+		public boolean apply(@Nullable String s) {
 			return targetString.subSequence(0, i).toString().endsWith(s);
 		}
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
index 668cc848..eb2a5919 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
@@ -23,14 +23,13 @@ import org.solovyev.android.calculator.CalculatorModel;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.AndroidMathRegistry;
 import org.solovyev.android.menu.AMenuBuilder;
-import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.android.menu.LabeledMenuItem;
 import org.solovyev.android.menu.MenuImpl;
+import org.solovyev.common.equals.EqualsTool;
+import org.solovyev.common.filter.FilterRule;
+import org.solovyev.common.filter.Filter;
 import org.solovyev.common.math.MathEntity;
-import org.solovyev.common.utils.EqualsTool;
-import org.solovyev.common.utils.Filter;
-import org.solovyev.common.utils.FilterRule;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 import java.util.Arrays;
 import java.util.Comparator;
@@ -161,7 +160,7 @@ public abstract class AbstractMathEntityListActivity<T extends MathEntity> exten
                 return !isInCategory(t);
             }
         }).filter(result.iterator());
-        
+
         return result; 
     }
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
index 8dab10dd..2c0a57e3 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
@@ -15,9 +15,8 @@ import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.CalculatorModel;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.android.menu.LabeledMenuItem;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
index 76d207fa..1aecbc85 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
@@ -8,9 +8,8 @@ import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.CalculatorModel;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.menu.AMenuItem;
 import org.solovyev.android.menu.LabeledMenuItem;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
index 344f682f..40143834 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
@@ -27,9 +27,9 @@ import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.Var;
 import org.solovyev.android.menu.LabeledMenuItem;
-import org.solovyev.common.utils.CollectionsUtils;
-import org.solovyev.common.utils.Finder;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.JPredicate;
+import org.solovyev.common.collections.CollectionsUtils;
+import org.solovyev.common.text.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -165,9 +165,9 @@ public class CalculatorVarsActivity extends AbstractMathEntityListActivity<ICons
 	protected List<IConstant> getMathEntities() {
 		final List<IConstant> result = new ArrayList<IConstant>(CalculatorEngine.instance.getVarsRegistry().getEntities());
 
-		CollectionsUtils.removeAll(result, new Finder<IConstant>() {
+		CollectionsUtils.removeAll(result, new JPredicate<IConstant>() {
 			@Override
-			public boolean isFound(@Nullable IConstant var) {
+			public boolean apply(@Nullable IConstant var) {
 				return var != null && CollectionsUtils.contains(var.getName(), MathType.INFINITY_JSCL, MathType.NAN);
 			}
 		});
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/FunctionEditorSaver.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/FunctionEditorSaver.java
index da96e731..e37c3416 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/FunctionEditorSaver.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/FunctionEditorSaver.java
@@ -24,7 +24,7 @@ import org.solovyev.android.calculator.model.AndroidMathRegistry;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.MathEntityBuilder;
 import org.solovyev.common.math.MathEntity;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 /**
  * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
index e025d19c..7755b8ba 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
@@ -22,7 +22,7 @@ import org.solovyev.android.calculator.model.AndroidMathRegistry;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.MathEntityBuilder;
 import org.solovyev.common.math.MathEntity;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 /**
  * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AFunction.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AFunction.java
index 3f87cfcc..16889278 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AFunction.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AFunction.java
@@ -10,8 +10,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
+import org.solovyev.common.collections.CollectionsUtils;
+import org.solovyev.common.text.CollectionTransformations;
 import org.solovyev.common.text.StringMapper;
-import org.solovyev.common.utils.CollectionsUtils;
 
 import java.util.List;
 
@@ -62,7 +63,7 @@ public class AFunction implements MathPersistenceEntity {
 	}
 
 	public void setParameterNames(@Nullable String[] parameterNames) {
-		this.parameterNames = CollectionsUtils.formatValue(CollectionsUtils.asList(parameterNames), ";", new StringMapper());
+		this.parameterNames = CollectionTransformations.formatValue(CollectionsUtils.asList(parameterNames), ";", new StringMapper());
 	}
 
 	public void setParameterNames(@Nullable String parameterNames) {
@@ -71,7 +72,7 @@ public class AFunction implements MathPersistenceEntity {
 
 	@NotNull
 	public String[] getParameterNamesAsArray() {
-		final List<String> parameterNamesAsList = CollectionsUtils.split(parameterNames, ";");
+		final List<String> parameterNamesAsList = CollectionTransformations.split(parameterNames, ";");
 		return parameterNamesAsList.toArray(new String[parameterNamesAsList.size()]);
 	}
 }
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AbstractAndroidMathRegistry.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AbstractAndroidMathRegistry.java
index 3bff0c94..7b5c9bc6 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AbstractAndroidMathRegistry.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AbstractAndroidMathRegistry.java
@@ -13,10 +13,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
-import org.solovyev.android.ResourceCache;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.about.TextHelper;
-import org.solovyev.common.definitions.IBuilder;
+import org.solovyev.common.JBuilder;
 import org.solovyev.common.math.MathEntity;
 import org.solovyev.common.math.MathRegistry;
 
@@ -90,7 +89,7 @@ public abstract class AbstractAndroidMathRegistry<T extends MathEntity, P extend
 	}
 
 	@NotNull
-	protected abstract IBuilder<? extends T> createBuilder(@NotNull P entity);
+	protected abstract JBuilder<? extends T> createBuilder(@NotNull P entity);
 
 	@NotNull
 	protected abstract Class<? extends MathEntityPersistenceContainer<P>> getPersistenceContainerClass();
@@ -150,8 +149,8 @@ public abstract class AbstractAndroidMathRegistry<T extends MathEntity, P extend
 	}
 
 	@Override
-	public T add(@NotNull IBuilder<? extends T> IBuilder) {
-		return mathRegistry.add(IBuilder);
+	public T add(@NotNull JBuilder<? extends T> JBuilder) {
+		return mathRegistry.add(JBuilder);
 	}
 
 	@Override
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java
index 9acc83de..d4dac24b 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java
@@ -11,7 +11,7 @@ import jscl.NumeralBase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.math.MathType;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 /**
  * User: serso
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidFunctionsMathRegistry.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidFunctionsMathRegistry.java
index 17579c93..33bfd7c9 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidFunctionsMathRegistry.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidFunctionsMathRegistry.java
@@ -12,9 +12,9 @@ import jscl.math.function.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.R;
-import org.solovyev.common.definitions.IBuilder;
+import org.solovyev.common.JBuilder;
+import org.solovyev.common.collections.CollectionsUtils;
 import org.solovyev.common.math.MathRegistry;
-import org.solovyev.common.utils.CollectionsUtils;
 
 import java.util.*;
 
@@ -145,7 +145,7 @@ public class AndroidFunctionsMathRegistry extends AbstractAndroidMathRegistry<Fu
 
 	@NotNull
 	@Override
-	protected IBuilder<? extends Function> createBuilder(@NotNull AFunction entity) {
+	protected JBuilder<? extends Function> createBuilder(@NotNull AFunction entity) {
 		return new CustomFunction.Builder(entity.getName(), entity.getParameterNamesAsArray(), entity.getContent());
 	}
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidOperatorsMathRegistry.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidOperatorsMathRegistry.java
index a4fb8050..d7092ff6 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidOperatorsMathRegistry.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidOperatorsMathRegistry.java
@@ -11,7 +11,7 @@ import android.content.SharedPreferences;
 import jscl.math.operator.Operator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.solovyev.common.definitions.IBuilder;
+import org.solovyev.common.JBuilder;
 import org.solovyev.common.math.MathRegistry;
 
 import java.util.HashMap;
@@ -60,7 +60,7 @@ public class AndroidOperatorsMathRegistry extends AbstractAndroidMathRegistry<Op
 
 	@NotNull
 	@Override
-	protected IBuilder<? extends Operator> createBuilder(@NotNull MathPersistenceEntity entity) {
+	protected JBuilder<? extends Operator> createBuilder(@NotNull MathPersistenceEntity entity) {
 		return null;  //To change body of implemented methods use File | Settings | File Templates.
 	}
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidPostfixFunctionsRegistry.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidPostfixFunctionsRegistry.java
index ecb7157b..6ba21cf0 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidPostfixFunctionsRegistry.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidPostfixFunctionsRegistry.java
@@ -11,7 +11,7 @@ import android.content.SharedPreferences;
 import jscl.math.operator.Operator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.solovyev.common.definitions.IBuilder;
+import org.solovyev.common.JBuilder;
 import org.solovyev.common.math.MathRegistry;
 
 import java.util.HashMap;
@@ -59,7 +59,7 @@ public class AndroidPostfixFunctionsRegistry extends AbstractAndroidMathRegistry
 
 	@NotNull
 	@Override
-	protected IBuilder<? extends Operator> createBuilder(@NotNull MathPersistenceEntity entity) {
+	protected JBuilder<? extends Operator> createBuilder(@NotNull MathPersistenceEntity entity) {
 		return null;  //To change body of implemented methods use File | Settings | File Templates.
 	}
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidVarsRegistryImpl.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidVarsRegistryImpl.java
index 43b80b7f..26f64dfc 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidVarsRegistryImpl.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidVarsRegistryImpl.java
@@ -12,7 +12,7 @@ import jscl.math.function.IConstant;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.R;
-import org.solovyev.common.definitions.IBuilder;
+import org.solovyev.common.JBuilder;
 import org.solovyev.common.math.MathRegistry;
 
 import java.util.HashMap;
@@ -63,7 +63,7 @@ class AndroidVarsRegistryImpl extends AbstractAndroidMathRegistry<IConstant, Var
 
 	@NotNull
 	@Override
-	protected IBuilder<? extends IConstant> createBuilder(@NotNull Var entity) {
+	protected JBuilder<? extends IConstant> createBuilder(@NotNull Var entity) {
 		return new Var.Builder(entity);
 	}
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
index b2302d1b..c39e09a3 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
@@ -17,13 +17,13 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.jscl.JsclOperation;
 import org.solovyev.android.prefs.BooleanPreference;
-import org.solovyev.common.text.EnumMapper;
 import org.solovyev.android.prefs.Preference;
 import org.solovyev.android.prefs.StringPreference;
+import org.solovyev.common.MutableObject;
 import org.solovyev.common.msg.MessageRegistry;
+import org.solovyev.common.text.EnumMapper;
 import org.solovyev.common.text.NumberMapper;
-import org.solovyev.common.utils.MutableObject;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
index 4df688f2..737bd438 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
@@ -8,7 +8,7 @@ package org.solovyev.android.calculator.model;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.solovyev.common.definitions.IBuilder;
+import org.solovyev.common.JBuilder;
 import org.solovyev.common.math.MathEntity;
 
 /**
@@ -16,7 +16,7 @@ import org.solovyev.common.math.MathEntity;
 * Date: 12/22/11
 * Time: 9:21 PM
 */
-public interface MathEntityBuilder<T extends MathEntity> extends IBuilder<T> {
+public interface MathEntityBuilder<T extends MathEntity> extends JBuilder<T> {
 
 	@NotNull
 	public MathEntityBuilder<T> setName(@NotNull String name);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/NumberBuilder.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/NumberBuilder.java
index effc0005..33dac4ee 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/NumberBuilder.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/NumberBuilder.java
@@ -14,7 +14,7 @@ import jscl.text.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.math.MathType;
-import org.solovyev.common.utils.MutableObject;
+import org.solovyev.common.MutableObject;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/ToJsclTextProcessor.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/ToJsclTextProcessor.java
index 5c5df0a4..4430f6b2 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/ToJsclTextProcessor.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/ToJsclTextProcessor.java
@@ -10,7 +10,7 @@ import jscl.math.function.IConstant;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.common.StartsWithFinder;
 import org.solovyev.android.calculator.math.MathType;
-import org.solovyev.common.utils.CollectionsUtils;
+import org.solovyev.common.collections.CollectionsUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/Var.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/Var.java
index 2ef40424..c9335b0f 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/Var.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/Var.java
@@ -14,9 +14,9 @@ import org.jetbrains.annotations.Nullable;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 import org.simpleframework.xml.Transient;
-import org.solovyev.common.definitions.IBuilder;
+import org.solovyev.common.JBuilder;
 import org.solovyev.common.math.MathEntity;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 /**
  * User: serso
@@ -48,7 +48,7 @@ public class Var implements IConstant, MathPersistenceEntity {
 	@Transient
 	private Constant constant;
 
-	public static class Builder implements IBuilder<Var>, MathEntityBuilder<Var> {
+	public static class Builder implements JBuilder<Var>, MathEntityBuilder<Var> {
 
 		@NotNull
 		private String name;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/VarCategory.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/VarCategory.java
index 9914e4f2..80c5d314 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/VarCategory.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/model/VarCategory.java
@@ -3,7 +3,7 @@ package org.solovyev.android.calculator.model;
 import jscl.math.function.IConstant;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.R;
-import org.solovyev.common.utils.CollectionsUtils;
+import org.solovyev.common.collections.CollectionsUtils;
 
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
index 4f610f8a..33411a3c 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
@@ -38,7 +38,7 @@ import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorParseException;
 import org.solovyev.android.calculator.model.PreparedExpression;
 import org.solovyev.android.calculator.model.ToJsclTextProcessor;
-import org.solovyev.common.utils.MutableObject;
+import org.solovyev.common.MutableObject;
 
 import java.io.Serializable;
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java
index bfc9b11c..2dfa459f 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java
@@ -14,8 +14,8 @@ import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.CalculatorParseException;
 import org.solovyev.android.calculator.model.ToJsclTextProcessor;
-import org.solovyev.common.utils.MutableObject;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.MutableObject;
+import org.solovyev.common.text.StringUtils;
 
 import java.util.Arrays;
 
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java
index f8572d9e..0c658a97 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.model.*;
-import org.solovyev.common.utils.MutableObject;
+import org.solovyev.common.MutableObject;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java
index c7f3218a..4113d63e 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java
@@ -17,7 +17,7 @@ import org.solovyev.android.UnitType;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.view.ViewBuilder;
 import org.solovyev.android.view.ViewFromLayoutBuilder;
-import org.solovyev.common.utils.StringUtils;
+import org.solovyev.common.text.StringUtils;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java b/calculatorpp/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
index adda64b9..a58e72a5 100644
--- a/calculatorpp/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
+++ b/calculatorpp/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
@@ -13,10 +13,10 @@ import org.jetbrains.annotations.Nullable;
 import org.junit.Test;
 import org.solovyev.android.calculator.ICalculatorDisplay;
 import org.solovyev.android.calculator.jscl.JsclOperation;
-import org.solovyev.common.utils.CollectionEqualizer;
-import org.solovyev.common.utils.EqualsTool;
-import org.solovyev.common.utils.history.HistoryHelper;
-import org.solovyev.common.utils.history.SimpleHistoryHelper;
+import org.solovyev.common.equals.CollectionEqualizer;
+import org.solovyev.common.equals.EqualsTool;
+import org.solovyev.common.history.HistoryHelper;
+import org.solovyev.common.history.SimpleHistoryHelper;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java b/calculatorpp/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
index a8b4cf3d..6eb893c1 100644
--- a/calculatorpp/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
+++ b/calculatorpp/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
@@ -11,7 +11,7 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.solovyev.android.calculator.jscl.JsclOperation;
-import org.solovyev.common.utils.Converter;
+import org.solovyev.common.Converter;
 
 import java.io.InputStreamReader;
 import java.util.ArrayList;
diff --git a/calculatorpp/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java b/calculatorpp/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
index fb91e359..7a441384 100644
--- a/calculatorpp/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
+++ b/calculatorpp/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
@@ -2,10 +2,8 @@ package org.solovyev.common;
 
 import junit.framework.Assert;
 import org.junit.Test;
-import org.solovyev.common.text.Mapper;
+import org.solovyev.common.interval.IntervalImpl;
 import org.solovyev.common.text.NumberIntervalMapper;
-import org.solovyev.common.utils.Interval;
-import org.solovyev.common.utils.NumberInterval;
 
 /**
  * User: serso
@@ -16,9 +14,9 @@ public class FloatIntervalMapperTest {
 
 	@Test
 	public void testParse() throws Exception {
-		final Mapper<Interval<Float>> mapper = new NumberIntervalMapper<Float>(Float.class);
+		final NumberIntervalMapper<Float> mapper = new NumberIntervalMapper<Float>(Float.class);
 
-		Assert.assertEquals(new NumberInterval<Float>(1.2f, 12.2f), mapper.parseValue("1.2;12.2"));
-		Assert.assertEquals(new NumberInterval<Float>(0f, 0f), mapper.parseValue("0;0"));
+		Assert.assertEquals(IntervalImpl.newClosed(1.2f, 12.2f), mapper.parseValue("1.2;12.2"));
+		Assert.assertEquals(IntervalImpl.newPoint(0f), mapper.parseValue("0;0"));
 	}
 }
diff --git a/calculatorpp/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java b/calculatorpp/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
index ef2fc2d0..468972e1 100644
--- a/calculatorpp/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
+++ b/calculatorpp/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
@@ -2,7 +2,6 @@ package org.solovyev.common.math;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.solovyev.common.utils.MathUtils;
 
 /**
  * User: serso
diff --git a/pom.xml b/pom.xml
index 7955736c..f8fe79ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,8 @@
     <groupId>org.solovyev.android</groupId>
     <artifactId>calculatorpp-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.34</version>
+    <version>1.3.1</version>
+    <name>Calculator++</name>
 
     <modules>
 		<module>calculatorpp</module>
@@ -25,15 +26,56 @@
 
             <dependency>
                 <groupId>org.solovyev</groupId>
-                <artifactId>common</artifactId>
-                <version>0.3.1</version>
+                <artifactId>common-core</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev</groupId>
+                <artifactId>common-text</artifactId>
+                <version>1.0.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.solovyev.android</groupId>
-                <artifactId>common</artifactId>
-                <version>0.1.5</version>
+                <artifactId>android-common-core</artifactId>
                 <type>apklib</type>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-ads</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-view</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-preferences</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-menu</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.solovyev.android</groupId>
+                <artifactId>android-common-other</artifactId>
+                <type>apklib</type>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
@@ -66,52 +108,14 @@
 
     <build>
 
-        <!-- specifying the resources: e.g. layout.xml, strings.xml etc-->
-        <resources>
-
-            <!-- a pair definition for resource filtering of xml files only (not binary files since they get mangled -->
-            <resource>
-                <directory>${project.basedir}/res</directory>
-                <filtering>true</filtering>
-                <targetPath>${project.build.directory}/filtered-res</targetPath>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-
-            <resource>
-                <directory>${project.basedir}/res</directory>
-                <filtering>false</filtering>
-                <targetPath>${project.build.directory}/filtered-res</targetPath>
-                <excludes>
-                    <exclude>**/*.xml</exclude>
-                </excludes>
-            </resource>
-
-        </resources>
-
         <plugins>
 
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.4.3</version>
-                <executions>
-                    <execution>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <extensions>true</extensions>
 
                 <configuration>
-                    <resourceDirectory>${project.build.directory}/filtered-res</resourceDirectory>
                     <manifest>
                         <debuggable>true</debuggable>
                     </manifest>
@@ -142,15 +146,6 @@
                     <version>1.2</version>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.4.3</version>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                    </configuration>
-                </plugin>
-
                 <plugin>
                     <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                     <artifactId>android-maven-plugin</artifactId>
@@ -209,12 +204,8 @@
     <profiles>
 
         <profile>
-            <!-- the standard profile runs the instrumentation tests -->
+            <!-- the standard profile runs instrumentation tests  -->
             <id>standard</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
         </profile>
 
         <profile>