diff --git a/core/src/main/resources/org.jivesoftware.smack/smack-config.xml b/core/src/main/resources/org.jivesoftware.smack/smack-config.xml
index e6afbba9d..2b3540365 100644
--- a/core/src/main/resources/org.jivesoftware.smack/smack-config.xml
+++ b/core/src/main/resources/org.jivesoftware.smack/smack-config.xml
@@ -13,5 +13,6 @@
         <className>org.jivesoftware.smackx.ExtensionsStartupClasses</className>
         <className>org.jivesoftware.smackx.ExperimentalProviderInitializer</className>
         <className>org.jivesoftware.smackx.WorkgroupProviderInitializer</className>
+        <className>org.jivesoftware.smackx.LegacyProviderInitializer</className>
     </optionalStartupClasses>
 </smack>
diff --git a/extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers b/extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers
index afa8a1414..27e98c190 100644
--- a/extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers
+++ b/extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers
@@ -15,14 +15,7 @@
         <namespace>jabber:iq:time</namespace> 
         <className>org.jivesoftware.smackx.time.packet.Time</className> 
     </iqProvider>
-    
-    <!-- Roster Exchange -->
-    <extensionProvider>
-        <elementName>x</elementName>
-        <namespace>jabber:x:roster</namespace>
-        <className>org.jivesoftware.smackx.xroster.provider.RosterExchangeProvider</className>
-    </extensionProvider>
-    
+
     <!-- Message Events -->
     <extensionProvider>
         <elementName>x</elementName>
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/LegacyProviderInitializer.java b/legacy/src/main/java/org/jivesoftware/smackx/LegacyProviderInitializer.java
new file mode 100644
index 000000000..81ba5aa09
--- /dev/null
+++ b/legacy/src/main/java/org/jivesoftware/smackx/LegacyProviderInitializer.java
@@ -0,0 +1,27 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx;
+
+import org.jivesoftware.smack.initializer.UrlProviderFileInitializer;
+
+public class LegacyProviderInitializer  extends UrlProviderFileInitializer {
+
+    @Override
+    protected String getFilePath() {
+        return "classpath:org.jivesoftware.smackx/legacy.providers";
+    }
+}
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java b/legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
similarity index 100%
rename from extensions/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
rename to legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java b/legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java
similarity index 100%
rename from extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java
rename to legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java b/legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
similarity index 100%
rename from extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
rename to legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java b/legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
similarity index 100%
rename from extensions/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
rename to legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java b/legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
similarity index 100%
rename from extensions/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
rename to legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
diff --git a/legacy/src/main/resources/org.jivesoftware.smackx/legacy.providers b/legacy/src/main/resources/org.jivesoftware.smackx/legacy.providers
new file mode 100644
index 000000000..2ca382c03
--- /dev/null
+++ b/legacy/src/main/resources/org.jivesoftware.smackx/legacy.providers
@@ -0,0 +1,12 @@
+<?xml version="1.0"?> 
+<!-- Providers file for legacy Smack extensions -->
+<smackProviders> 
+
+    <!-- Roster Exchange -->
+    <extensionProvider>
+        <elementName>x</elementName>
+        <namespace>jabber:x:roster</namespace>
+        <className>org.jivesoftware.smackx.xroster.provider.RosterExchangeProvider</className>
+    </extensionProvider>
+
+</smackProviders>
\ No newline at end of file
diff --git a/legacy/src/test/java/org/jivesoftware/smackx/LegacyProviderInitializerTest.java b/legacy/src/test/java/org/jivesoftware/smackx/LegacyProviderInitializerTest.java
new file mode 100644
index 000000000..5147457cc
--- /dev/null
+++ b/legacy/src/test/java/org/jivesoftware/smackx/LegacyProviderInitializerTest.java
@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class LegacyProviderInitializerTest {
+
+    @Test
+    public void testWorkgroupProviderInitializer() {
+        LegacyProviderInitializer lpi = new LegacyProviderInitializer();
+        lpi.initialize();
+        assertTrue(lpi.getExceptions().size() == 0);
+    }
+}