diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
index fbd29f04e..2de9535f4 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
@@ -49,6 +49,7 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.packet.Session;
+import org.jivesoftware.smack.rosterstore.RosterStore;
 
 public abstract class AbstractXMPPConnection implements XMPPConnection {
     private static final Logger LOGGER = Logger.getLogger(AbstractXMPPConnection.class.getName());
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
index 4629dd1fe..4fd3cd82c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -19,6 +19,7 @@ package org.jivesoftware.smack;
 
 import org.jivesoftware.smack.packet.Session;
 import org.jivesoftware.smack.proxy.ProxyInfo;
+import org.jivesoftware.smack.rosterstore.RosterStore;
 import org.jivesoftware.smack.util.DNSUtil;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.dns.HostAddress;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
index 3ac4b4974..8408e828a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
@@ -46,6 +46,7 @@ import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.packet.RosterPacket;
 import org.jivesoftware.smack.packet.RosterPacket.Item;
+import org.jivesoftware.smack.rosterstore.RosterStore;
 import org.jxmpp.util.XmppStringUtils;
 
 /**
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
index eb21f5e97..f1ec6d89a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
@@ -23,6 +23,7 @@ import org.jivesoftware.smack.filter.IQReplyFilter;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.rosterstore.RosterStore;
 
 /**
  * The abstract XMPPConnection class provides an interface for connections to a XMPP server and
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/DirectoryRosterStore.java b/smack-core/src/main/java/org/jivesoftware/smack/rosterstore/DirectoryRosterStore.java
similarity index 99%
rename from smack-core/src/main/java/org/jivesoftware/smack/DirectoryRosterStore.java
rename to smack-core/src/main/java/org/jivesoftware/smack/rosterstore/DirectoryRosterStore.java
index a540ab216..076fae127 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/DirectoryRosterStore.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/rosterstore/DirectoryRosterStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smack;
+package org.jivesoftware.smack.rosterstore;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/RosterStore.java b/smack-core/src/main/java/org/jivesoftware/smack/rosterstore/RosterStore.java
similarity index 92%
rename from smack-core/src/main/java/org/jivesoftware/smack/RosterStore.java
rename to smack-core/src/main/java/org/jivesoftware/smack/rosterstore/RosterStore.java
index a208f7c28..f5bceb507 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/RosterStore.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/rosterstore/RosterStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smack;
+package org.jivesoftware.smack.rosterstore;
 
 import java.util.Collection;
 
@@ -29,13 +29,13 @@ public interface RosterStore {
 
     /**
      * This method returns a collection of all roster items contained in this store.
-     * @return List of {@link RosterEntry}
+     * @return List of {@link org.jivesoftware.smack.RosterEntry}
      */
     public Collection<RosterPacket.Item> getEntries();
     /**
      * This method returns the roster item in this store for the given JID.
      * @param bareJid The bare JID of the RosterEntry
-     * @return The {@link RosterEntry} which belongs to that user
+     * @return The {@link org.jivesoftware.smack.RosterEntry} which belongs to that user
      */
     public RosterPacket.Item getEntry(String bareJid);
     /**
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java b/smack-core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
index a2e07a0c9..62ab2307d 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
@@ -32,6 +32,8 @@ import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.RosterPacket;
 import org.jivesoftware.smack.packet.RosterPacket.Item;
 import org.jivesoftware.smack.packet.RosterPacket.ItemType;
+import org.jivesoftware.smack.rosterstore.DirectoryRosterStore;
+import org.jivesoftware.smack.rosterstore.RosterStore;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/DirectoryRosterStoreTest.java b/smack-core/src/test/java/org/jivesoftware/smack/rosterstore/DirectoryRosterStoreTest.java
similarity index 99%
rename from smack-core/src/test/java/org/jivesoftware/smack/DirectoryRosterStoreTest.java
rename to smack-core/src/test/java/org/jivesoftware/smack/rosterstore/DirectoryRosterStoreTest.java
index 6da112c3a..fbc10ce70 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/DirectoryRosterStoreTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/rosterstore/DirectoryRosterStoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smack;
+package org.jivesoftware.smack.rosterstore;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;