diff --git a/JMPDComm/src/main/java/org/a0z/mpd/CommandQueue.java b/JMPDComm/src/main/java/org/a0z/mpd/CommandQueue.java
index 5587b2218f..d6d168d894 100644
--- a/JMPDComm/src/main/java/org/a0z/mpd/CommandQueue.java
+++ b/JMPDComm/src/main/java/org/a0z/mpd/CommandQueue.java
@@ -183,7 +183,7 @@ public void reverse() {
      * @throws IOException  Thrown upon a communication error with the server.
      * @throws MPDException Thrown if an error occurs as a result of command execution.
      */
-    List<String> send(final MPDConnection mpdConnection) throws IOException, MPDException {
+    public List<String> send(final MPDConnection mpdConnection) throws IOException, MPDException {
         return send(mpdConnection, false);
     }
 
diff --git a/JMPDComm/src/main/java/org/a0z/mpd/MPD.java b/JMPDComm/src/main/java/org/a0z/mpd/MPD.java
index 8f7e0f71c2..6716299bad 100644
--- a/JMPDComm/src/main/java/org/a0z/mpd/MPD.java
+++ b/JMPDComm/src/main/java/org/a0z/mpd/MPD.java
@@ -40,6 +40,7 @@
 import org.a0z.mpd.item.Music;
 import org.a0z.mpd.item.PlaylistFile;
 import org.a0z.mpd.item.Stream;
+import org.a0z.mpd.subsystem.Sticker;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/JMPDComm/src/main/java/org/a0z/mpd/Sticker.java b/JMPDComm/src/main/java/org/a0z/mpd/subsystem/Sticker.java
similarity index 99%
rename from JMPDComm/src/main/java/org/a0z/mpd/Sticker.java
rename to JMPDComm/src/main/java/org/a0z/mpd/subsystem/Sticker.java
index 07c1b16213..106d382609 100644
--- a/JMPDComm/src/main/java/org/a0z/mpd/Sticker.java
+++ b/JMPDComm/src/main/java/org/a0z/mpd/subsystem/Sticker.java
@@ -25,8 +25,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.a0z.mpd;
+package org.a0z.mpd.subsystem;
 
+import org.a0z.mpd.CommandQueue;
+import org.a0z.mpd.Log;
+import org.a0z.mpd.MPDCommand;
+import org.a0z.mpd.Tools;
 import org.a0z.mpd.connection.MPDConnection;
 import org.a0z.mpd.exception.MPDException;
 import org.a0z.mpd.item.FilesystemTreeEntry;
diff --git a/MPDroid/src/main/java/com/namelessdev/mpdroid/helpers/UpdateTrackInfo.java b/MPDroid/src/main/java/com/namelessdev/mpdroid/helpers/UpdateTrackInfo.java
index ccdc848be2..47fa2e5e66 100644
--- a/MPDroid/src/main/java/com/namelessdev/mpdroid/helpers/UpdateTrackInfo.java
+++ b/MPDroid/src/main/java/com/namelessdev/mpdroid/helpers/UpdateTrackInfo.java
@@ -20,9 +20,9 @@
 import com.namelessdev.mpdroid.R;
 
 import org.a0z.mpd.MPDStatus;
-import org.a0z.mpd.Sticker;
 import org.a0z.mpd.exception.MPDException;
 import org.a0z.mpd.item.Music;
+import org.a0z.mpd.subsystem.Sticker;
 
 import android.content.SharedPreferences;
 import android.os.AsyncTask;