diff --git a/calculatorpp-core/pom.xml b/calculatorpp-core/pom.xml
new file mode 100644
index 00000000..7f59b53d
--- /dev/null
+++ b/calculatorpp-core/pom.xml
@@ -0,0 +1,36 @@
+
+
+ 4.0.0
+
+
+ org.solovyev.android
+ calculatorpp-parent
+ 1.3.1
+
+
+ org.solovyev.android
+ calculatorpp-core
+ 1.3.1
+ Calculator++ Application Core
+
+ jar
+
+
+
+
+ junit
+ junit
+ test
+
+
+
+ com.intellij
+ annotations
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/src/main/java/org/solovyev/android/Unit.java b/calculatorpp-core/src/main/java/org/solovyev/math/units/Unit.java
similarity index 80%
rename from calculatorpp/src/main/java/org/solovyev/android/Unit.java
rename to calculatorpp-core/src/main/java/org/solovyev/math/units/Unit.java
index c3a2d8a5..23921ea8 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/Unit.java
+++ b/calculatorpp-core/src/main/java/org/solovyev/math/units/Unit.java
@@ -1,17 +1,17 @@
-package org.solovyev.android;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * User: serso
- * Date: 4/21/12
- * Time: 7:54 PM
- */
-public interface Unit {
-
- @NotNull
- V getValue();
-
- @NotNull
- UnitType getUnitType();
-}
+package org.solovyev.math.units;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * User: serso
+ * Date: 4/21/12
+ * Time: 7:54 PM
+ */
+public interface Unit {
+
+ @NotNull
+ V getValue();
+
+ @NotNull
+ UnitType getUnitType();
+}
diff --git a/calculatorpp/src/main/java/org/solovyev/android/UnitConverter.java b/calculatorpp-core/src/main/java/org/solovyev/math/units/UnitConverter.java
similarity index 92%
rename from calculatorpp/src/main/java/org/solovyev/android/UnitConverter.java
rename to calculatorpp-core/src/main/java/org/solovyev/math/units/UnitConverter.java
index 51785cc7..2d56bebd 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/UnitConverter.java
+++ b/calculatorpp-core/src/main/java/org/solovyev/math/units/UnitConverter.java
@@ -1,42 +1,42 @@
-package org.solovyev.android;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * User: serso
- * Date: 4/21/12
- * Time: 7:53 PM
- */
-public interface UnitConverter {
-
- boolean isSupported(@NotNull UnitType> from, @NotNull UnitType to);
-
- @NotNull
- Unit convert(@NotNull Unit> from, @NotNull UnitType toType);
-
- public static class Dummy implements UnitConverter