diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/NodesFragment.java b/src/main/java/com/nutomic/syncthingandroid/gui/NodesFragment.java
index a32354c4..c76675d4 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/NodesFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/gui/NodesFragment.java
@@ -1,12 +1,11 @@
 package com.nutomic.syncthingandroid.gui;
 
 import android.content.Intent;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import com.nutomic.syncthingandroid.NodeAdapter;
+import com.nutomic.syncthingandroid.util.NodeAdapter;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java b/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java
index b57ed711..6637e1a7 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java
@@ -13,12 +13,11 @@ import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import com.nutomic.syncthingandroid.ExtendedCheckBoxPreference;
+import com.nutomic.syncthingandroid.util.ExtendedCheckBoxPreference;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/RepositoriesFragment.java b/src/main/java/com/nutomic/syncthingandroid/gui/RepositoriesFragment.java
index 2ca19695..b597bc50 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/RepositoriesFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/gui/RepositoriesFragment.java
@@ -5,7 +5,7 @@ import android.view.View;
 import android.widget.AdapterView;
 
 import com.nutomic.syncthingandroid.R;
-import com.nutomic.syncthingandroid.RepositoryAdapter;
+import com.nutomic.syncthingandroid.util.RepositoryAdapter;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/ExtendedCheckBoxPreference.java b/src/main/java/com/nutomic/syncthingandroid/util/ExtendedCheckBoxPreference.java
similarity index 90%
rename from src/main/java/com/nutomic/syncthingandroid/ExtendedCheckBoxPreference.java
rename to src/main/java/com/nutomic/syncthingandroid/util/ExtendedCheckBoxPreference.java
index 8371a37d..3ef31c1b 100644
--- a/src/main/java/com/nutomic/syncthingandroid/ExtendedCheckBoxPreference.java
+++ b/src/main/java/com/nutomic/syncthingandroid/util/ExtendedCheckBoxPreference.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid;
+package com.nutomic.syncthingandroid.util;
 
 import android.content.Context;
 import android.preference.CheckBoxPreference;
diff --git a/src/main/java/com/nutomic/syncthingandroid/NodeAdapter.java b/src/main/java/com/nutomic/syncthingandroid/util/NodeAdapter.java
similarity index 97%
rename from src/main/java/com/nutomic/syncthingandroid/NodeAdapter.java
rename to src/main/java/com/nutomic/syncthingandroid/util/NodeAdapter.java
index 2ff49b09..d9c1766f 100644
--- a/src/main/java/com/nutomic/syncthingandroid/NodeAdapter.java
+++ b/src/main/java/com/nutomic/syncthingandroid/util/NodeAdapter.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid;
+package com.nutomic.syncthingandroid.util;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -10,6 +10,7 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/nutomic/syncthingandroid/RepositoryAdapter.java b/src/main/java/com/nutomic/syncthingandroid/util/RepositoryAdapter.java
similarity index 97%
rename from src/main/java/com/nutomic/syncthingandroid/RepositoryAdapter.java
rename to src/main/java/com/nutomic/syncthingandroid/util/RepositoryAdapter.java
index 831692d6..ac8c10e2 100644
--- a/src/main/java/com/nutomic/syncthingandroid/RepositoryAdapter.java
+++ b/src/main/java/com/nutomic/syncthingandroid/util/RepositoryAdapter.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid;
+package com.nutomic.syncthingandroid.util;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -8,6 +8,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 
 import java.util.HashMap;