diff --git a/android-calculator-app/AndroidManifest.xml b/calculatorpp-main/AndroidManifest.xml
similarity index 100%
rename from android-calculator-app/AndroidManifest.xml
rename to calculatorpp-main/AndroidManifest.xml
diff --git a/android-calculator-app/pom.xml b/calculatorpp-main/pom.xml
similarity index 99%
rename from android-calculator-app/pom.xml
rename to calculatorpp-main/pom.xml
index cb77d747..25ed832e 100644
--- a/android-calculator-app/pom.xml
+++ b/calculatorpp-main/pom.xml
@@ -12,7 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.solovyev.android</groupId>
-    <artifactId>calculatorpp</artifactId>
+    <artifactId>calculatorpp-main</artifactId>
     <packaging>apk</packaging>
 
     <properties>
diff --git a/android-calculator-app/project.properties b/calculatorpp-main/project.properties
similarity index 88%
rename from android-calculator-app/project.properties
rename to calculatorpp-main/project.properties
index a626b6d2..8da376af 100644
--- a/android-calculator-app/project.properties
+++ b/calculatorpp-main/project.properties
@@ -9,4 +9,3 @@
 
 # Project target.
 target=android-15
-android.library.reference.1=../../android_common
\ No newline at end of file
diff --git a/android-calculator-app/res/drawable-hdpi/copy.png b/calculatorpp-main/res/drawable-hdpi/copy.png
similarity index 100%
rename from android-calculator-app/res/drawable-hdpi/copy.png
rename to calculatorpp-main/res/drawable-hdpi/copy.png
diff --git a/android-calculator-app/res/drawable-hdpi/heart.png b/calculatorpp-main/res/drawable-hdpi/heart.png
similarity index 100%
rename from android-calculator-app/res/drawable-hdpi/heart.png
rename to calculatorpp-main/res/drawable-hdpi/heart.png
diff --git a/android-calculator-app/res/drawable-hdpi/icon.png b/calculatorpp-main/res/drawable-hdpi/icon.png
similarity index 100%
rename from android-calculator-app/res/drawable-hdpi/icon.png
rename to calculatorpp-main/res/drawable-hdpi/icon.png
diff --git a/android-calculator-app/res/drawable-hdpi/logo.png b/calculatorpp-main/res/drawable-hdpi/logo.png
similarity index 100%
rename from android-calculator-app/res/drawable-hdpi/logo.png
rename to calculatorpp-main/res/drawable-hdpi/logo.png
diff --git a/android-calculator-app/res/drawable-hdpi/paste.png b/calculatorpp-main/res/drawable-hdpi/paste.png
similarity index 100%
rename from android-calculator-app/res/drawable-hdpi/paste.png
rename to calculatorpp-main/res/drawable-hdpi/paste.png
diff --git a/android-calculator-app/res/drawable-hdpi/sym_keyboard_delete.png b/calculatorpp-main/res/drawable-hdpi/sym_keyboard_delete.png
similarity index 100%
rename from android-calculator-app/res/drawable-hdpi/sym_keyboard_delete.png
rename to calculatorpp-main/res/drawable-hdpi/sym_keyboard_delete.png
diff --git a/android-calculator-app/res/drawable-ldpi/copy.png b/calculatorpp-main/res/drawable-ldpi/copy.png
similarity index 100%
rename from android-calculator-app/res/drawable-ldpi/copy.png
rename to calculatorpp-main/res/drawable-ldpi/copy.png
diff --git a/android-calculator-app/res/drawable-ldpi/heart.png b/calculatorpp-main/res/drawable-ldpi/heart.png
similarity index 100%
rename from android-calculator-app/res/drawable-ldpi/heart.png
rename to calculatorpp-main/res/drawable-ldpi/heart.png
diff --git a/android-calculator-app/res/drawable-ldpi/icon.png b/calculatorpp-main/res/drawable-ldpi/icon.png
similarity index 100%
rename from android-calculator-app/res/drawable-ldpi/icon.png
rename to calculatorpp-main/res/drawable-ldpi/icon.png
diff --git a/android-calculator-app/res/drawable-ldpi/logo.png b/calculatorpp-main/res/drawable-ldpi/logo.png
similarity index 100%
rename from android-calculator-app/res/drawable-ldpi/logo.png
rename to calculatorpp-main/res/drawable-ldpi/logo.png
diff --git a/android-calculator-app/res/drawable-ldpi/paste.png b/calculatorpp-main/res/drawable-ldpi/paste.png
similarity index 100%
rename from android-calculator-app/res/drawable-ldpi/paste.png
rename to calculatorpp-main/res/drawable-ldpi/paste.png
diff --git a/android-calculator-app/res/drawable-ldpi/sym_keyboard_delete.png b/calculatorpp-main/res/drawable-ldpi/sym_keyboard_delete.png
similarity index 100%
rename from android-calculator-app/res/drawable-ldpi/sym_keyboard_delete.png
rename to calculatorpp-main/res/drawable-ldpi/sym_keyboard_delete.png
diff --git a/android-calculator-app/res/drawable-mdpi/copy.png b/calculatorpp-main/res/drawable-mdpi/copy.png
similarity index 100%
rename from android-calculator-app/res/drawable-mdpi/copy.png
rename to calculatorpp-main/res/drawable-mdpi/copy.png
diff --git a/android-calculator-app/res/drawable-mdpi/heart.png b/calculatorpp-main/res/drawable-mdpi/heart.png
similarity index 100%
rename from android-calculator-app/res/drawable-mdpi/heart.png
rename to calculatorpp-main/res/drawable-mdpi/heart.png
diff --git a/android-calculator-app/res/drawable-mdpi/icon.png b/calculatorpp-main/res/drawable-mdpi/icon.png
similarity index 100%
rename from android-calculator-app/res/drawable-mdpi/icon.png
rename to calculatorpp-main/res/drawable-mdpi/icon.png
diff --git a/android-calculator-app/res/drawable-mdpi/logo.png b/calculatorpp-main/res/drawable-mdpi/logo.png
similarity index 100%
rename from android-calculator-app/res/drawable-mdpi/logo.png
rename to calculatorpp-main/res/drawable-mdpi/logo.png
diff --git a/android-calculator-app/res/drawable-mdpi/paste.png b/calculatorpp-main/res/drawable-mdpi/paste.png
similarity index 100%
rename from android-calculator-app/res/drawable-mdpi/paste.png
rename to calculatorpp-main/res/drawable-mdpi/paste.png
diff --git a/android-calculator-app/res/drawable-mdpi/sym_keyboard_delete.png b/calculatorpp-main/res/drawable-mdpi/sym_keyboard_delete.png
similarity index 100%
rename from android-calculator-app/res/drawable-mdpi/sym_keyboard_delete.png
rename to calculatorpp-main/res/drawable-mdpi/sym_keyboard_delete.png
diff --git a/android-calculator-app/res/drawable-xhdpi/copy.png b/calculatorpp-main/res/drawable-xhdpi/copy.png
similarity index 100%
rename from android-calculator-app/res/drawable-xhdpi/copy.png
rename to calculatorpp-main/res/drawable-xhdpi/copy.png
diff --git a/android-calculator-app/res/drawable-xhdpi/heart.png b/calculatorpp-main/res/drawable-xhdpi/heart.png
similarity index 100%
rename from android-calculator-app/res/drawable-xhdpi/heart.png
rename to calculatorpp-main/res/drawable-xhdpi/heart.png
diff --git a/android-calculator-app/res/drawable-xhdpi/icon.png b/calculatorpp-main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from android-calculator-app/res/drawable-xhdpi/icon.png
rename to calculatorpp-main/res/drawable-xhdpi/icon.png
diff --git a/android-calculator-app/res/drawable-xhdpi/logo.png b/calculatorpp-main/res/drawable-xhdpi/logo.png
similarity index 100%
rename from android-calculator-app/res/drawable-xhdpi/logo.png
rename to calculatorpp-main/res/drawable-xhdpi/logo.png
diff --git a/android-calculator-app/res/drawable-xhdpi/paste.png b/calculatorpp-main/res/drawable-xhdpi/paste.png
similarity index 100%
rename from android-calculator-app/res/drawable-xhdpi/paste.png
rename to calculatorpp-main/res/drawable-xhdpi/paste.png
diff --git a/android-calculator-app/res/drawable-xhdpi/sym_keyboard_delete.png b/calculatorpp-main/res/drawable-xhdpi/sym_keyboard_delete.png
similarity index 100%
rename from android-calculator-app/res/drawable-xhdpi/sym_keyboard_delete.png
rename to calculatorpp-main/res/drawable-xhdpi/sym_keyboard_delete.png
diff --git a/android-calculator-app/res/drawable/blue_button.xml b/calculatorpp-main/res/drawable/blue_button.xml
similarity index 100%
rename from android-calculator-app/res/drawable/blue_button.xml
rename to calculatorpp-main/res/drawable/blue_button.xml
diff --git a/android-calculator-app/res/drawable/blue_button_dark.xml b/calculatorpp-main/res/drawable/blue_button_dark.xml
similarity index 100%
rename from android-calculator-app/res/drawable/blue_button_dark.xml
rename to calculatorpp-main/res/drawable/blue_button_dark.xml
diff --git a/android-calculator-app/res/drawable/metro_button_blue.xml b/calculatorpp-main/res/drawable/metro_button_blue.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_blue.xml
rename to calculatorpp-main/res/drawable/metro_button_blue.xml
diff --git a/android-calculator-app/res/drawable/metro_button_blue_shape.xml b/calculatorpp-main/res/drawable/metro_button_blue_shape.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_blue_shape.xml
rename to calculatorpp-main/res/drawable/metro_button_blue_shape.xml
diff --git a/android-calculator-app/res/drawable/metro_button_dark.xml b/calculatorpp-main/res/drawable/metro_button_dark.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_dark.xml
rename to calculatorpp-main/res/drawable/metro_button_dark.xml
diff --git a/android-calculator-app/res/drawable/metro_button_dark_shape.xml b/calculatorpp-main/res/drawable/metro_button_dark_shape.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_dark_shape.xml
rename to calculatorpp-main/res/drawable/metro_button_dark_shape.xml
diff --git a/android-calculator-app/res/drawable/metro_button_green.xml b/calculatorpp-main/res/drawable/metro_button_green.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_green.xml
rename to calculatorpp-main/res/drawable/metro_button_green.xml
diff --git a/android-calculator-app/res/drawable/metro_button_green_shape.xml b/calculatorpp-main/res/drawable/metro_button_green_shape.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_green_shape.xml
rename to calculatorpp-main/res/drawable/metro_button_green_shape.xml
diff --git a/android-calculator-app/res/drawable/metro_button_light.xml b/calculatorpp-main/res/drawable/metro_button_light.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_light.xml
rename to calculatorpp-main/res/drawable/metro_button_light.xml
diff --git a/android-calculator-app/res/drawable/metro_button_light_shape.xml b/calculatorpp-main/res/drawable/metro_button_light_shape.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_light_shape.xml
rename to calculatorpp-main/res/drawable/metro_button_light_shape.xml
diff --git a/android-calculator-app/res/drawable/metro_button_pressed.xml b/calculatorpp-main/res/drawable/metro_button_pressed.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_pressed.xml
rename to calculatorpp-main/res/drawable/metro_button_pressed.xml
diff --git a/android-calculator-app/res/drawable/metro_button_purple.xml b/calculatorpp-main/res/drawable/metro_button_purple.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_purple.xml
rename to calculatorpp-main/res/drawable/metro_button_purple.xml
diff --git a/android-calculator-app/res/drawable/metro_button_purple_shape.xml b/calculatorpp-main/res/drawable/metro_button_purple_shape.xml
similarity index 100%
rename from android-calculator-app/res/drawable/metro_button_purple_shape.xml
rename to calculatorpp-main/res/drawable/metro_button_purple_shape.xml
diff --git a/android-calculator-app/res/drawable/violet_button.xml b/calculatorpp-main/res/drawable/violet_button.xml
similarity index 100%
rename from android-calculator-app/res/drawable/violet_button.xml
rename to calculatorpp-main/res/drawable/violet_button.xml
diff --git a/android-calculator-app/res/drawable/violet_button_dark.xml b/calculatorpp-main/res/drawable/violet_button_dark.xml
similarity index 100%
rename from android-calculator-app/res/drawable/violet_button_dark.xml
rename to calculatorpp-main/res/drawable/violet_button_dark.xml
diff --git a/android-calculator-app/res/layout-land/main_calculator.xml b/calculatorpp-main/res/layout-land/main_calculator.xml
similarity index 100%
rename from android-calculator-app/res/layout-land/main_calculator.xml
rename to calculatorpp-main/res/layout-land/main_calculator.xml
diff --git a/android-calculator-app/res/layout-land/main_cellphone.xml b/calculatorpp-main/res/layout-land/main_cellphone.xml
similarity index 100%
rename from android-calculator-app/res/layout-land/main_cellphone.xml
rename to calculatorpp-main/res/layout-land/main_cellphone.xml
diff --git a/android-calculator-app/res/layout-port/main_calculator.xml b/calculatorpp-main/res/layout-port/main_calculator.xml
similarity index 100%
rename from android-calculator-app/res/layout-port/main_calculator.xml
rename to calculatorpp-main/res/layout-port/main_calculator.xml
diff --git a/android-calculator-app/res/layout-port/main_cellphone.xml b/calculatorpp-main/res/layout-port/main_cellphone.xml
similarity index 100%
rename from android-calculator-app/res/layout-port/main_cellphone.xml
rename to calculatorpp-main/res/layout-port/main_cellphone.xml
diff --git a/android-calculator-app/res/layout/about.xml b/calculatorpp-main/res/layout/about.xml
similarity index 100%
rename from android-calculator-app/res/layout/about.xml
rename to calculatorpp-main/res/layout/about.xml
diff --git a/android-calculator-app/res/layout/admob_pref.xml b/calculatorpp-main/res/layout/admob_pref.xml
similarity index 100%
rename from android-calculator-app/res/layout/admob_pref.xml
rename to calculatorpp-main/res/layout/admob_pref.xml
diff --git a/android-calculator-app/res/layout/calc_clear_button.xml b/calculatorpp-main/res/layout/calc_clear_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_clear_button.xml
rename to calculatorpp-main/res/layout/calc_clear_button.xml
diff --git a/android-calculator-app/res/layout/calc_copy_button.xml b/calculatorpp-main/res/layout/calc_copy_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_copy_button.xml
rename to calculatorpp-main/res/layout/calc_copy_button.xml
diff --git a/android-calculator-app/res/layout/calc_display.xml b/calculatorpp-main/res/layout/calc_display.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_display.xml
rename to calculatorpp-main/res/layout/calc_display.xml
diff --git a/android-calculator-app/res/layout/calc_division_button.xml b/calculatorpp-main/res/layout/calc_division_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_division_button.xml
rename to calculatorpp-main/res/layout/calc_division_button.xml
diff --git a/android-calculator-app/res/layout/calc_donate_button.xml b/calculatorpp-main/res/layout/calc_donate_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_donate_button.xml
rename to calculatorpp-main/res/layout/calc_donate_button.xml
diff --git a/android-calculator-app/res/layout/calc_dot_button.xml b/calculatorpp-main/res/layout/calc_dot_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_dot_button.xml
rename to calculatorpp-main/res/layout/calc_dot_button.xml
diff --git a/android-calculator-app/res/layout/calc_editor.xml b/calculatorpp-main/res/layout/calc_editor.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_editor.xml
rename to calculatorpp-main/res/layout/calc_editor.xml
diff --git a/android-calculator-app/res/layout/calc_eight_digit_button.xml b/calculatorpp-main/res/layout/calc_eight_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_eight_digit_button.xml
rename to calculatorpp-main/res/layout/calc_eight_digit_button.xml
diff --git a/android-calculator-app/res/layout/calc_empty_button.xml b/calculatorpp-main/res/layout/calc_empty_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_empty_button.xml
rename to calculatorpp-main/res/layout/calc_empty_button.xml
diff --git a/android-calculator-app/res/layout/calc_equals_button.xml b/calculatorpp-main/res/layout/calc_equals_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_equals_button.xml
rename to calculatorpp-main/res/layout/calc_equals_button.xml
diff --git a/android-calculator-app/res/layout/calc_erase_button.xml b/calculatorpp-main/res/layout/calc_erase_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_erase_button.xml
rename to calculatorpp-main/res/layout/calc_erase_button.xml
diff --git a/android-calculator-app/res/layout/calc_five_digit_button.xml b/calculatorpp-main/res/layout/calc_five_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_five_digit_button.xml
rename to calculatorpp-main/res/layout/calc_five_digit_button.xml
diff --git a/android-calculator-app/res/layout/calc_four_digit_button.xml b/calculatorpp-main/res/layout/calc_four_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_four_digit_button.xml
rename to calculatorpp-main/res/layout/calc_four_digit_button.xml
diff --git a/android-calculator-app/res/layout/calc_functions_button.xml b/calculatorpp-main/res/layout/calc_functions_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_functions_button.xml
rename to calculatorpp-main/res/layout/calc_functions_button.xml
diff --git a/android-calculator-app/res/layout/calc_history_button.xml b/calculatorpp-main/res/layout/calc_history_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_history_button.xml
rename to calculatorpp-main/res/layout/calc_history_button.xml
diff --git a/android-calculator-app/res/layout/calc_left_button.xml b/calculatorpp-main/res/layout/calc_left_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_left_button.xml
rename to calculatorpp-main/res/layout/calc_left_button.xml
diff --git a/android-calculator-app/res/layout/calc_multiplication_button.xml b/calculatorpp-main/res/layout/calc_multiplication_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_multiplication_button.xml
rename to calculatorpp-main/res/layout/calc_multiplication_button.xml
diff --git a/android-calculator-app/res/layout/calc_nine_digit_button.xml b/calculatorpp-main/res/layout/calc_nine_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_nine_digit_button.xml
rename to calculatorpp-main/res/layout/calc_nine_digit_button.xml
diff --git a/android-calculator-app/res/layout/calc_one_digit_button.xml b/calculatorpp-main/res/layout/calc_one_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_one_digit_button.xml
rename to calculatorpp-main/res/layout/calc_one_digit_button.xml
diff --git a/android-calculator-app/res/layout/calc_operators_button.xml b/calculatorpp-main/res/layout/calc_operators_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_operators_button.xml
rename to calculatorpp-main/res/layout/calc_operators_button.xml
diff --git a/android-calculator-app/res/layout/calc_paste_button.xml b/calculatorpp-main/res/layout/calc_paste_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_paste_button.xml
rename to calculatorpp-main/res/layout/calc_paste_button.xml
diff --git a/android-calculator-app/res/layout/calc_plot_view.xml b/calculatorpp-main/res/layout/calc_plot_view.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_plot_view.xml
rename to calculatorpp-main/res/layout/calc_plot_view.xml
diff --git a/android-calculator-app/res/layout/calc_plus_button.xml b/calculatorpp-main/res/layout/calc_plus_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_plus_button.xml
rename to calculatorpp-main/res/layout/calc_plus_button.xml
diff --git a/android-calculator-app/res/layout/calc_right_button.xml b/calculatorpp-main/res/layout/calc_right_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_right_button.xml
rename to calculatorpp-main/res/layout/calc_right_button.xml
diff --git a/android-calculator-app/res/layout/calc_round_brackets_button.xml b/calculatorpp-main/res/layout/calc_round_brackets_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_round_brackets_button.xml
rename to calculatorpp-main/res/layout/calc_round_brackets_button.xml
diff --git a/android-calculator-app/res/layout/calc_seven_digit_button.xml b/calculatorpp-main/res/layout/calc_seven_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_seven_digit_button.xml
rename to calculatorpp-main/res/layout/calc_seven_digit_button.xml
diff --git a/android-calculator-app/res/layout/calc_six_digit_button.xml b/calculatorpp-main/res/layout/calc_six_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_six_digit_button.xml
rename to calculatorpp-main/res/layout/calc_six_digit_button.xml
diff --git a/android-calculator-app/res/layout/calc_subtraction_button.xml b/calculatorpp-main/res/layout/calc_subtraction_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_subtraction_button.xml
rename to calculatorpp-main/res/layout/calc_subtraction_button.xml
diff --git a/android-calculator-app/res/layout/calc_three_digit_button.xml b/calculatorpp-main/res/layout/calc_three_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_three_digit_button.xml
rename to calculatorpp-main/res/layout/calc_three_digit_button.xml
diff --git a/android-calculator-app/res/layout/calc_title.xml b/calculatorpp-main/res/layout/calc_title.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_title.xml
rename to calculatorpp-main/res/layout/calc_title.xml
diff --git a/android-calculator-app/res/layout/calc_two_digit_button.xml b/calculatorpp-main/res/layout/calc_two_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_two_digit_button.xml
rename to calculatorpp-main/res/layout/calc_two_digit_button.xml
diff --git a/android-calculator-app/res/layout/calc_vars_button.xml b/calculatorpp-main/res/layout/calc_vars_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_vars_button.xml
rename to calculatorpp-main/res/layout/calc_vars_button.xml
diff --git a/android-calculator-app/res/layout/calc_zero_digit_button.xml b/calculatorpp-main/res/layout/calc_zero_digit_button.xml
similarity index 100%
rename from android-calculator-app/res/layout/calc_zero_digit_button.xml
rename to calculatorpp-main/res/layout/calc_zero_digit_button.xml
diff --git a/android-calculator-app/res/layout/display_error_message.xml b/calculatorpp-main/res/layout/display_error_message.xml
similarity index 100%
rename from android-calculator-app/res/layout/display_error_message.xml
rename to calculatorpp-main/res/layout/display_error_message.xml
diff --git a/android-calculator-app/res/layout/donate.xml b/calculatorpp-main/res/layout/donate.xml
similarity index 100%
rename from android-calculator-app/res/layout/donate.xml
rename to calculatorpp-main/res/layout/donate.xml
diff --git a/android-calculator-app/res/layout/drag_button_calibration.xml b/calculatorpp-main/res/layout/drag_button_calibration.xml
similarity index 100%
rename from android-calculator-app/res/layout/drag_button_calibration.xml
rename to calculatorpp-main/res/layout/drag_button_calibration.xml
diff --git a/android-calculator-app/res/layout/feedback.xml b/calculatorpp-main/res/layout/feedback.xml
similarity index 100%
rename from android-calculator-app/res/layout/feedback.xml
rename to calculatorpp-main/res/layout/feedback.xml
diff --git a/android-calculator-app/res/layout/help_faq.xml b/calculatorpp-main/res/layout/help_faq.xml
similarity index 100%
rename from android-calculator-app/res/layout/help_faq.xml
rename to calculatorpp-main/res/layout/help_faq.xml
diff --git a/android-calculator-app/res/layout/help_hints.xml b/calculatorpp-main/res/layout/help_hints.xml
similarity index 100%
rename from android-calculator-app/res/layout/help_hints.xml
rename to calculatorpp-main/res/layout/help_hints.xml
diff --git a/android-calculator-app/res/layout/help_screens.xml b/calculatorpp-main/res/layout/help_screens.xml
similarity index 100%
rename from android-calculator-app/res/layout/help_screens.xml
rename to calculatorpp-main/res/layout/help_screens.xml
diff --git a/android-calculator-app/res/layout/history.xml b/calculatorpp-main/res/layout/history.xml
similarity index 100%
rename from android-calculator-app/res/layout/history.xml
rename to calculatorpp-main/res/layout/history.xml
diff --git a/android-calculator-app/res/layout/history_activity.xml b/calculatorpp-main/res/layout/history_activity.xml
similarity index 100%
rename from android-calculator-app/res/layout/history_activity.xml
rename to calculatorpp-main/res/layout/history_activity.xml
diff --git a/android-calculator-app/res/layout/history_edit.xml b/calculatorpp-main/res/layout/history_edit.xml
similarity index 100%
rename from android-calculator-app/res/layout/history_edit.xml
rename to calculatorpp-main/res/layout/history_edit.xml
diff --git a/android-calculator-app/res/layout/math_entities.xml b/calculatorpp-main/res/layout/math_entities.xml
similarity index 100%
rename from android-calculator-app/res/layout/math_entities.xml
rename to calculatorpp-main/res/layout/math_entities.xml
diff --git a/android-calculator-app/res/layout/math_entity.xml b/calculatorpp-main/res/layout/math_entity.xml
similarity index 100%
rename from android-calculator-app/res/layout/math_entity.xml
rename to calculatorpp-main/res/layout/math_entity.xml
diff --git a/android-calculator-app/res/layout/release_notes.xml b/calculatorpp-main/res/layout/release_notes.xml
similarity index 100%
rename from android-calculator-app/res/layout/release_notes.xml
rename to calculatorpp-main/res/layout/release_notes.xml
diff --git a/android-calculator-app/res/layout/saved_history.xml b/calculatorpp-main/res/layout/saved_history.xml
similarity index 100%
rename from android-calculator-app/res/layout/saved_history.xml
rename to calculatorpp-main/res/layout/saved_history.xml
diff --git a/android-calculator-app/res/layout/tabs.xml b/calculatorpp-main/res/layout/tabs.xml
similarity index 100%
rename from android-calculator-app/res/layout/tabs.xml
rename to calculatorpp-main/res/layout/tabs.xml
diff --git a/android-calculator-app/res/layout/var_edit.xml b/calculatorpp-main/res/layout/var_edit.xml
similarity index 100%
rename from android-calculator-app/res/layout/var_edit.xml
rename to calculatorpp-main/res/layout/var_edit.xml
diff --git a/android-calculator-app/res/layout/vars.xml b/calculatorpp-main/res/layout/vars.xml
similarity index 100%
rename from android-calculator-app/res/layout/vars.xml
rename to calculatorpp-main/res/layout/vars.xml
diff --git a/android-calculator-app/res/menu/history_menu.xml b/calculatorpp-main/res/menu/history_menu.xml
similarity index 100%
rename from android-calculator-app/res/menu/history_menu.xml
rename to calculatorpp-main/res/menu/history_menu.xml
diff --git a/android-calculator-app/res/menu/main_menu.xml b/calculatorpp-main/res/menu/main_menu.xml
similarity index 100%
rename from android-calculator-app/res/menu/main_menu.xml
rename to calculatorpp-main/res/menu/main_menu.xml
diff --git a/android-calculator-app/res/menu/var_menu.xml b/calculatorpp-main/res/menu/var_menu.xml
similarity index 100%
rename from android-calculator-app/res/menu/var_menu.xml
rename to calculatorpp-main/res/menu/var_menu.xml
diff --git a/android-calculator-app/res/values-es/text_about.xml b/calculatorpp-main/res/values-es/text_about.xml
similarity index 100%
rename from android-calculator-app/res/values-es/text_about.xml
rename to calculatorpp-main/res/values-es/text_about.xml
diff --git a/android-calculator-app/res/values-es/text_donate.xml b/calculatorpp-main/res/values-es/text_donate.xml
similarity index 100%
rename from android-calculator-app/res/values-es/text_donate.xml
rename to calculatorpp-main/res/values-es/text_donate.xml
diff --git a/android-calculator-app/res/values-es/text_functions.xml b/calculatorpp-main/res/values-es/text_functions.xml
similarity index 100%
rename from android-calculator-app/res/values-es/text_functions.xml
rename to calculatorpp-main/res/values-es/text_functions.xml
diff --git a/android-calculator-app/res/values-es/text_help.xml b/calculatorpp-main/res/values-es/text_help.xml
similarity index 100%
rename from android-calculator-app/res/values-es/text_help.xml
rename to calculatorpp-main/res/values-es/text_help.xml
diff --git a/android-calculator-app/res/values-es/text_operators.xml b/calculatorpp-main/res/values-es/text_operators.xml
similarity index 100%
rename from android-calculator-app/res/values-es/text_operators.xml
rename to calculatorpp-main/res/values-es/text_operators.xml
diff --git a/android-calculator-app/res/values-es/text_strings.xml b/calculatorpp-main/res/values-es/text_strings.xml
similarity index 100%
rename from android-calculator-app/res/values-es/text_strings.xml
rename to calculatorpp-main/res/values-es/text_strings.xml
diff --git a/android-calculator-app/res/values-es/text_vars.xml b/calculatorpp-main/res/values-es/text_vars.xml
similarity index 100%
rename from android-calculator-app/res/values-es/text_vars.xml
rename to calculatorpp-main/res/values-es/text_vars.xml
diff --git a/android-calculator-app/res/values-hdpi/styles.xml b/calculatorpp-main/res/values-hdpi/styles.xml
similarity index 100%
rename from android-calculator-app/res/values-hdpi/styles.xml
rename to calculatorpp-main/res/values-hdpi/styles.xml
diff --git a/android-calculator-app/res/values-it/text_about.xml b/calculatorpp-main/res/values-it/text_about.xml
similarity index 100%
rename from android-calculator-app/res/values-it/text_about.xml
rename to calculatorpp-main/res/values-it/text_about.xml
diff --git a/android-calculator-app/res/values-it/text_donate.xml b/calculatorpp-main/res/values-it/text_donate.xml
similarity index 100%
rename from android-calculator-app/res/values-it/text_donate.xml
rename to calculatorpp-main/res/values-it/text_donate.xml
diff --git a/android-calculator-app/res/values-it/text_functions.xml b/calculatorpp-main/res/values-it/text_functions.xml
similarity index 100%
rename from android-calculator-app/res/values-it/text_functions.xml
rename to calculatorpp-main/res/values-it/text_functions.xml
diff --git a/android-calculator-app/res/values-it/text_help.xml b/calculatorpp-main/res/values-it/text_help.xml
similarity index 100%
rename from android-calculator-app/res/values-it/text_help.xml
rename to calculatorpp-main/res/values-it/text_help.xml
diff --git a/android-calculator-app/res/values-it/text_operators.xml b/calculatorpp-main/res/values-it/text_operators.xml
similarity index 100%
rename from android-calculator-app/res/values-it/text_operators.xml
rename to calculatorpp-main/res/values-it/text_operators.xml
diff --git a/android-calculator-app/res/values-it/text_strings.xml b/calculatorpp-main/res/values-it/text_strings.xml
similarity index 100%
rename from android-calculator-app/res/values-it/text_strings.xml
rename to calculatorpp-main/res/values-it/text_strings.xml
diff --git a/android-calculator-app/res/values-it/text_vars.xml b/calculatorpp-main/res/values-it/text_vars.xml
similarity index 100%
rename from android-calculator-app/res/values-it/text_vars.xml
rename to calculatorpp-main/res/values-it/text_vars.xml
diff --git a/android-calculator-app/res/values-ldpi/styles.xml b/calculatorpp-main/res/values-ldpi/styles.xml
similarity index 100%
rename from android-calculator-app/res/values-ldpi/styles.xml
rename to calculatorpp-main/res/values-ldpi/styles.xml
diff --git a/android-calculator-app/res/values-mdpi/styles.xml b/calculatorpp-main/res/values-mdpi/styles.xml
similarity index 100%
rename from android-calculator-app/res/values-mdpi/styles.xml
rename to calculatorpp-main/res/values-mdpi/styles.xml
diff --git a/android-calculator-app/res/values-ru/text_about.xml b/calculatorpp-main/res/values-ru/text_about.xml
similarity index 100%
rename from android-calculator-app/res/values-ru/text_about.xml
rename to calculatorpp-main/res/values-ru/text_about.xml
diff --git a/android-calculator-app/res/values-ru/text_donate.xml b/calculatorpp-main/res/values-ru/text_donate.xml
similarity index 100%
rename from android-calculator-app/res/values-ru/text_donate.xml
rename to calculatorpp-main/res/values-ru/text_donate.xml
diff --git a/android-calculator-app/res/values-ru/text_functions.xml b/calculatorpp-main/res/values-ru/text_functions.xml
similarity index 100%
rename from android-calculator-app/res/values-ru/text_functions.xml
rename to calculatorpp-main/res/values-ru/text_functions.xml
diff --git a/android-calculator-app/res/values-ru/text_help.xml b/calculatorpp-main/res/values-ru/text_help.xml
similarity index 100%
rename from android-calculator-app/res/values-ru/text_help.xml
rename to calculatorpp-main/res/values-ru/text_help.xml
diff --git a/android-calculator-app/res/values-ru/text_messages.xml b/calculatorpp-main/res/values-ru/text_messages.xml
similarity index 100%
rename from android-calculator-app/res/values-ru/text_messages.xml
rename to calculatorpp-main/res/values-ru/text_messages.xml
diff --git a/android-calculator-app/res/values-ru/text_operators.xml b/calculatorpp-main/res/values-ru/text_operators.xml
similarity index 100%
rename from android-calculator-app/res/values-ru/text_operators.xml
rename to calculatorpp-main/res/values-ru/text_operators.xml
diff --git a/android-calculator-app/res/values-ru/text_strings.xml b/calculatorpp-main/res/values-ru/text_strings.xml
similarity index 100%
rename from android-calculator-app/res/values-ru/text_strings.xml
rename to calculatorpp-main/res/values-ru/text_strings.xml
diff --git a/android-calculator-app/res/values-ru/text_vars.xml b/calculatorpp-main/res/values-ru/text_vars.xml
similarity index 100%
rename from android-calculator-app/res/values-ru/text_vars.xml
rename to calculatorpp-main/res/values-ru/text_vars.xml
diff --git a/android-calculator-app/res/values-xhdpi/styles.xml b/calculatorpp-main/res/values-xhdpi/styles.xml
similarity index 100%
rename from android-calculator-app/res/values-xhdpi/styles.xml
rename to calculatorpp-main/res/values-xhdpi/styles.xml
diff --git a/android-calculator-app/res/values/arrays.xml b/calculatorpp-main/res/values/arrays.xml
similarity index 100%
rename from android-calculator-app/res/values/arrays.xml
rename to calculatorpp-main/res/values/arrays.xml
diff --git a/android-calculator-app/res/values/attributes.xml b/calculatorpp-main/res/values/attributes.xml
similarity index 100%
rename from android-calculator-app/res/values/attributes.xml
rename to calculatorpp-main/res/values/attributes.xml
diff --git a/android-calculator-app/res/values/colors.xml b/calculatorpp-main/res/values/colors.xml
similarity index 100%
rename from android-calculator-app/res/values/colors.xml
rename to calculatorpp-main/res/values/colors.xml
diff --git a/android-calculator-app/res/values/preferences.xml b/calculatorpp-main/res/values/preferences.xml
similarity index 100%
rename from android-calculator-app/res/values/preferences.xml
rename to calculatorpp-main/res/values/preferences.xml
diff --git a/android-calculator-app/res/values/styles-common-history.xml b/calculatorpp-main/res/values/styles-common-history.xml
similarity index 100%
rename from android-calculator-app/res/values/styles-common-history.xml
rename to calculatorpp-main/res/values/styles-common-history.xml
diff --git a/android-calculator-app/res/values/styles-common-var.xml b/calculatorpp-main/res/values/styles-common-var.xml
similarity index 100%
rename from android-calculator-app/res/values/styles-common-var.xml
rename to calculatorpp-main/res/values/styles-common-var.xml
diff --git a/android-calculator-app/res/values/styles-common.xml b/calculatorpp-main/res/values/styles-common.xml
similarity index 100%
rename from android-calculator-app/res/values/styles-common.xml
rename to calculatorpp-main/res/values/styles-common.xml
diff --git a/android-calculator-app/res/values/styles-default-theme.xml b/calculatorpp-main/res/values/styles-default-theme.xml
similarity index 100%
rename from android-calculator-app/res/values/styles-default-theme.xml
rename to calculatorpp-main/res/values/styles-default-theme.xml
diff --git a/android-calculator-app/res/values/styles-light-blue-theme.xml b/calculatorpp-main/res/values/styles-light-blue-theme.xml
similarity index 100%
rename from android-calculator-app/res/values/styles-light-blue-theme.xml
rename to calculatorpp-main/res/values/styles-light-blue-theme.xml
diff --git a/android-calculator-app/res/values/styles-metro-blue-theme.xml b/calculatorpp-main/res/values/styles-metro-blue-theme.xml
similarity index 100%
rename from android-calculator-app/res/values/styles-metro-blue-theme.xml
rename to calculatorpp-main/res/values/styles-metro-blue-theme.xml
diff --git a/android-calculator-app/res/values/styles-metro-green-theme.xml b/calculatorpp-main/res/values/styles-metro-green-theme.xml
similarity index 100%
rename from android-calculator-app/res/values/styles-metro-green-theme.xml
rename to calculatorpp-main/res/values/styles-metro-green-theme.xml
diff --git a/android-calculator-app/res/values/styles-metro-purple-theme.xml b/calculatorpp-main/res/values/styles-metro-purple-theme.xml
similarity index 100%
rename from android-calculator-app/res/values/styles-metro-purple-theme.xml
rename to calculatorpp-main/res/values/styles-metro-purple-theme.xml
diff --git a/android-calculator-app/res/values/styles-violet-theme.xml b/calculatorpp-main/res/values/styles-violet-theme.xml
similarity index 100%
rename from android-calculator-app/res/values/styles-violet-theme.xml
rename to calculatorpp-main/res/values/styles-violet-theme.xml
diff --git a/android-calculator-app/res/values/styles.xml b/calculatorpp-main/res/values/styles.xml
similarity index 100%
rename from android-calculator-app/res/values/styles.xml
rename to calculatorpp-main/res/values/styles.xml
diff --git a/android-calculator-app/res/values/text_about.xml b/calculatorpp-main/res/values/text_about.xml
similarity index 100%
rename from android-calculator-app/res/values/text_about.xml
rename to calculatorpp-main/res/values/text_about.xml
diff --git a/android-calculator-app/res/values/text_donate.xml b/calculatorpp-main/res/values/text_donate.xml
similarity index 100%
rename from android-calculator-app/res/values/text_donate.xml
rename to calculatorpp-main/res/values/text_donate.xml
diff --git a/android-calculator-app/res/values/text_functions.xml b/calculatorpp-main/res/values/text_functions.xml
similarity index 100%
rename from android-calculator-app/res/values/text_functions.xml
rename to calculatorpp-main/res/values/text_functions.xml
diff --git a/android-calculator-app/res/values/text_help.xml b/calculatorpp-main/res/values/text_help.xml
similarity index 100%
rename from android-calculator-app/res/values/text_help.xml
rename to calculatorpp-main/res/values/text_help.xml
diff --git a/android-calculator-app/res/values/text_messages.xml b/calculatorpp-main/res/values/text_messages.xml
similarity index 100%
rename from android-calculator-app/res/values/text_messages.xml
rename to calculatorpp-main/res/values/text_messages.xml
diff --git a/android-calculator-app/res/values/text_operators.xml b/calculatorpp-main/res/values/text_operators.xml
similarity index 100%
rename from android-calculator-app/res/values/text_operators.xml
rename to calculatorpp-main/res/values/text_operators.xml
diff --git a/android-calculator-app/res/values/text_strings.xml b/calculatorpp-main/res/values/text_strings.xml
similarity index 100%
rename from android-calculator-app/res/values/text_strings.xml
rename to calculatorpp-main/res/values/text_strings.xml
diff --git a/android-calculator-app/res/values/text_vars.xml b/calculatorpp-main/res/values/text_vars.xml
similarity index 100%
rename from android-calculator-app/res/values/text_vars.xml
rename to calculatorpp-main/res/values/text_vars.xml
diff --git a/android-calculator-app/res/xml/preferences.xml b/calculatorpp-main/res/xml/preferences.xml
similarity index 100%
rename from android-calculator-app/res/xml/preferences.xml
rename to calculatorpp-main/res/xml/preferences.xml
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorAdditionalTitle.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorAdditionalTitle.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorAdditionalTitle.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorAdditionalTitle.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorBillingObserver.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorBillingObserver.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorBillingObserver.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorBillingObserver.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorModel.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/ICalculatorDisplay.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/ICalculatorDisplay.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/ICalculatorDisplay.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/ICalculatorDisplay.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/help/AbstractHelpActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/AbstractHelpActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/help/AbstractHelpActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/AbstractHelpActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/help/HelpFaqActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/HelpFaqActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/help/HelpFaqActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/HelpFaqActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/help/HelpHintsActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/HelpHintsActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/help/HelpHintsActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/HelpHintsActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/help/HelpScreensActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/HelpScreensActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/help/HelpScreensActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/help/HelpScreensActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/Editor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/Editor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/Editor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/Editor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/History.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/History.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/History.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/History.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryActivityTab.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryActivityTab.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryActivityTab.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryActivityTab.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/SavedHistoryActivityTab.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/SavedHistoryActivityTab.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/SavedHistoryActivityTab.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/SavedHistoryActivityTab.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/MathType.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/MathType.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/MathType.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/MathType.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/FunctionEditorSaver.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/FunctionEditorSaver.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/FunctionEditorSaver.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/FunctionEditorSaver.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AFunction.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AFunction.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AFunction.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AFunction.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AbstractAndroidMathRegistry.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AbstractAndroidMathRegistry.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AbstractAndroidMathRegistry.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AbstractAndroidMathRegistry.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AbstractNumberBuilder.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidFunctionsMathRegistry.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidFunctionsMathRegistry.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidFunctionsMathRegistry.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidFunctionsMathRegistry.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidMathRegistry.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidMathRegistry.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidMathRegistry.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidMathRegistry.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidOperatorsMathRegistry.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidOperatorsMathRegistry.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidOperatorsMathRegistry.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidOperatorsMathRegistry.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidPostfixFunctionsRegistry.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidPostfixFunctionsRegistry.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidPostfixFunctionsRegistry.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidPostfixFunctionsRegistry.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidVarsRegistryImpl.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidVarsRegistryImpl.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/AndroidVarsRegistryImpl.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/AndroidVarsRegistryImpl.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/CalculatorEvalException.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/CalculatorEvalException.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/CalculatorEvalException.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/CalculatorEvalException.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/CalculatorParseException.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/CalculatorParseException.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/CalculatorParseException.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/CalculatorParseException.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/DummyTextProcessor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/DummyTextProcessor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/DummyTextProcessor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/DummyTextProcessor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/Functions.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/Functions.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/Functions.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/Functions.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/LiteNumberBuilder.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/LiteNumberBuilder.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/LiteNumberBuilder.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/LiteNumberBuilder.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/MathEntityPersistenceContainer.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/MathEntityPersistenceContainer.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/MathEntityPersistenceContainer.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/MathEntityPersistenceContainer.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/MathPersistenceEntity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/MathPersistenceEntity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/MathPersistenceEntity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/MathPersistenceEntity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/Messages.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/Messages.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/Messages.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/Messages.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/NumberBuilder.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/NumberBuilder.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/NumberBuilder.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/NumberBuilder.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/PreparedExpression.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/PreparedExpression.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/PreparedExpression.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/PreparedExpression.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/TextProcessor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/TextProcessor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/TextProcessor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/TextProcessor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/ToJsclTextProcessor.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/ToJsclTextProcessor.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/ToJsclTextProcessor.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/ToJsclTextProcessor.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/Var.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/Var.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/Var.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/Var.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/VarCategory.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/VarCategory.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/VarCategory.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/VarCategory.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/model/Vars.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/Vars.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/model/Vars.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/model/Vars.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
diff --git a/android-calculator-app/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java b/calculatorpp-main/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java
similarity index 100%
rename from android-calculator-app/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java
rename to calculatorpp-main/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java
diff --git a/android-calculator-app/src/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip b/calculatorpp-main/src/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
similarity index 100%
rename from android-calculator-app/src/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
rename to calculatorpp-main/src/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
diff --git a/android-calculator-app/src/misc/doc/achartengine-0.7.0-javadocs.zip b/calculatorpp-main/src/misc/doc/achartengine-0.7.0-javadocs.zip
similarity index 100%
rename from android-calculator-app/src/misc/doc/achartengine-0.7.0-javadocs.zip
rename to calculatorpp-main/src/misc/doc/achartengine-0.7.0-javadocs.zip
diff --git a/android-calculator-app/src/misc/env/env.properties b/calculatorpp-main/src/misc/env/env.properties
similarity index 100%
rename from android-calculator-app/src/misc/env/env.properties
rename to calculatorpp-main/src/misc/env/env.properties
diff --git a/android-calculator-app/src/misc/env/jarsigner.properties b/calculatorpp-main/src/misc/env/jarsigner.properties
similarity index 100%
rename from android-calculator-app/src/misc/env/jarsigner.properties
rename to calculatorpp-main/src/misc/env/jarsigner.properties
diff --git a/android-calculator-app/src/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar b/calculatorpp-main/src/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
similarity index 100%
rename from android-calculator-app/src/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
rename to calculatorpp-main/src/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
diff --git a/android-calculator-app/src/misc/lib/achartengine-0.7.0.jar b/calculatorpp-main/src/misc/lib/achartengine-0.7.0.jar
similarity index 100%
rename from android-calculator-app/src/misc/lib/achartengine-0.7.0.jar
rename to calculatorpp-main/src/misc/lib/achartengine-0.7.0.jar
diff --git a/android-calculator-app/src/misc/res/Backup_of_logo.cdr b/calculatorpp-main/src/misc/res/Backup_of_logo.cdr
similarity index 100%
rename from android-calculator-app/src/misc/res/Backup_of_logo.cdr
rename to calculatorpp-main/src/misc/res/Backup_of_logo.cdr
diff --git a/android-calculator-app/src/misc/res/calculatorpp/01_main_screen_port.png b/calculatorpp-main/src/misc/res/calculatorpp/01_main_screen_port.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/01_main_screen_port.png
rename to calculatorpp-main/src/misc/res/calculatorpp/01_main_screen_port.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/01_main_screen_port_sm.png b/calculatorpp-main/src/misc/res/calculatorpp/01_main_screen_port_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/01_main_screen_port_sm.png
rename to calculatorpp-main/src/misc/res/calculatorpp/01_main_screen_port_sm.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/02_main_screen_land.png b/calculatorpp-main/src/misc/res/calculatorpp/02_main_screen_land.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/02_main_screen_land.png
rename to calculatorpp-main/src/misc/res/calculatorpp/02_main_screen_land.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/03_main_screen_port_with_expression.png b/calculatorpp-main/src/misc/res/calculatorpp/03_main_screen_port_with_expression.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/03_main_screen_port_with_expression.png
rename to calculatorpp-main/src/misc/res/calculatorpp/03_main_screen_port_with_expression.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/04_plot_graph_menu.png b/calculatorpp-main/src/misc/res/calculatorpp/04_plot_graph_menu.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/04_plot_graph_menu.png
rename to calculatorpp-main/src/misc/res/calculatorpp/04_plot_graph_menu.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/04_plot_graph_menu_sm.png b/calculatorpp-main/src/misc/res/calculatorpp/04_plot_graph_menu_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/04_plot_graph_menu_sm.png
rename to calculatorpp-main/src/misc/res/calculatorpp/04_plot_graph_menu_sm.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/05_graph_screen.png b/calculatorpp-main/src/misc/res/calculatorpp/05_graph_screen.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/05_graph_screen.png
rename to calculatorpp-main/src/misc/res/calculatorpp/05_graph_screen.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/05_graph_screen_sm.png b/calculatorpp-main/src/misc/res/calculatorpp/05_graph_screen_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/05_graph_screen_sm.png
rename to calculatorpp-main/src/misc/res/calculatorpp/05_graph_screen_sm.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/06_constants_screen.png b/calculatorpp-main/src/misc/res/calculatorpp/06_constants_screen.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/06_constants_screen.png
rename to calculatorpp-main/src/misc/res/calculatorpp/06_constants_screen.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/06_constants_screen_sm.png b/calculatorpp-main/src/misc/res/calculatorpp/06_constants_screen_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/06_constants_screen_sm.png
rename to calculatorpp-main/src/misc/res/calculatorpp/06_constants_screen_sm.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/07_constant_create_dialog.png b/calculatorpp-main/src/misc/res/calculatorpp/07_constant_create_dialog.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/07_constant_create_dialog.png
rename to calculatorpp-main/src/misc/res/calculatorpp/07_constant_create_dialog.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/08_constants_context_menu.png b/calculatorpp-main/src/misc/res/calculatorpp/08_constants_context_menu.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/08_constants_context_menu.png
rename to calculatorpp-main/src/misc/res/calculatorpp/08_constants_context_menu.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/09_functions_screen.png b/calculatorpp-main/src/misc/res/calculatorpp/09_functions_screen.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/09_functions_screen.png
rename to calculatorpp-main/src/misc/res/calculatorpp/09_functions_screen.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/09_functions_screen_sm.png b/calculatorpp-main/src/misc/res/calculatorpp/09_functions_screen_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/09_functions_screen_sm.png
rename to calculatorpp-main/src/misc/res/calculatorpp/09_functions_screen_sm.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/10_history_screen.png b/calculatorpp-main/src/misc/res/calculatorpp/10_history_screen.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/10_history_screen.png
rename to calculatorpp-main/src/misc/res/calculatorpp/10_history_screen.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/10_history_screen_sm.png b/calculatorpp-main/src/misc/res/calculatorpp/10_history_screen_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/10_history_screen_sm.png
rename to calculatorpp-main/src/misc/res/calculatorpp/10_history_screen_sm.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/11_history_item_context_menu.png b/calculatorpp-main/src/misc/res/calculatorpp/11_history_item_context_menu.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/11_history_item_context_menu.png
rename to calculatorpp-main/src/misc/res/calculatorpp/11_history_item_context_menu.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/12_saved_history_tab.png b/calculatorpp-main/src/misc/res/calculatorpp/12_saved_history_tab.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/12_saved_history_tab.png
rename to calculatorpp-main/src/misc/res/calculatorpp/12_saved_history_tab.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/13_saved_history_item_context_menu.png b/calculatorpp-main/src/misc/res/calculatorpp/13_saved_history_item_context_menu.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/13_saved_history_item_context_menu.png
rename to calculatorpp-main/src/misc/res/calculatorpp/13_saved_history_item_context_menu.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/14_about_screen.png b/calculatorpp-main/src/misc/res/calculatorpp/14_about_screen.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/14_about_screen.png
rename to calculatorpp-main/src/misc/res/calculatorpp/14_about_screen.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/14_about_screen_sm.png b/calculatorpp-main/src/misc/res/calculatorpp/14_about_screen_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/14_about_screen_sm.png
rename to calculatorpp-main/src/misc/res/calculatorpp/14_about_screen_sm.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/15_release_notes_tab.png b/calculatorpp-main/src/misc/res/calculatorpp/15_release_notes_tab.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/15_release_notes_tab.png
rename to calculatorpp-main/src/misc/res/calculatorpp/15_release_notes_tab.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/16_help_screen.png b/calculatorpp-main/src/misc/res/calculatorpp/16_help_screen.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/16_help_screen.png
rename to calculatorpp-main/src/misc/res/calculatorpp/16_help_screen.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/16_help_screen_sm.png b/calculatorpp-main/src/misc/res/calculatorpp/16_help_screen_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/16_help_screen_sm.png
rename to calculatorpp-main/src/misc/res/calculatorpp/16_help_screen_sm.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/17_hints_tab.png b/calculatorpp-main/src/misc/res/calculatorpp/17_hints_tab.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/17_hints_tab.png
rename to calculatorpp-main/src/misc/res/calculatorpp/17_hints_tab.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/18_preferences.png b/calculatorpp-main/src/misc/res/calculatorpp/18_preferences.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/18_preferences.png
rename to calculatorpp-main/src/misc/res/calculatorpp/18_preferences.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/18_preferences_02.png b/calculatorpp-main/src/misc/res/calculatorpp/18_preferences_02.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/18_preferences_02.png
rename to calculatorpp-main/src/misc/res/calculatorpp/18_preferences_02.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/18_preferences_03.png b/calculatorpp-main/src/misc/res/calculatorpp/18_preferences_03.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/18_preferences_03.png
rename to calculatorpp-main/src/misc/res/calculatorpp/18_preferences_03.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/18_preferences_sm.png b/calculatorpp-main/src/misc/res/calculatorpp/18_preferences_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/18_preferences_sm.png
rename to calculatorpp-main/src/misc/res/calculatorpp/18_preferences_sm.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/plan.png b/calculatorpp-main/src/misc/res/calculatorpp/plan.png
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/plan.png
rename to calculatorpp-main/src/misc/res/calculatorpp/plan.png
diff --git a/android-calculator-app/src/misc/res/calculatorpp/plan.xcf b/calculatorpp-main/src/misc/res/calculatorpp/plan.xcf
similarity index 100%
rename from android-calculator-app/src/misc/res/calculatorpp/plan.xcf
rename to calculatorpp-main/src/misc/res/calculatorpp/plan.xcf
diff --git a/android-calculator-app/src/misc/res/header.png b/calculatorpp-main/src/misc/res/header.png
similarity index 100%
rename from android-calculator-app/src/misc/res/header.png
rename to calculatorpp-main/src/misc/res/header.png
diff --git a/android-calculator-app/src/misc/res/header_bg.png b/calculatorpp-main/src/misc/res/header_bg.png
similarity index 100%
rename from android-calculator-app/src/misc/res/header_bg.png
rename to calculatorpp-main/src/misc/res/header_bg.png
diff --git a/android-calculator-app/src/misc/res/header_sm.png b/calculatorpp-main/src/misc/res/header_sm.png
similarity index 100%
rename from android-calculator-app/src/misc/res/header_sm.png
rename to calculatorpp-main/src/misc/res/header_sm.png
diff --git a/android-calculator-app/src/misc/res/heart_original.png b/calculatorpp-main/src/misc/res/heart_original.png
similarity index 100%
rename from android-calculator-app/src/misc/res/heart_original.png
rename to calculatorpp-main/src/misc/res/heart_original.png
diff --git a/android-calculator-app/src/misc/res/icon.png b/calculatorpp-main/src/misc/res/icon.png
similarity index 100%
rename from android-calculator-app/src/misc/res/icon.png
rename to calculatorpp-main/src/misc/res/icon.png
diff --git a/android-calculator-app/src/misc/res/icon_favicon_light_blue.ico b/calculatorpp-main/src/misc/res/icon_favicon_light_blue.ico
similarity index 100%
rename from android-calculator-app/src/misc/res/icon_favicon_light_blue.ico
rename to calculatorpp-main/src/misc/res/icon_favicon_light_blue.ico
diff --git a/android-calculator-app/src/misc/res/icon_favicon_light_blue.png b/calculatorpp-main/src/misc/res/icon_favicon_light_blue.png
similarity index 100%
rename from android-calculator-app/src/misc/res/icon_favicon_light_blue.png
rename to calculatorpp-main/src/misc/res/icon_favicon_light_blue.png
diff --git a/android-calculator-app/src/misc/res/icon_favicon_purple.ico b/calculatorpp-main/src/misc/res/icon_favicon_purple.ico
similarity index 100%
rename from android-calculator-app/src/misc/res/icon_favicon_purple.ico
rename to calculatorpp-main/src/misc/res/icon_favicon_purple.ico
diff --git a/android-calculator-app/src/misc/res/icon_small.png b/calculatorpp-main/src/misc/res/icon_small.png
similarity index 100%
rename from android-calculator-app/src/misc/res/icon_small.png
rename to calculatorpp-main/src/misc/res/icon_small.png
diff --git a/android-calculator-app/src/misc/res/log11o.psd b/calculatorpp-main/src/misc/res/log11o.psd
similarity index 100%
rename from android-calculator-app/src/misc/res/log11o.psd
rename to calculatorpp-main/src/misc/res/log11o.psd
diff --git a/android-calculator-app/src/misc/res/logo.cdr b/calculatorpp-main/src/misc/res/logo.cdr
similarity index 100%
rename from android-calculator-app/src/misc/res/logo.cdr
rename to calculatorpp-main/src/misc/res/logo.cdr
diff --git a/android-calculator-app/src/misc/res/logo.png b/calculatorpp-main/src/misc/res/logo.png
similarity index 100%
rename from android-calculator-app/src/misc/res/logo.png
rename to calculatorpp-main/src/misc/res/logo.png
diff --git a/android-calculator-app/src/misc/res/logoFULL copy.png b/calculatorpp-main/src/misc/res/logoFULL copy.png
similarity index 100%
rename from android-calculator-app/src/misc/res/logoFULL copy.png
rename to calculatorpp-main/src/misc/res/logoFULL copy.png
diff --git a/android-calculator-app/src/misc/res/logoFULL.pdf b/calculatorpp-main/src/misc/res/logoFULL.pdf
similarity index 100%
rename from android-calculator-app/src/misc/res/logoFULL.pdf
rename to calculatorpp-main/src/misc/res/logoFULL.pdf
diff --git a/android-calculator-app/src/misc/res/logoFULL.png b/calculatorpp-main/src/misc/res/logoFULL.png
similarity index 100%
rename from android-calculator-app/src/misc/res/logoFULL.png
rename to calculatorpp-main/src/misc/res/logoFULL.png
diff --git a/android-calculator-app/src/misc/res/logoFULL_banner.png b/calculatorpp-main/src/misc/res/logoFULL_banner.png
similarity index 100%
rename from android-calculator-app/src/misc/res/logoFULL_banner.png
rename to calculatorpp-main/src/misc/res/logoFULL_banner.png
diff --git a/android-calculator-app/src/misc/res/logoFULL_small.png b/calculatorpp-main/src/misc/res/logoFULL_small.png
similarity index 100%
rename from android-calculator-app/src/misc/res/logoFULL_small.png
rename to calculatorpp-main/src/misc/res/logoFULL_small.png
diff --git a/android-calculator-app/src/misc/res/logo_black.png b/calculatorpp-main/src/misc/res/logo_black.png
similarity index 100%
rename from android-calculator-app/src/misc/res/logo_black.png
rename to calculatorpp-main/src/misc/res/logo_black.png
diff --git a/android-calculator-app/src/misc/res/logo_blue.png b/calculatorpp-main/src/misc/res/logo_blue.png
similarity index 100%
rename from android-calculator-app/src/misc/res/logo_blue.png
rename to calculatorpp-main/src/misc/res/logo_blue.png
diff --git a/android-calculator-app/src/misc/res/logo_light_blue.png b/calculatorpp-main/src/misc/res/logo_light_blue.png
similarity index 100%
rename from android-calculator-app/src/misc/res/logo_light_blue.png
rename to calculatorpp-main/src/misc/res/logo_light_blue.png
diff --git a/android-calculator-app/src/misc/res/logo_purple.png b/calculatorpp-main/src/misc/res/logo_purple.png
similarity index 100%
rename from android-calculator-app/src/misc/res/logo_purple.png
rename to calculatorpp-main/src/misc/res/logo_purple.png
diff --git a/android-calculator-app/src/misc/res/promo_logo.png b/calculatorpp-main/src/misc/res/promo_logo.png
similarity index 100%
rename from android-calculator-app/src/misc/res/promo_logo.png
rename to calculatorpp-main/src/misc/res/promo_logo.png
diff --git a/android-calculator-app/src/misc/res/text_logo.png b/calculatorpp-main/src/misc/res/text_logo.png
similarity index 100%
rename from android-calculator-app/src/misc/res/text_logo.png
rename to calculatorpp-main/src/misc/res/text_logo.png
diff --git a/android-calculator-app/src/misc/res/text_logo_blue.png b/calculatorpp-main/src/misc/res/text_logo_blue.png
similarity index 100%
rename from android-calculator-app/src/misc/res/text_logo_blue.png
rename to calculatorpp-main/src/misc/res/text_logo_blue.png
diff --git a/android-calculator-app/src/misc/res/text_logo_light_blue.png b/calculatorpp-main/src/misc/res/text_logo_light_blue.png
similarity index 100%
rename from android-calculator-app/src/misc/res/text_logo_light_blue.png
rename to calculatorpp-main/src/misc/res/text_logo_light_blue.png
diff --git a/android-calculator-app/src/misc/res/text_logo_light_blue_cpp_forum.png b/calculatorpp-main/src/misc/res/text_logo_light_blue_cpp_forum.png
similarity index 100%
rename from android-calculator-app/src/misc/res/text_logo_light_blue_cpp_forum.png
rename to calculatorpp-main/src/misc/res/text_logo_light_blue_cpp_forum.png
diff --git a/android-calculator-app/src/misc/res/text_logo_purple.png b/calculatorpp-main/src/misc/res/text_logo_purple.png
similarity index 100%
rename from android-calculator-app/src/misc/res/text_logo_purple.png
rename to calculatorpp-main/src/misc/res/text_logo_purple.png
diff --git a/android-calculator-app/src/misc/src/achartengine-0.7.0.jar b/calculatorpp-main/src/misc/src/achartengine-0.7.0.jar
similarity index 100%
rename from android-calculator-app/src/misc/src/achartengine-0.7.0.jar
rename to calculatorpp-main/src/misc/src/achartengine-0.7.0.jar
diff --git a/android-calculator-app/src/misc/src/bsh.jar b/calculatorpp-main/src/misc/src/bsh.jar
similarity index 100%
rename from android-calculator-app/src/misc/src/bsh.jar
rename to calculatorpp-main/src/misc/src/bsh.jar
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessorTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessorTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessorTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessorTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/model/VarTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/VarTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/model/VarTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/model/VarTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java b/calculatorpp-main/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java b/calculatorpp-main/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
diff --git a/android-calculator-app/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java b/calculatorpp-main/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
similarity index 100%
rename from android-calculator-app/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
rename to calculatorpp-main/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
diff --git a/android-calculator-app/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv b/calculatorpp-main/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv
similarity index 100%
rename from android-calculator-app/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv
rename to calculatorpp-main/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv
diff --git a/pom.xml b/pom.xml
index c0a985a8..cbc88fad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <modules>
         <module>../android_common</module>
-        <module>android-calculator-app</module>
+        <module>calculatorpp-main</module>
     </modules>
 
     <dependencyManagement>