diff --git a/.idea/modules.xml b/.idea/modules.xml
index 93c00cf2..ab16b3bf 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -30,8 +30,6 @@
       <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-tasks_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-tasks_1.1.15.iml" />
       <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-views_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-views_1.1.15.iml" />
       <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.3-SNAPSHOT.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.3-SNAPSHOT.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.3-SNAPSHOT.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.3-SNAPSHOT.iml" />
     </modules>
   </component>
 </project>
diff --git a/android-app-core.iml b/android-app-core.iml
index 16a7f360..11fa6b64 100644
--- a/android-app-core.iml
+++ b/android-app-core.iml
@@ -39,7 +39,7 @@
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpack" />
     </content>
-    <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (1)" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
diff --git a/android-app-onscreen.iml b/android-app-onscreen.iml
index 908dc7ab..a0d41fe9 100644
--- a/android-app-onscreen.iml
+++ b/android-app-onscreen.iml
@@ -39,7 +39,7 @@
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/unpack" />
     </content>
-    <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (1)" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
@@ -52,6 +52,13 @@
     <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+    <orderEntry type="module" module-name="android-app-core" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
@@ -61,8 +68,26 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
-    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.3-SNAPSHOT" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.15" />
   </component>
 </module>
 
diff --git a/android-app-widget.iml b/android-app-widget.iml
index 7661a45b..a09f5a12 100644
--- a/android-app-widget.iml
+++ b/android-app-widget.iml
@@ -39,7 +39,7 @@
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/unpack" />
     </content>
-    <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (1)" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
@@ -52,6 +52,13 @@
     <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+    <orderEntry type="module" module-name="android-app-core" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
@@ -61,8 +68,26 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
-    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.3-SNAPSHOT" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.15" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.15" />
   </component>
 </module>
 
diff --git a/android-app.iml b/android-app.iml
index 7f28205e..ae44810e 100644
--- a/android-app.iml
+++ b/android-app.iml
@@ -43,7 +43,7 @@
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/unpack" />
     </content>
-    <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (1)" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
@@ -56,11 +56,15 @@
     <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="module" module-name="android-app-onscreen" />
+    <orderEntry type="module" module-name="android-app-core" />
     <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="module" module-name="android-app-widget" />
+    <orderEntry type="module" module-name="android-app-onscreen" />
     <orderEntry type="library" name="Maven: ch.acra:acra:4.3.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
@@ -73,9 +77,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.sf.opencsv:opencsv:2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.robolectric:robolectric:2.1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xerial:sqlite-jdbc:3.7.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:4.1" level="project" />
@@ -110,8 +112,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-shared:1.0-beta-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:xercesMinimal:1.9.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6.2" level="project" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.3-SNAPSHOT" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.3-SNAPSHOT" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.15" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.15" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.15" />