diff --git a/app/src/androidTest/java/carbon/crypto/com/carbon/Assertions/RecyclerViewItemsCountAssertion.java b/app/src/androidTest/java/cy/agorise/crystalwallet/Assertions/RecyclerViewItemsCountAssertion.java
similarity index 95%
rename from app/src/androidTest/java/carbon/crypto/com/carbon/Assertions/RecyclerViewItemsCountAssertion.java
rename to app/src/androidTest/java/cy/agorise/crystalwallet/Assertions/RecyclerViewItemsCountAssertion.java
index 7edec28..75206fa 100644
--- a/app/src/androidTest/java/carbon/crypto/com/carbon/Assertions/RecyclerViewItemsCountAssertion.java
+++ b/app/src/androidTest/java/cy/agorise/crystalwallet/Assertions/RecyclerViewItemsCountAssertion.java
@@ -1,4 +1,4 @@
-package carbon.crypto.com.carbon.Assertions;
+package cy.agorise.crystalwallet.Assertions;
 
 import android.support.test.espresso.NoMatchingViewException;
 import android.support.test.espresso.ViewAssertion;
diff --git a/app/src/androidTest/java/carbon/crypto/com/carbon/TransactionListTest.java b/app/src/androidTest/java/cy/agorise/crystalwallet/TransactionListTest.java
similarity index 90%
rename from app/src/androidTest/java/carbon/crypto/com/carbon/TransactionListTest.java
rename to app/src/androidTest/java/cy/agorise/crystalwallet/TransactionListTest.java
index 1b5e1d9..a4c0994 100644
--- a/app/src/androidTest/java/carbon/crypto/com/carbon/TransactionListTest.java
+++ b/app/src/androidTest/java/cy/agorise/crystalwallet/TransactionListTest.java
@@ -1,4 +1,4 @@
-package carbon.crypto.com.carbon;
+package cy.agorise.crystalwallet;
 
 import org.junit.After;
 import org.junit.Before;
@@ -12,12 +12,11 @@ import android.support.test.runner.AndroidJUnit4;
 
 import java.util.List;
 
-import carbon.crypto.com.carbon.Assertions.RecyclerViewItemsCountAssertion;
+import cy.agorise.crystalwallet.Assertions.RecyclerViewItemsCountAssertion;
 import cy.agorise.crystalwallet.activities.IntroActivity;
 import cy.agorise.crystalwallet.R;
 import cy.agorise.crystalwallet.dao.CrystalDatabase;
 import cy.agorise.crystalwallet.models.CryptoCoinTransaction;
-import cy.agorise.crystalwallet.randomdatagenerators.RandomTransactionsGenerator;
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
diff --git a/app/src/main/java/carbon/crypto/com/carbon/Application.java b/app/src/main/java/carbon/crypto/com/carbon/Application.java
deleted file mode 100644
index 2b24444..0000000
--- a/app/src/main/java/carbon/crypto/com/carbon/Application.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package carbon.crypto.com.carbon;
-
-public class Application{
-
-}
-
diff --git a/app/src/main/java/carbon/crypto/com/carbon/MainActivity.java b/app/src/main/java/carbon/crypto/com/carbon/MainActivity.java
deleted file mode 100644
index 174a61a..0000000
--- a/app/src/main/java/carbon/crypto/com/carbon/MainActivity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package carbon.crypto.com.carbon;
-
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-
-import cy.agorise.crystalwallet.R;
-
-public class MainActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-    }
-}
diff --git a/app/src/test/java/carbon/crypto/com/carbon/ExampleUnitTest.java b/app/src/test/java/cy/agorise/crystalwallet/ExampleUnitTest.java
similarity index 91%
rename from app/src/test/java/carbon/crypto/com/carbon/ExampleUnitTest.java
rename to app/src/test/java/cy/agorise/crystalwallet/ExampleUnitTest.java
index 9ddcc53..79db5b8 100644
--- a/app/src/test/java/carbon/crypto/com/carbon/ExampleUnitTest.java
+++ b/app/src/test/java/cy/agorise/crystalwallet/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package carbon.crypto.com.carbon;
+package cy.agorise.crystalwallet;
 
 import org.junit.Test;