diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java
rename to calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
rename to calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java
rename to calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/OperatorCategory.java b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/OperatorCategory.java
rename to calculatorpp-core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/VarCategory.java b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/VarCategory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/VarCategory.java
rename to calculatorpp-core/src/main/java/org/solovyev/android/calculator/VarCategory.java