diff --git a/android-app-core.iml b/android-app-core.iml
index c5efdfbd..16a7f360 100644
--- a/android-app-core.iml
+++ b/android-app-core.iml
@@ -28,12 +28,13 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/idea-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpack" />
diff --git a/android-app-onscreen.iml b/android-app-onscreen.iml
index 72836511..908dc7ab 100644
--- a/android-app-onscreen.iml
+++ b/android-app-onscreen.iml
@@ -28,12 +28,13 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/idea-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/unpack" />
@@ -51,13 +52,6 @@
     <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" />
@@ -67,26 +61,8 @@
     <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="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" />
+    <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" />
   </component>
 </module>
 
diff --git a/android-app-widget.iml b/android-app-widget.iml
index bf03cbd6..7661a45b 100644
--- a/android-app-widget.iml
+++ b/android-app-widget.iml
@@ -28,12 +28,13 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/idea-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/unpack" />
@@ -51,13 +52,6 @@
     <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" />
@@ -67,26 +61,8 @@
     <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="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" />
+    <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" />
   </component>
 </module>
 
diff --git a/android-app.iml b/android-app.iml
index f37065f1..7f28205e 100644
--- a/android-app.iml
+++ b/android-app.iml
@@ -28,15 +28,17 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/android-app/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app/target/idea-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app/target/idea-test-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app/target/gpg" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-status" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app/target/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/surefire-reports" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/unpack" />
@@ -54,15 +56,11 @@
     <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="module" module-name="android-app-onscreen" />
     <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" />
@@ -75,7 +73,9 @@
     <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,6 +110,8 @@
     <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" />