diff --git a/calculatorpp/res/layout/matrix_edit_fragment.xml b/android-app/res/layout/matrix_edit_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/matrix_edit_fragment.xml
rename to android-app/res/layout/matrix_edit_fragment.xml
diff --git a/calculatorpp/res/layout/matrix_edit_fragment_item.xml b/android-app/res/layout/matrix_edit_fragment_item.xml
similarity index 100%
rename from calculatorpp/res/layout/matrix_edit_fragment_item.xml
rename to android-app/res/layout/matrix_edit_fragment_item.xml
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixEditFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixEditFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixEditFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixEditFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/matrix/MatrixView.java b/android-app/src/main/java/org/solovyev/android/calculator/matrix/MatrixView.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/matrix/MatrixView.java
rename to android-app/src/main/java/org/solovyev/android/calculator/matrix/MatrixView.java