diff --git a/build/resources/META-INF/smack.providers b/build/resources/META-INF/smack.providers
index d6f15c4cf..9c83b9ac3 100644
--- a/build/resources/META-INF/smack.providers
+++ b/build/resources/META-INF/smack.providers
@@ -241,7 +241,7 @@
     <iqProvider>
         <elementName>ping</elementName>
         <namespace>urn:xmpp:ping</namespace>
-        <className>org.jivesoftware.smackx.provider.PingProvider</className>
+        <className>org.jivesoftware.smackx.ping.provider.PingProvider</className>
     </iqProvider>
 
     <extensionProvider>
diff --git a/source/org/jivesoftware/smackx/ping/PingManager.java b/source/org/jivesoftware/smackx/ping/PingManager.java
index 10a29dbe8..f3624ebe7 100644
--- a/source/org/jivesoftware/smackx/ping/PingManager.java
+++ b/source/org/jivesoftware/smackx/ping/PingManager.java
@@ -37,9 +37,9 @@ import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smackx.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.packet.DiscoverInfo;
-import org.jivesoftware.smackx.packet.Ping;
-import org.jivesoftware.smackx.packet.Pong;
-import org.jivesoftware.smackx.provider.PingProvider;
+import org.jivesoftware.smackx.ping.packet.Ping;
+import org.jivesoftware.smackx.ping.packet.Pong;
+import org.jivesoftware.smackx.ping.provider.PingProvider;
 
 /**
  * Implements the XMPP Ping as defined by XEP-0199. This protocol offers an
diff --git a/source/org/jivesoftware/smackx/packet/Ping.java b/source/org/jivesoftware/smackx/ping/packet/Ping.java
similarity index 96%
rename from source/org/jivesoftware/smackx/packet/Ping.java
rename to source/org/jivesoftware/smackx/ping/packet/Ping.java
index d49d9c590..fc5bbdfdc 100644
--- a/source/org/jivesoftware/smackx/packet/Ping.java
+++ b/source/org/jivesoftware/smackx/ping/packet/Ping.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jivesoftware.smackx.packet;
+package org.jivesoftware.smackx.ping.packet;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smackx.ping.PingManager;
diff --git a/source/org/jivesoftware/smackx/packet/Pong.java b/source/org/jivesoftware/smackx/ping/packet/Pong.java
similarity index 96%
rename from source/org/jivesoftware/smackx/packet/Pong.java
rename to source/org/jivesoftware/smackx/ping/packet/Pong.java
index 34cd1ae00..9300db0ce 100644
--- a/source/org/jivesoftware/smackx/packet/Pong.java
+++ b/source/org/jivesoftware/smackx/ping/packet/Pong.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jivesoftware.smackx.packet;
+package org.jivesoftware.smackx.ping.packet;
 
 import org.jivesoftware.smack.packet.IQ;
 
diff --git a/source/org/jivesoftware/smackx/provider/PingProvider.java b/source/org/jivesoftware/smackx/ping/provider/PingProvider.java
similarity index 91%
rename from source/org/jivesoftware/smackx/provider/PingProvider.java
rename to source/org/jivesoftware/smackx/ping/provider/PingProvider.java
index 0540fb91f..ebe766953 100644
--- a/source/org/jivesoftware/smackx/provider/PingProvider.java
+++ b/source/org/jivesoftware/smackx/ping/provider/PingProvider.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jivesoftware.smackx.provider;
+package org.jivesoftware.smackx.ping.provider;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
-import org.jivesoftware.smackx.packet.Ping;
+import org.jivesoftware.smackx.ping.packet.Ping;
 import org.xmlpull.v1.XmlPullParser;
 
 public class PingProvider implements IQProvider {
diff --git a/test-unit/org/jivesoftware/smackx/ping/PingPongTest.java b/test-unit/org/jivesoftware/smackx/ping/PingPongTest.java
index b11c22bff..762223ee4 100644
--- a/test-unit/org/jivesoftware/smackx/ping/PingPongTest.java
+++ b/test-unit/org/jivesoftware/smackx/ping/PingPongTest.java
@@ -17,8 +17,8 @@ package org.jivesoftware.smackx.ping;
 
 import static org.junit.Assert.assertEquals;
 
-import org.jivesoftware.smackx.packet.Ping;
-import org.jivesoftware.smackx.packet.Pong;
+import org.jivesoftware.smackx.ping.packet.Ping;
+import org.jivesoftware.smackx.ping.packet.Pong;
 import org.junit.Test;
 
 public class PingPongTest {