diff --git a/cache/pom.xml b/cache/pom.xml
index 192ad530db..9c1e32f62b 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -44,7 +44,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>net.runelite.rs</groupId>
+			<groupId>net.runelite</groupId>
 			<artifactId>api</artifactId>
 			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
diff --git a/pom.xml b/pom.xml
index 6b8ba36697..350eb96fb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,12 +73,13 @@
 	</repositories>
 
 	<modules>
-		<module>deobfuscator</module>
-		<module>runescape-client</module>
-		<module>runelite-client</module>
-		<module>runelite-api</module>
-		<module>model-viewer</module>
 		<module>cache</module>
+		<module>deobfuscator</module>
+		<module>model-viewer</module>
+		<module>runelite-api</module>
+		<module>runelite-client</module>
+		<module>runescape-client</module>
+		<module>runescape-api</module>
 	</modules>
 
 	<profiles>
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index e95115b4db..8686359af8 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -37,8 +37,16 @@
 		<version>1.1.4-SNAPSHOT</version>
 	</parent>
 
-	<groupId>net.runelite.rs</groupId>
+	<groupId>net.runelite</groupId>
 	<artifactId>api</artifactId>
 	<version>1.0.5-SNAPSHOT</version>
 	<name>Runelite API</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>net.runelite.rs</groupId>
+			<artifactId>api</artifactId>
+			<version>117.2-SNAPSHOT</version> <!-- rs version -->
+		</dependency>
+	</dependencies>
 </project>
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index 4456eeffe1..81c8205712 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -64,7 +64,7 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>net.runelite.rs</groupId>
+			<groupId>net.runelite</groupId>
 			<artifactId>api</artifactId>
 			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml
