diff --git a/app/src/main/java/io/neoterm/component/setup/ResultListener.java b/app/src/main/java/io/neoterm/setup/ResultListener.java
similarity index 71%
rename from app/src/main/java/io/neoterm/component/setup/ResultListener.java
rename to app/src/main/java/io/neoterm/setup/ResultListener.java
index 13c0ba1..5bf9da3 100644
--- a/app/src/main/java/io/neoterm/component/setup/ResultListener.java
+++ b/app/src/main/java/io/neoterm/setup/ResultListener.java
@@ -1,4 +1,4 @@
-package io.neoterm.component.setup;
+package io.neoterm.setup;
 
 /**
  * @author kiva
diff --git a/app/src/main/java/io/neoterm/component/setup/SetupHelper.java b/app/src/main/java/io/neoterm/setup/SetupHelper.java
similarity index 79%
rename from app/src/main/java/io/neoterm/component/setup/SetupHelper.java
rename to app/src/main/java/io/neoterm/setup/SetupHelper.java
index 4c0dd13..48328b1 100644
--- a/app/src/main/java/io/neoterm/component/setup/SetupHelper.java
+++ b/app/src/main/java/io/neoterm/setup/SetupHelper.java
@@ -1,29 +1,14 @@
-package io.neoterm.component.setup;
+package io.neoterm.setup;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Build;
-import android.system.Os;
-import android.util.Pair;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 import io.neoterm.R;
-import io.neoterm.backend.EmulatorDebug;
-import io.neoterm.frontend.logging.NLog;
-import io.neoterm.frontend.config.NeoPreference;
 import io.neoterm.frontend.config.NeoTermPath;
 
 /**
diff --git a/app/src/main/java/io/neoterm/component/setup/SetupThread.java b/app/src/main/java/io/neoterm/setup/SetupThread.java
similarity index 99%
rename from app/src/main/java/io/neoterm/component/setup/SetupThread.java
rename to app/src/main/java/io/neoterm/setup/SetupThread.java
index 076cc21..31ed111 100644
--- a/app/src/main/java/io/neoterm/component/setup/SetupThread.java
+++ b/app/src/main/java/io/neoterm/setup/SetupThread.java
@@ -1,4 +1,4 @@
-package io.neoterm.component.setup;
+package io.neoterm.setup;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
diff --git a/app/src/main/java/io/neoterm/component/setup/SourceConnection.java b/app/src/main/java/io/neoterm/setup/SourceConnection.java
similarity index 85%
rename from app/src/main/java/io/neoterm/component/setup/SourceConnection.java
rename to app/src/main/java/io/neoterm/setup/SourceConnection.java
index c712b7d..9fc1aa3 100644
--- a/app/src/main/java/io/neoterm/component/setup/SourceConnection.java
+++ b/app/src/main/java/io/neoterm/setup/SourceConnection.java
@@ -1,4 +1,4 @@
-package io.neoterm.component.setup;
+package io.neoterm.setup;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/app/src/main/java/io/neoterm/component/setup/connection/AssetsFileConnection.java b/app/src/main/java/io/neoterm/setup/connection/AssetsFileConnection.java
similarity index 83%
rename from app/src/main/java/io/neoterm/component/setup/connection/AssetsFileConnection.java
rename to app/src/main/java/io/neoterm/setup/connection/AssetsFileConnection.java
index 48b0fad..0a30bbe 100644
--- a/app/src/main/java/io/neoterm/component/setup/connection/AssetsFileConnection.java
+++ b/app/src/main/java/io/neoterm/setup/connection/AssetsFileConnection.java
@@ -1,10 +1,10 @@
-package io.neoterm.component.setup.connection;
+package io.neoterm.setup.connection;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import io.neoterm.App;
-import io.neoterm.component.setup.SetupHelper;
+import io.neoterm.setup.SetupHelper;
 import io.neoterm.utils.AssetsUtils;
 
 /**
diff --git a/app/src/main/java/io/neoterm/component/setup/connection/BackupFileConnection.java b/app/src/main/java/io/neoterm/setup/connection/BackupFileConnection.java
similarity index 83%
rename from app/src/main/java/io/neoterm/component/setup/connection/BackupFileConnection.java
rename to app/src/main/java/io/neoterm/setup/connection/BackupFileConnection.java
index a08495d..d05030f 100644
--- a/app/src/main/java/io/neoterm/component/setup/connection/BackupFileConnection.java
+++ b/app/src/main/java/io/neoterm/setup/connection/BackupFileConnection.java
@@ -1,4 +1,4 @@
-package io.neoterm.component.setup.connection;
+package io.neoterm.setup.connection;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/app/src/main/java/io/neoterm/component/setup/connection/LocalFileConnection.java b/app/src/main/java/io/neoterm/setup/connection/LocalFileConnection.java
similarity index 83%
rename from app/src/main/java/io/neoterm/component/setup/connection/LocalFileConnection.java
rename to app/src/main/java/io/neoterm/setup/connection/LocalFileConnection.java
index 42788dd..a95a7fc 100644
--- a/app/src/main/java/io/neoterm/component/setup/connection/LocalFileConnection.java
+++ b/app/src/main/java/io/neoterm/setup/connection/LocalFileConnection.java
@@ -1,4 +1,4 @@
-package io.neoterm.component.setup.connection;
+package io.neoterm.setup.connection;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/app/src/main/java/io/neoterm/component/setup/connection/NetworkConnection.java b/app/src/main/java/io/neoterm/setup/connection/NetworkConnection.java
similarity index 89%
rename from app/src/main/java/io/neoterm/component/setup/connection/NetworkConnection.java
rename to app/src/main/java/io/neoterm/setup/connection/NetworkConnection.java
index d6483cd..fcc5db1 100644
--- a/app/src/main/java/io/neoterm/component/setup/connection/NetworkConnection.java
+++ b/app/src/main/java/io/neoterm/setup/connection/NetworkConnection.java
@@ -1,12 +1,12 @@
-package io.neoterm.component.setup.connection;
+package io.neoterm.setup.connection;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-import io.neoterm.component.setup.SetupHelper;
-import io.neoterm.component.setup.SourceConnection;
+import io.neoterm.setup.SetupHelper;
+import io.neoterm.setup.SourceConnection;
 
 /**
  * @author kiva
diff --git a/app/src/main/java/io/neoterm/component/setup/connection/OfflineConnection.java b/app/src/main/java/io/neoterm/setup/connection/OfflineConnection.java
similarity index 82%
rename from app/src/main/java/io/neoterm/component/setup/connection/OfflineConnection.java
rename to app/src/main/java/io/neoterm/setup/connection/OfflineConnection.java
index 7a551f9..09caad2 100644
--- a/app/src/main/java/io/neoterm/component/setup/connection/OfflineConnection.java
+++ b/app/src/main/java/io/neoterm/setup/connection/OfflineConnection.java
@@ -1,12 +1,9 @@
-package io.neoterm.component.setup.connection;
+package io.neoterm.setup.connection;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import io.neoterm.App;
-import io.neoterm.component.setup.SetupHelper;
-import io.neoterm.component.setup.SourceConnection;
-import io.neoterm.utils.AssetsUtils;
+import io.neoterm.setup.SourceConnection;
 
 /**
  * @author kiva
diff --git a/app/src/main/java/io/neoterm/component/setup/connection/OfflineUriConnection.java b/app/src/main/java/io/neoterm/setup/connection/OfflineUriConnection.java
similarity index 92%
rename from app/src/main/java/io/neoterm/component/setup/connection/OfflineUriConnection.java
rename to app/src/main/java/io/neoterm/setup/connection/OfflineUriConnection.java
index 478258c..524360e 100644
--- a/app/src/main/java/io/neoterm/component/setup/connection/OfflineUriConnection.java
+++ b/app/src/main/java/io/neoterm/setup/connection/OfflineUriConnection.java
@@ -1,4 +1,4 @@
-package io.neoterm.component.setup.connection;
+package io.neoterm.setup.connection;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/app/src/main/java/io/neoterm/component/setup/helper/URLAvailability.java b/app/src/main/java/io/neoterm/setup/helper/URLAvailability.java
similarity index 93%
rename from app/src/main/java/io/neoterm/component/setup/helper/URLAvailability.java
rename to app/src/main/java/io/neoterm/setup/helper/URLAvailability.java
index ca7d94f..7bc8423 100644
--- a/app/src/main/java/io/neoterm/component/setup/helper/URLAvailability.java
+++ b/app/src/main/java/io/neoterm/setup/helper/URLAvailability.java
@@ -1,4 +1,4 @@
-package io.neoterm.component.setup.helper;
+package io.neoterm.setup.helper;
 
 import android.content.Context;
 
@@ -6,7 +6,6 @@ import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 
 import io.neoterm.utils.NetworkUtils;
 
diff --git a/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt b/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt
index 8c7e371..f7f5844 100644
--- a/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt
+++ b/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt
@@ -9,14 +9,14 @@ import android.view.View
 import android.widget.*
 import io.neoterm.App
 import io.neoterm.R
-import io.neoterm.component.setup.ResultListener
-import io.neoterm.component.setup.SetupHelper
-import io.neoterm.component.setup.SourceConnection
-import io.neoterm.component.setup.connection.AssetsFileConnection
-import io.neoterm.component.setup.connection.BackupFileConnection
-import io.neoterm.component.setup.connection.LocalFileConnection
-import io.neoterm.component.setup.connection.NetworkConnection
-import io.neoterm.component.setup.helper.URLAvailability
+import io.neoterm.setup.ResultListener
+import io.neoterm.setup.SetupHelper
+import io.neoterm.setup.SourceConnection
+import io.neoterm.setup.connection.AssetsFileConnection
+import io.neoterm.setup.connection.BackupFileConnection
+import io.neoterm.setup.connection.LocalFileConnection
+import io.neoterm.setup.connection.NetworkConnection
+import io.neoterm.setup.helper.URLAvailability
 import io.neoterm.frontend.config.NeoTermPath
 import io.neoterm.utils.MediaUtils
 import io.neoterm.utils.PackageUtils
diff --git a/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt b/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt
index 0844fea..42373c9 100644
--- a/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt
+++ b/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt
@@ -20,7 +20,7 @@ import de.mrapp.android.tabswitcher.*
 import io.neoterm.App
 import io.neoterm.R
 import io.neoterm.backend.TerminalSession
-import io.neoterm.component.setup.SetupHelper
+import io.neoterm.setup.SetupHelper
 import io.neoterm.frontend.session.shell.client.TermSessionCallback
 import io.neoterm.frontend.session.shell.client.TermViewClient
 import io.neoterm.frontend.session.shell.client.event.*