diff --git a/.gitignore b/.gitignore
index bc78dbb57..696e44329 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,12 +50,8 @@ manifest.mf
 
 # other stuff
 run/
-docs/build/
 
-Purpur-Server
 Purpur-API
-mc-dev
-purpurclip.jar
-*clip.jar
-last-paper
-mcdevimports.conf
+Purpur-MojangAPI
+Purpur-Server
+*.jar
diff --git a/build.gradle.kts b/build.gradle.kts
index 081bcecce..30215d653 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,6 @@
+import io.papermc.paperweight.util.cache
+import io.papermc.paperweight.util.Git
+
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "7.0.0" apply false
@@ -50,6 +53,15 @@ subprojects {
     }
 }
 
+val initMojangApi by tasks.registering {
+    val paperMojangApi = project.layout.cache.resolve("paperweight/upstreams/paper/Paper-MojangAPI").toFile()
+    doLast {
+        Git(paperMojangApi)("init").executeOut()
+        Git(paperMojangApi)("add", ".").executeOut()
+        Git(paperMojangApi)("commit", "-m", "Initial Source", "--author=Initial <auto@mated.null>").executeOut()
+    }
+}
+
 paperweight {
     serverProject.set(project(":Purpur-Server"))
 
@@ -62,4 +74,16 @@ paperweight {
             serverOutputDir.set(layout.projectDirectory.dir("Purpur-Server"))
         }
     }
+
+    upstreams {
+        register("Paper") {
+            upstreamDataTask.get().finalizedBy(initMojangApi)
+
+            patchTasks.register("mojangApi") {
+                sourceDir.set(project.layout.cache.resolve("paperweight/upstreams/paper/Paper-MojangAPI").toFile())
+                patchDir.set(file("patches/mojangapi"))
+                outputDir.set(file("Purpur-MojangAPI"))
+            }
+        }
+    }
 }
diff --git a/gradle.properties b/gradle.properties
index 3ae2047ee..f9a8db6bc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group=net.pl3x.purpur
 version=1.17-R0.1-SNAPSHOT
 packageVersion=1_17_R1
-paperCommit=9085da6e602fda8de3b03fece8e4d31278274b8c
+paperCommit=eddf0f40dc9022cf233295eba7fe7132a61b8141
 
 org.gradle.jvmargs=-Xmx3G
diff --git a/patches/mojangapi/0001-Build-System-Changes.patch b/patches/mojangapi/0001-Build-System-Changes.patch
new file mode 100644
index 000000000..380994423
--- /dev/null
+++ b/patches/mojangapi/0001-Build-System-Changes.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Kerllenevich <me@notom3ga.me>
+Date: Mon, 14 Jun 2021 07:01:43 -0400
+Subject: [PATCH] Build System Changes
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 536b4577cfb37c1a79d33e35ddcec61000cb9d4a..fb29f2eb1b21074c8784febddca18eab63b29e34 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -13,7 +13,7 @@ repositories {
+ }
+ 
+ dependencies {
+-    implementation(project(":Paper-API"))
++    implementation(project(":Purpur-API")) // Purpur
+     api("com.mojang:brigadier:1.0.18")
+ 
+     compileOnly("it.unimi.dsi:fastutil:8.2.2")
diff --git a/patches/server/0001-Build-System-Changes.patch b/patches/server/0001-Build-System-Changes.patch
index 78f3f55d1..8ae38166d 100644
--- a/patches/server/0001-Build-System-Changes.patch
+++ b/patches/server/0001-Build-System-Changes.patch
@@ -6,27 +6,29 @@ Subject: [PATCH] Build System Changes
 todo: merge with rebrand patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f0256fe4aea16c9e0d6f5eee360eeec36cfdeebd..e36f89cb109fcc1d174e2c0efc104edb3007a6a8 100644
+index 5c885454c729467e29fd3784058fff6a7379c9dc..29538a699e610dae422635b8e256cb44773ddfcf 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -20,7 +20,7 @@ repositories {
+@@ -20,8 +20,8 @@ repositories {
  }
  
  dependencies {
 -    implementation(project(":Paper-API"))
+-    implementation(project(":Paper-MojangAPI"))
 +    implementation(project(":Purpur-API")) // Purpur
++    implementation(project(":Purpur-MojangAPI")) // Purpur
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
      implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -50,6 +50,7 @@ dependencies {
+@@ -51,6 +51,7 @@ dependencies {
  
      implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
 +    implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
  
+     testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")
-     testImplementation("org.hamcrest:hamcrest-library:1.3")
-@@ -63,7 +64,7 @@ tasks.jar {
+@@ -65,7 +66,7 @@ tasks.jar {
          attributes(mapOf(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -35,7 +37,7 @@ index f0256fe4aea16c9e0d6f5eee360eeec36cfdeebd..e36f89cb109fcc1d174e2c0efc104edb
              "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -98,7 +99,7 @@ tasks.test {
+@@ -100,7 +101,7 @@ tasks.test {
  
  fun TaskContainer.registerRunTask(name: String, block: JavaExec.() -> Unit): TaskProvider<JavaExec> =
      register<JavaExec>(name) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 146730d92..40e05595c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,4 +6,4 @@ pluginManagement {
 }
 
 rootProject.name = "Purpur"
-include("Purpur-API", "Purpur-Server")
+include("Purpur-API", "Purpur-MojangAPI", "Purpur-Server")