diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3b903e9982..ddbe453081 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index bb1eac509b..a244f5075b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,4 +45,5 @@ dependencies {
     implementation 'com.scottyab:rootbeer-lib:0.0.6'
     implementation 'com.skyfishjy.ripplebackground:library:1.0.1'
     implementation 'info.hoang8f:android-segmented:1.0.6'
+    implementation 'com.google.dagger:dagger:2.13'
 }
diff --git a/app/src/main/java/com/tangem/AppController.java b/app/src/main/java/com/tangem/AppController.java
new file mode 100644
index 0000000000..67a16b238b
--- /dev/null
+++ b/app/src/main/java/com/tangem/AppController.java
@@ -0,0 +1,41 @@
+package com.tangem;
+
+import android.app.Application;
+import android.support.v7.app.AppCompatDelegate;
+
+public class AppController extends Application {
+    private static final String TAG = "." + AppController.class.getSimpleName();
+
+    /**
+     * A singleton instance of the application class for easy access in other places
+     */
+    private static AppController sInstance;
+
+    public AppController() {
+        super();
+    }
+
+    static {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // init the singleton
+        sInstance = this;
+    }
+
+    /**
+     * @return singleton instance
+     */
+    public static synchronized AppController getInstance() {
+        return sInstance;
+    }
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/DI/AppComponent.java b/app/src/main/java/com/tangem/DI/AppComponent.java
new file mode 100644
index 0000000000..abc8d6ad21
--- /dev/null
+++ b/app/src/main/java/com/tangem/DI/AppComponent.java
@@ -0,0 +1,15 @@
+package com.tangem.DI;
+
+import com.tangem.AppController;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+@Singleton
+@Component(modules = {AppModule.class})
+public interface AppComponent {
+
+    void inject(AppController appController);
+
+}
diff --git a/app/src/main/java/com/tangem/DI/AppModule.java b/app/src/main/java/com/tangem/DI/AppModule.java
new file mode 100644
index 0000000000..45b6c7a682
--- /dev/null
+++ b/app/src/main/java/com/tangem/DI/AppModule.java
@@ -0,0 +1,8 @@
+package com.tangem.DI;
+
+import dagger.Module;
+
+@Module
+public class AppModule {
+
+}
diff --git a/app/src/main/java/com/tangem/User.java b/app/src/main/java/com/tangem/User.java
deleted file mode 100644
index 12caa848b6..0000000000
--- a/app/src/main/java/com/tangem/User.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.tangem;
-
-public class User {
-}
diff --git a/app/src/main/java/com/tangem/cardReader/CommandApdu.java b/app/src/main/java/com/tangem/cardReader/CommandApdu.java
index 3d69198317..3e552dc4dd 100644
--- a/app/src/main/java/com/tangem/cardReader/CommandApdu.java
+++ b/app/src/main/java/com/tangem/cardReader/CommandApdu.java
@@ -8,11 +8,8 @@ import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
 import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
 
 public class CommandApdu {
 
diff --git a/app/src/main/java/com/tangem/data/DB/Repository.java b/app/src/main/java/com/tangem/data/DB/Repository.java
new file mode 100644
index 0000000000..53832d97ee
--- /dev/null
+++ b/app/src/main/java/com/tangem/data/DB/Repository.java
@@ -0,0 +1,4 @@
+package com.tangem.data.DB;
+
+public class Repository {
+}
diff --git a/app/src/main/java/com/tangem/data/network/Server.java b/app/src/main/java/com/tangem/data/network/Server.java
new file mode 100644
index 0000000000..c844fda4ed
--- /dev/null
+++ b/app/src/main/java/com/tangem/data/network/Server.java
@@ -0,0 +1,4 @@
+package com.tangem.data.network;
+
+public class Server {
+}
diff --git a/app/src/main/java/com/tangem/data/network/model/UserModel.java b/app/src/main/java/com/tangem/data/network/model/UserModel.java
new file mode 100644
index 0000000000..78387c4709
--- /dev/null
+++ b/app/src/main/java/com/tangem/data/network/model/UserModel.java
@@ -0,0 +1,4 @@
+package com.tangem.data.network.model;
+
+public class UserModel {
+}
diff --git a/app/src/main/java/com/tangem/wallet/WalletInfoFragment.java b/app/src/main/java/com/tangem/wallet/WalletInfoFragment.java
index 3978fee305..924429f3e5 100644
--- a/app/src/main/java/com/tangem/wallet/WalletInfoFragment.java
+++ b/app/src/main/java/com/tangem/wallet/WalletInfoFragment.java
@@ -6,7 +6,6 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;