diff --git a/app/src/main/java/org/transdroid/daemon/Daemon.java b/app/src/main/java/org/transdroid/daemon/Daemon.java
index b811497a..00b98046 100644
--- a/app/src/main/java/org/transdroid/daemon/Daemon.java
+++ b/app/src/main/java/org/transdroid/daemon/Daemon.java
@@ -17,22 +17,22 @@
  */
 package org.transdroid.daemon;
 
-import org.transdroid.daemon.Aria2c.Aria2Adapter;
-import org.transdroid.daemon.BitComet.BitCometAdapter;
-import org.transdroid.daemon.Bitflu.BitfluAdapter;
-import org.transdroid.daemon.BuffaloNas.BuffaloNasAdapter;
-import org.transdroid.daemon.DLinkRouterBT.DLinkRouterBTAdapter;
-import org.transdroid.daemon.Deluge.DelugeAdapter;
-import org.transdroid.daemon.Deluge.DelugeRpcAdapter;
-import org.transdroid.daemon.Ktorrent.KtorrentAdapter;
-import org.transdroid.daemon.Qbittorrent.QbittorrentAdapter;
-import org.transdroid.daemon.Rtorrent.RtorrentAdapter;
-import org.transdroid.daemon.Synology.SynologyAdapter;
-import org.transdroid.daemon.Tfb4rt.Tfb4rtAdapter;
-import org.transdroid.daemon.Transmission.TransmissionAdapter;
-import org.transdroid.daemon.Ttorrent.TtorrentAdapter;
-import org.transdroid.daemon.Utorrent.UtorrentAdapter;
-import org.transdroid.daemon.Vuze.VuzeAdapter;
+import org.transdroid.daemon.adapters.Aria2c.Aria2Adapter;
+import org.transdroid.daemon.adapters.BitComet.BitCometAdapter;
+import org.transdroid.daemon.adapters.Bitflu.BitfluAdapter;
+import org.transdroid.daemon.adapters.BuffaloNas.BuffaloNasAdapter;
+import org.transdroid.daemon.adapters.DLinkRouterBT.DLinkRouterBTAdapter;
+import org.transdroid.daemon.adapters.Deluge.DelugeAdapter;
+import org.transdroid.daemon.adapters.Deluge.DelugeRpcAdapter;
+import org.transdroid.daemon.adapters.Ktorrent.KtorrentAdapter;
+import org.transdroid.daemon.adapters.Qbittorrent.QbittorrentAdapter;
+import org.transdroid.daemon.adapters.Rtorrent.RtorrentAdapter;
+import org.transdroid.daemon.adapters.Synology.SynologyAdapter;
+import org.transdroid.daemon.adapters.Tfb4rt.Tfb4rtAdapter;
+import org.transdroid.daemon.adapters.Transmission.TransmissionAdapter;
+import org.transdroid.daemon.adapters.Ttorrent.TtorrentAdapter;
+import org.transdroid.daemon.adapters.Utorrent.UtorrentAdapter;
+import org.transdroid.daemon.adapters.Vuze.VuzeAdapter;
 
 /**
  * Factory for new instances of server daemons, based on user settings.
diff --git a/app/src/main/java/org/transdroid/daemon/Aria2c/Aria2Adapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Aria2c/Aria2Adapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Aria2c/Aria2Adapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Aria2c/Aria2Adapter.java
index b69be3cb..f2dc4baa 100644
--- a/app/src/main/java/org/transdroid/daemon/Aria2c/Aria2Adapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Aria2c/Aria2Adapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Aria2c;
+package org.transdroid.daemon.adapters.Aria2c;
 
 import android.net.Uri;
 import android.text.TextUtils;
diff --git a/app/src/main/java/org/transdroid/daemon/BitComet/BitCometAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/BitComet/BitCometAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/BitComet/BitCometAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/BitComet/BitCometAdapter.java
index 3b6291db..a8b04d97 100644
--- a/app/src/main/java/org/transdroid/daemon/BitComet/BitCometAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/BitComet/BitCometAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.BitComet;
+package org.transdroid.daemon.adapters.BitComet;
 
 import com.android.internal.http.multipart.MultipartEntity;
 import com.android.internal.http.multipart.Part;
diff --git a/app/src/main/java/org/transdroid/daemon/Bitflu/BitfluAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Bitflu/BitfluAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Bitflu/BitfluAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Bitflu/BitfluAdapter.java
index a75a736b..6107cebc 100644
--- a/app/src/main/java/org/transdroid/daemon/Bitflu/BitfluAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Bitflu/BitfluAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Bitflu;
+package org.transdroid.daemon.adapters.Bitflu;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
diff --git a/app/src/main/java/org/transdroid/daemon/BuffaloNas/BuffaloNasAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/BuffaloNas/BuffaloNasAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/BuffaloNas/BuffaloNasAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/BuffaloNas/BuffaloNasAdapter.java
index 26d2260f..3bc6ca96 100644
--- a/app/src/main/java/org/transdroid/daemon/BuffaloNas/BuffaloNasAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/BuffaloNas/BuffaloNasAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.BuffaloNas;
+package org.transdroid.daemon.adapters.BuffaloNas;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/DLinkRouterBT/DLinkRouterBTAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/DLinkRouterBT/DLinkRouterBTAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/DLinkRouterBT/DLinkRouterBTAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/DLinkRouterBT/DLinkRouterBTAdapter.java
index 83339456..195b54c5 100644
--- a/app/src/main/java/org/transdroid/daemon/DLinkRouterBT/DLinkRouterBTAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/DLinkRouterBT/DLinkRouterBTAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.DLinkRouterBT;
+package org.transdroid.daemon.adapters.DLinkRouterBT;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeAdapter.java
similarity index 86%
rename from app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeAdapter.java
index 7bc04898..be7849f0 100644
--- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Deluge;
+package org.transdroid.daemon.adapters.Deluge;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
@@ -76,60 +76,60 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_DETAILS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_DETAILS_FIELDS_ARRAY;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_DOWNLOADEDEVER;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_ETA;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_FIELDS_ARRAY;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_FILE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_FILEPRIORITIES;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_FILEPROGRESS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_FILE_FIELDS_ARRAY;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_INDEX;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_LABEL;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MAXDOWNLOAD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MAXUPLOAD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MESSAGE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_ADD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_ADD_MAGNET;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_AUTH_LOGIN;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_FORCERECHECK;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_GET;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_MOVESTORAGE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_PAUSE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_PAUSE_ALL;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_REMOVE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_RESUME;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_RESUME_ALL;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_SETCONFIG;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_SETFILE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_SETLABEL;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_SETTRACKERS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_STATUS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_NAME;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_NUMPEERS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_NUMSEEDS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_PARAMS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_PARTDONE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_PATH;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_RATEDOWNLOAD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_RATEUPLOAD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_RESULT;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_SAVEPATH;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_SESSION_ID;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_SIZE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_STATUS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TIER;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TIMEADDED;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TORRENTS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TOTALPEERS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TOTALSEEDS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TOTALSIZE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TRACKERS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TRACKER_STATUS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_UPLOADEDEVER;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_URL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DETAILS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DETAILS_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DOWNLOADEDEVER;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_ETA;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILEPRIORITIES;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILEPROGRESS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILE_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_INDEX;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_LABEL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MAXDOWNLOAD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MAXUPLOAD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MESSAGE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD_MAGNET;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_AUTH_LOGIN;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_FORCERECHECK;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_MOVESTORAGE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_PAUSE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_PAUSE_ALL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_REMOVE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_RESUME;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_RESUME_ALL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETCONFIG;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETFILE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETLABEL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETTRACKERS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_STATUS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NAME;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NUMPEERS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NUMSEEDS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PARAMS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PARTDONE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PATH;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RATEDOWNLOAD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RATEUPLOAD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RESULT;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SAVEPATH;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SESSION_ID;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SIZE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_STATUS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TIER;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TIMEADDED;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TORRENTS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALPEERS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALSEEDS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALSIZE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TRACKERS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TRACKER_STATUS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_UPLOADEDEVER;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_URL;
 
 
 /**
diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeCommon.java b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeCommon.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Deluge/DelugeCommon.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeCommon.java
index dc8f6ab5..ace884ce 100644
--- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeCommon.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeCommon.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Deluge;
+package org.transdroid.daemon.adapters.Deluge;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRemoteRssChannel.java b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssChannel.java
similarity index 98%
rename from app/src/main/java/org/transdroid/daemon/Deluge/DelugeRemoteRssChannel.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssChannel.java
index 66a9731d..d2e6c0d2 100644
--- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRemoteRssChannel.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssChannel.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.Deluge;
+package org.transdroid.daemon.adapters.Deluge;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRemoteRssItem.java b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssItem.java
similarity index 96%
rename from app/src/main/java/org/transdroid/daemon/Deluge/DelugeRemoteRssItem.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssItem.java
index 022c9fdb..67718436 100644
--- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRemoteRssItem.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssItem.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.Deluge;
+package org.transdroid.daemon.adapters.Deluge;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcAdapter.java
similarity index 84%
rename from app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcAdapter.java
index ecd3b06e..45e245c5 100644
--- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Deluge;
+package org.transdroid.daemon.adapters.Deluge;
 
 import androidx.annotation.NonNull;
 
@@ -80,66 +80,66 @@ import java.util.Set;
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_DETAILS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_DETAILS_FIELDS_ARRAY;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_DOWNLOADEDEVER;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_DOWNLOAD_LOCATION;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_ETA;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_FIELDS_ARRAY;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_FILEPRIORITIES;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_FILEPROGRESS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_FILE_FIELDS_ARRAY;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_HASH;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_INDEX;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_KEY;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_LABEL;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MAXDOWNLOAD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MAXUPLOAD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MESSAGE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_ADD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_ADD_FILE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_ADD_MAGNET;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_FORCERECHECK;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_GET_LABELS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_GET_METHOD_LIST;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_GET_RSS_CONFIG;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_GET_TORRENTS_STATUS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_INFO;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_MOVESTORAGE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_PAUSE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_PAUSE_ALL;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_REMOVE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_RESUME;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_RESUME_ALL;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_SETCONFIG;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_SETLABEL;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_SETTRACKERS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_SET_TORRENT_OPTIONS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_STATUS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MOVE_COMPLETED;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MOVE_COMPLETED_PATH;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_NAME;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_NUMPEERS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_NUMSEEDS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_PARTDONE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_PATH;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_RATEDOWNLOAD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_RATEUPLOAD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_RSSFEEDS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_RSSFEED_KEY;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_SAVEPATH;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_SIZE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_STATUS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_SUBSCRIPTIONS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TIER;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TIMEADDED;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TOTALPEERS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TOTALSEEDS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TOTALSIZE;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TRACKERS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_TRACKER_STATUS;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_UPLOADEDEVER;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_URL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DETAILS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DETAILS_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DOWNLOADEDEVER;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DOWNLOAD_LOCATION;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_ETA;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILEPRIORITIES;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILEPROGRESS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILE_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_HASH;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_INDEX;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_KEY;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_LABEL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MAXDOWNLOAD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MAXUPLOAD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MESSAGE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD_FILE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD_MAGNET;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_FORCERECHECK;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET_LABELS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET_METHOD_LIST;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET_RSS_CONFIG;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET_TORRENTS_STATUS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_INFO;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_MOVESTORAGE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_PAUSE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_PAUSE_ALL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_REMOVE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_RESUME;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_RESUME_ALL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETCONFIG;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETLABEL;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETTRACKERS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SET_TORRENT_OPTIONS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_STATUS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MOVE_COMPLETED;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MOVE_COMPLETED_PATH;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NAME;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NUMPEERS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NUMSEEDS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PARTDONE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PATH;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RATEDOWNLOAD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RATEUPLOAD;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RSSFEEDS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RSSFEED_KEY;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SAVEPATH;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SIZE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_STATUS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SUBSCRIPTIONS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TIER;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TIMEADDED;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALPEERS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALSEEDS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALSIZE;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TRACKERS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TRACKER_STATUS;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_UPLOADEDEVER;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_URL;
 
 /**
  * The daemon adapter from the Deluge torrent client using deluged API directly.
diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcClient.java b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcClient.java
similarity index 97%
rename from app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcClient.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcClient.java
index f03be9d6..f23ec9b1 100644
--- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcClient.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcClient.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Deluge;
+package org.transdroid.daemon.adapters.Deluge;
 
 import androidx.annotation.NonNull;
 
@@ -39,8 +39,8 @@ import java.util.zip.InflaterInputStream;
 
 import se.dimovski.rencode.Rencode;
 
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_DAEMON_LOGIN;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_INFO;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_DAEMON_LOGIN;
+import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_INFO;
 
 /**
  * A Deluge RPC API Client.
diff --git a/app/src/main/java/org/transdroid/daemon/Ktorrent/FileListParser.java b/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/FileListParser.java
similarity index 98%
rename from app/src/main/java/org/transdroid/daemon/Ktorrent/FileListParser.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/FileListParser.java
index bbe221ae..9f7fa3ae 100644
--- a/app/src/main/java/org/transdroid/daemon/Ktorrent/FileListParser.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/FileListParser.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.Ktorrent;
+package org.transdroid.daemon.adapters.Ktorrent;
 
 import org.transdroid.daemon.DaemonException;
 import org.transdroid.daemon.DaemonException.ExceptionType;
diff --git a/app/src/main/java/org/transdroid/daemon/Ktorrent/KtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/KtorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Ktorrent/KtorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/KtorrentAdapter.java
index b29c887e..6dd60177 100644
--- a/app/src/main/java/org/transdroid/daemon/Ktorrent/KtorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/KtorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Ktorrent;
+package org.transdroid.daemon.adapters.Ktorrent;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/Ktorrent/LoggedOutException.java b/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/LoggedOutException.java
similarity index 69%
rename from app/src/main/java/org/transdroid/daemon/Ktorrent/LoggedOutException.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/LoggedOutException.java
index 82887c13..e3f28624 100644
--- a/app/src/main/java/org/transdroid/daemon/Ktorrent/LoggedOutException.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/LoggedOutException.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.Ktorrent;
+package org.transdroid.daemon.adapters.Ktorrent;
 
 public class LoggedOutException extends Exception {
 
diff --git a/app/src/main/java/org/transdroid/daemon/Ktorrent/StatsParser.java b/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/StatsParser.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Ktorrent/StatsParser.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/StatsParser.java
index 68ca9832..4513725c 100644
--- a/app/src/main/java/org/transdroid/daemon/Ktorrent/StatsParser.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/StatsParser.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.Ktorrent;
+package org.transdroid.daemon.adapters.Ktorrent;
 
 import org.transdroid.daemon.Daemon;
 import org.transdroid.daemon.DaemonException;
diff --git a/app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Qbittorrent/QbittorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Qbittorrent/QbittorrentAdapter.java
index 14d3080f..a46cc56f 100644
--- a/app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Qbittorrent/QbittorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Qbittorrent;
+package org.transdroid.daemon.adapters.Qbittorrent;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/Rtorrent/RtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Rtorrent/RtorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Rtorrent/RtorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Rtorrent/RtorrentAdapter.java
index ff79d3d4..30c996e9 100644
--- a/app/src/main/java/org/transdroid/daemon/Rtorrent/RtorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Rtorrent/RtorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Rtorrent;
+package org.transdroid.daemon.adapters.Rtorrent;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/org/transdroid/daemon/Synology/SynologyAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Synology/SynologyAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Synology/SynologyAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Synology/SynologyAdapter.java
index 5b06ea24..125039c0 100644
--- a/app/src/main/java/org/transdroid/daemon/Synology/SynologyAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Synology/SynologyAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Synology;
+package org.transdroid.daemon.adapters.Synology;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/Tfb4rt/StatsParser.java b/app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/StatsParser.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Tfb4rt/StatsParser.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/StatsParser.java
index 885a254c..73295d07 100644
--- a/app/src/main/java/org/transdroid/daemon/Tfb4rt/StatsParser.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/StatsParser.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.Tfb4rt;
+package org.transdroid.daemon.adapters.Tfb4rt;
 
 import org.transdroid.daemon.Daemon;
 import org.transdroid.daemon.DaemonException;
diff --git a/app/src/main/java/org/transdroid/daemon/Tfb4rt/Tfb4rtAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/Tfb4rtAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Tfb4rt/Tfb4rtAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/Tfb4rtAdapter.java
index 169ef869..6d06734c 100644
--- a/app/src/main/java/org/transdroid/daemon/Tfb4rt/Tfb4rtAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/Tfb4rtAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Tfb4rt;
+package org.transdroid.daemon.adapters.Tfb4rt;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/Transmission/TransmissionAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Transmission/TransmissionAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Transmission/TransmissionAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Transmission/TransmissionAdapter.java
index 912e6026..bc887921 100644
--- a/app/src/main/java/org/transdroid/daemon/Transmission/TransmissionAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Transmission/TransmissionAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Transmission;
+package org.transdroid.daemon.adapters.Transmission;
 
 import net.iharder.Base64;
 import net.iharder.Base64.InputStream;
diff --git a/app/src/main/java/org/transdroid/daemon/Ttorrent/TtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Ttorrent/TtorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Ttorrent/TtorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Ttorrent/TtorrentAdapter.java
index afcf5e65..fd97bc31 100644
--- a/app/src/main/java/org/transdroid/daemon/Ttorrent/TtorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Ttorrent/TtorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Ttorrent;
+package org.transdroid.daemon.adapters.Ttorrent;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/Utorrent/UtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/UtorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Utorrent/UtorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Utorrent/UtorrentAdapter.java
index 8a665b34..c109522d 100644
--- a/app/src/main/java/org/transdroid/daemon/Utorrent/UtorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/UtorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Utorrent;
+package org.transdroid.daemon.adapters.Utorrent;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
@@ -43,7 +43,7 @@ import org.transdroid.daemon.Torrent;
 import org.transdroid.daemon.TorrentDetails;
 import org.transdroid.daemon.TorrentFile;
 import org.transdroid.daemon.TorrentStatus;
-import org.transdroid.daemon.Utorrent.data.UTorrentRemoteRssChannel;
+import org.transdroid.daemon.adapters.Utorrent.data.UTorrentRemoteRssChannel;
 import org.transdroid.daemon.task.AddByFileTask;
 import org.transdroid.daemon.task.AddByMagnetUrlTask;
 import org.transdroid.daemon.task.AddByUrlTask;
diff --git a/app/src/main/java/org/transdroid/daemon/Utorrent/data/UTorrentRemoteRssChannel.java b/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssChannel.java
similarity index 97%
rename from app/src/main/java/org/transdroid/daemon/Utorrent/data/UTorrentRemoteRssChannel.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssChannel.java
index 3d56283d..f50459c0 100644
--- a/app/src/main/java/org/transdroid/daemon/Utorrent/data/UTorrentRemoteRssChannel.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssChannel.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.Utorrent.data;
+package org.transdroid.daemon.adapters.Utorrent.data;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/org/transdroid/daemon/Utorrent/data/UTorrentRemoteRssItem.java b/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssItem.java
similarity index 97%
rename from app/src/main/java/org/transdroid/daemon/Utorrent/data/UTorrentRemoteRssItem.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssItem.java
index d97c4e80..63a6c809 100644
--- a/app/src/main/java/org/transdroid/daemon/Utorrent/data/UTorrentRemoteRssItem.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssItem.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.Utorrent.data;
+package org.transdroid.daemon.adapters.Utorrent.data;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/org/transdroid/daemon/Vuze/VuzeAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Vuze/VuzeAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeAdapter.java
index 02094663..408b1e04 100644
--- a/app/src/main/java/org/transdroid/daemon/Vuze/VuzeAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Vuze;
+package org.transdroid.daemon.adapters.Vuze;
 
 import org.apache.openjpa.lib.util.Base16Encoder;
 import org.transdroid.core.gui.log.Log;
diff --git a/app/src/main/java/org/transdroid/daemon/Vuze/VuzeXmlOverHttpClient.java b/app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeXmlOverHttpClient.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/Vuze/VuzeXmlOverHttpClient.java
rename to app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeXmlOverHttpClient.java
index 155c9546..873d1ccc 100644
--- a/app/src/main/java/org/transdroid/daemon/Vuze/VuzeXmlOverHttpClient.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeXmlOverHttpClient.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.Vuze;
+package org.transdroid.daemon.adapters.Vuze;
 
 import android.util.Xml;