new file mode 100644
index 0000000000..87953a1e2d
--- /dev/null
+++ b/runescape-api/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2016, Adam <Adam@sigterm.info>
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+    This product includes software developed by Adam <Adam@sigterm.info>
+ 4. Neither the name of the Adam <Adam@sigterm.info> nor the
+    names of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY Adam <Adam@sigterm.info> ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL Adam <Adam@sigterm.info> BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>net.runelite</groupId>
+		<artifactId>runelite-parent</artifactId>
+		<version>1.1.4-SNAPSHOT</version>
+	</parent>
+
+	<groupId>net.runelite.rs</groupId>
+	<artifactId>api</artifactId>
+	<version>117.2-SNAPSHOT</version> <!-- rs version -->
+	<name>RuneScape API</name>
+</project>
diff --git a/runelite-api/src/main/java/net/runelite/mapping/Export.java b/runescape-api/src/main/java/net/runelite/mapping/Export.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/mapping/Export.java
rename to runescape-api/src/main/java/net/runelite/mapping/Export.java
diff --git a/runelite-api/src/main/java/net/runelite/mapping/Implements.java b/runescape-api/src/main/java/net/runelite/mapping/Implements.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/mapping/Implements.java
rename to runescape-api/src/main/java/net/runelite/mapping/Implements.java
diff --git a/runelite-api/src/main/java/net/runelite/mapping/Import.java b/runescape-api/src/main/java/net/runelite/mapping/Import.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/mapping/Import.java
rename to runescape-api/src/main/java/net/runelite/mapping/Import.java
diff --git a/runelite-api/src/main/java/net/runelite/mapping/ObfuscatedGetter.java b/runescape-api/src/main/java/net/runelite/mapping/ObfuscatedGetter.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/mapping/ObfuscatedGetter.java
rename to runescape-api/src/main/java/net/runelite/mapping/ObfuscatedGetter.java
diff --git a/runelite-api/src/main/java/net/runelite/mapping/ObfuscatedName.java b/runescape-api/src/main/java/net/runelite/mapping/ObfuscatedName.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/mapping/ObfuscatedName.java
rename to runescape-api/src/main/java/net/runelite/mapping/ObfuscatedName.java
diff --git a/runelite-api/src/main/java/net/runelite/mapping/ObfuscatedOverride.java b/runescape-api/src/main/java/net/runelite/mapping/ObfuscatedOverride.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/mapping/ObfuscatedOverride.java
rename to runescape-api/src/main/java/net/runelite/mapping/ObfuscatedOverride.java
diff --git a/runelite-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java b/runescape-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java
rename to runescape-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java
diff --git a/runelite-api/src/main/java/net/runelite/mapping/Replace.java b/runescape-api/src/main/java/net/runelite/mapping/Replace.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/mapping/Replace.java
rename to runescape-api/src/main/java/net/runelite/mapping/Replace.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Actor.java b/runescape-api/src/main/java/net/runelite/rs/api/Actor.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Actor.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Actor.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Buffer.java b/runescape-api/src/main/java/net/runelite/rs/api/Buffer.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Buffer.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Buffer.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/CacheableNode.java b/runescape-api/src/main/java/net/runelite/rs/api/CacheableNode.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/CacheableNode.java
rename to runescape-api/src/main/java/net/runelite/rs/api/CacheableNode.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/ClassInfo.java b/runescape-api/src/main/java/net/runelite/rs/api/ClassInfo.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/ClassInfo.java
rename to runescape-api/src/main/java/net/runelite/rs/api/ClassInfo.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Client.java b/runescape-api/src/main/java/net/runelite/rs/api/Client.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Client.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Client.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/CollisionData.java b/runescape-api/src/main/java/net/runelite/rs/api/CollisionData.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/CollisionData.java
rename to runescape-api/src/main/java/net/runelite/rs/api/CollisionData.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Deque.java b/runescape-api/src/main/java/net/runelite/rs/api/Deque.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Deque.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Deque.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/FileOnDisk.java b/runescape-api/src/main/java/net/runelite/rs/api/FileOnDisk.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/FileOnDisk.java
rename to runescape-api/src/main/java/net/runelite/rs/api/FileOnDisk.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Friend.java b/runescape-api/src/main/java/net/runelite/rs/api/Friend.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Friend.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Friend.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/GameEngine.java b/runescape-api/src/main/java/net/runelite/rs/api/GameEngine.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/GameEngine.java
rename to runescape-api/src/main/java/net/runelite/rs/api/GameEngine.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/GameObject.java b/runescape-api/src/main/java/net/runelite/rs/api/GameObject.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/GameObject.java
rename to runescape-api/src/main/java/net/runelite/rs/api/GameObject.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Ignore.java b/runescape-api/src/main/java/net/runelite/rs/api/Ignore.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Ignore.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Ignore.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Item.java b/runescape-api/src/main/java/net/runelite/rs/api/Item.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Item.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Item.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/ItemComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/ItemComposition.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/ItemComposition.java
rename to runescape-api/src/main/java/net/runelite/rs/api/ItemComposition.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/ItemLayer.java b/runescape-api/src/main/java/net/runelite/rs/api/ItemLayer.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/ItemLayer.java
rename to runescape-api/src/main/java/net/runelite/rs/api/ItemLayer.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/MessageNode.java b/runescape-api/src/main/java/net/runelite/rs/api/MessageNode.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/MessageNode.java
rename to runescape-api/src/main/java/net/runelite/rs/api/MessageNode.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Model.java b/runescape-api/src/main/java/net/runelite/rs/api/Model.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Model.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Model.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/NPC.java b/runescape-api/src/main/java/net/runelite/rs/api/NPC.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/NPC.java
rename to runescape-api/src/main/java/net/runelite/rs/api/NPC.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/NPCComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/NPCComposition.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/NPCComposition.java
rename to runescape-api/src/main/java/net/runelite/rs/api/NPCComposition.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Node.java b/runescape-api/src/main/java/net/runelite/rs/api/Node.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Node.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Node.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/ObjectComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/ObjectComposition.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/ObjectComposition.java
rename to runescape-api/src/main/java/net/runelite/rs/api/ObjectComposition.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Player.java b/runescape-api/src/main/java/net/runelite/rs/api/Player.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Player.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Player.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/PlayerComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/PlayerComposition.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/PlayerComposition.java
rename to runescape-api/src/main/java/net/runelite/rs/api/PlayerComposition.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Projectile.java b/runescape-api/src/main/java/net/runelite/rs/api/Projectile.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Projectile.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Projectile.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/RSCanvas.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/RSCanvas.java
rename to runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Region.java b/runescape-api/src/main/java/net/runelite/rs/api/Region.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Region.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Region.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Renderable.java b/runescape-api/src/main/java/net/runelite/rs/api/Renderable.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Renderable.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Renderable.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Sequence.java b/runescape-api/src/main/java/net/runelite/rs/api/Sequence.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Sequence.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Sequence.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/SpritePixels.java b/runescape-api/src/main/java/net/runelite/rs/api/SpritePixels.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/SpritePixels.java
rename to runescape-api/src/main/java/net/runelite/rs/api/SpritePixels.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Tile.java b/runescape-api/src/main/java/net/runelite/rs/api/Tile.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Tile.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Tile.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/Widget.java b/runescape-api/src/main/java/net/runelite/rs/api/Widget.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/Widget.java
rename to runescape-api/src/main/java/net/runelite/rs/api/Widget.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/WidgetNode.java b/runescape-api/src/main/java/net/runelite/rs/api/WidgetNode.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/WidgetNode.java
rename to runescape-api/src/main/java/net/runelite/rs/api/WidgetNode.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/World.java b/runescape-api/src/main/java/net/runelite/rs/api/World.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/World.java
rename to runescape-api/src/main/java/net/runelite/rs/api/World.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/XClanMember.java b/runescape-api/src/main/java/net/runelite/rs/api/XClanMember.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/XClanMember.java
rename to runescape-api/src/main/java/net/runelite/rs/api/XClanMember.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/XGrandExchangeOffer.java b/runescape-api/src/main/java/net/runelite/rs/api/XGrandExchangeOffer.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/XGrandExchangeOffer.java
rename to runescape-api/src/main/java/net/runelite/rs/api/XGrandExchangeOffer.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/XHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/XHashTable.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/XHashTable.java
rename to runescape-api/src/main/java/net/runelite/rs/api/XHashTable.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/XItemContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/XItemContainer.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/XItemContainer.java
rename to runescape-api/src/main/java/net/runelite/rs/api/XItemContainer.java
diff --git a/runelite-api/src/main/java/net/runelite/rs/api/XSprite.java b/runescape-api/src/main/java/net/runelite/rs/api/XSprite.java
similarity index 100%
rename from runelite-api/src/main/java/net/runelite/rs/api/XSprite.java
rename to runescape-api/src/main/java/net/runelite/rs/api/XSprite.java