diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch
index abe3c2bf4..c551fbeb4 100644
--- a/patches/api/0001-POM-Changes.patch
+++ b/patches/api/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 261f37cc2108ea0d7ebc5e0e090f9904ed189419 Mon Sep 17 00:00:00 2001
+From 797408840291c6ecfc8b9dffcea027450de59ec4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 14 Dec 2018 21:52:29 -0800
@@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 2cb97140..d167304b 100644
+index 2cb971408..d167304be 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
diff --git a/patches/api/0002-Server-Config.patch b/patches/api/0002-Server-Config.patch
index cb6c1d76f..45dd274fb 100644
--- a/patches/api/0002-Server-Config.patch
+++ b/patches/api/0002-Server-Config.patch
@@ -1,4 +1,4 @@
-From 812349d6f9656c98d3c445b384571e9cabada79e Mon Sep 17 00:00:00 2001
+From 37df93f498a1bca3f535bb44b51f84a9b2eb645d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 15:18:38 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Config
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 93d5a3f9..08e428bd 100644
+index 93d5a3f97..08e428bd3 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -206,7 +206,8 @@ class TimingsExport extends Thread {
@@ -20,7 +20,7 @@ index 93d5a3f9..08e428bd 100644
  
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9ceaac0e..7444b415 100644
+index 9ceaac0e8..7444b4159 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1386,6 +1386,14 @@ public interface Server extends PluginMessageRecipient {
diff --git a/patches/server/0002-Brand-changes.patch b/patches/server/0001-Brand-changes.patch
similarity index 97%
rename from patches/server/0002-Brand-changes.patch
rename to patches/server/0001-Brand-changes.patch
index c23db1809..26a4de39d 100644
--- a/patches/server/0002-Brand-changes.patch
+++ b/patches/server/0001-Brand-changes.patch
@@ -1,4 +1,4 @@
-From ac00ba2b1be41b67c523f34168bcf4f5178e8973 Mon Sep 17 00:00:00 2001
+From 3ad2ef931970cfedbccf1da452c3c0de86026aad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Tue, 18 Dec 2018 06:27:02 -0800
diff --git a/patches/server/0001-POM-Changes.patch b/patches/server/0001-POM-Changes.patch
deleted file mode 100644
index c66f9bf17..000000000
--- a/patches/server/0001-POM-Changes.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 3b858296bfd1b36d8a65b39c003211948938231b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
- <tsao-chi@the-lingo.org>
-Date: Fri, 14 Dec 2018 21:53:58 -0800
-Subject: [PATCH] POM Changes
-
-
-diff --git a/pom.xml b/pom.xml
-index 55679af92..19f87edb5 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -1,12 +1,11 @@
--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+ <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>
--    <artifactId>paper</artifactId>
-+    <artifactId>akarin</artifactId>
-     <packaging>jar</packaging>
-     <version>1.15.2-R0.1-SNAPSHOT</version>
--    <name>Paper</name>
--    <url>https://papermc.io</url>
--
-+    <name>Akarin-Server</name>
-+    <url>https://github.com/Akarin-project/Akarin</url>
-     <properties>
-         <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -21,16 +20,16 @@
-     </properties>
- 
-     <parent>
--        <groupId>com.destroystokyo.paper</groupId>
--        <artifactId>paper-parent</artifactId>
-+        <groupId>io.akarin.server</groupId>
-+        <artifactId>akarin-parent</artifactId>
-         <version>dev-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <dependencies>
-         <dependency>
--            <groupId>com.destroystokyo.paper</groupId>
--            <artifactId>paper-api</artifactId>
-+            <groupId>io.akarin.server</groupId>
-+            <artifactId>akarin-api</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-@@ -143,15 +142,15 @@
- 
-     <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
-     <build>
--        <finalName>paper-${minecraft.version}</finalName>
--        <defaultGoal>clean install</defaultGoal> <!-- Paper -->
-+        <finalName>akarin-${minecraft.version}</finalName>
-+        <defaultGoal>install</defaultGoal> <!-- Paper -->
-         <plugins>
-             <plugin>
-                 <groupId>com.lukegb.mojo</groupId>
-                 <artifactId>gitdescribe-maven-plugin</artifactId>
-                 <version>1.3</version>
-                 <configuration>
--                    <outputPrefix>git-Paper-</outputPrefix>
-+                    <outputPrefix>git-Akarin-</outputPrefix> <!-- Akarin -->
-                     <scmDirectory>..</scmDirectory>
-                 </configuration>
-                 <executions>
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 674096cab..9a7235b8e 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
-     public static String getBukkitVersion() {
-         String result = "Unknown-Version";
- 
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties");
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.akarin.server/akarin-api/pom.properties"); // Akarin
-         Properties properties = new Properties();
- 
-         if (stream != null) {
--- 
-2.25.1.windows.1
-
diff --git a/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/server/0002-Avoid-double-I-O-operation-on-load-player-file.patch
similarity index 96%
rename from patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch
rename to patches/server/0002-Avoid-double-I-O-operation-on-load-player-file.patch
index 60a56ec55..3ac818015 100644
--- a/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch
+++ b/patches/server/0002-Avoid-double-I-O-operation-on-load-player-file.patch
@@ -1,4 +1,4 @@
-From 8415d8c17d128a51ccd5a2c74579e3f4e3475fd5 Mon Sep 17 00:00:00 2001
+From 3c1079a542bb29f234c3d0206925b9f338a1d67e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:29:08 +0800
diff --git a/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch b/patches/server/0003-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
similarity index 94%
rename from patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
rename to patches/server/0003-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
index 2cb2bef4e..b79d50435 100644
--- a/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
+++ b/patches/server/0003-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
@@ -1,4 +1,4 @@
-From 7fc55018d10d0e62411d54cf9b32373b19b813c2 Mon Sep 17 00:00:00 2001
+From dff42f66084dc49d68797eab5e37d730e1e15df8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:43:20 +0800
diff --git a/patches/server/0005-never-drop-items-on-command-give.patch b/patches/server/0004-never-drop-items-on-command-give.patch
similarity index 87%
rename from patches/server/0005-never-drop-items-on-command-give.patch
rename to patches/server/0004-never-drop-items-on-command-give.patch
index d5bb425fb..1c510117b 100644
--- a/patches/server/0005-never-drop-items-on-command-give.patch
+++ b/patches/server/0004-never-drop-items-on-command-give.patch
@@ -1,8 +1,8 @@
-From ed60a4bd738c6588d4a02ed01c2c4b0a35176184 Mon Sep 17 00:00:00 2001
+From 9c894a616b9cf91d563b4d56461326c02562e8aa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:35:19 +0800
-Subject: [PATCH] never drop items on command "/give"
+Subject: [PATCH] Never drop items on command "/give"
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandGive.java b/src/main/java/net/minecraft/server/CommandGive.java
diff --git a/patches/server/0006-Save-json-list-async.patch b/patches/server/0005-Save-json-list-async.patch
similarity index 95%
rename from patches/server/0006-Save-json-list-async.patch
rename to patches/server/0005-Save-json-list-async.patch
index a2ae93502..f6dd84447 100644
--- a/patches/server/0006-Save-json-list-async.patch
+++ b/patches/server/0005-Save-json-list-async.patch
@@ -1,4 +1,4 @@
-From 78dabf6d78ea817a476a54e560260cf54562ef3c Mon Sep 17 00:00:00 2001
+From 67d60aab4aa2fb03013ac21e4561424ddf35f844 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:16:18 +0800
diff --git a/patches/server/0007-Remove-method-profiler-callers.patch b/patches/server/0006-Remove-method-profiler-callers.patch
similarity index 99%
rename from patches/server/0007-Remove-method-profiler-callers.patch
rename to patches/server/0006-Remove-method-profiler-callers.patch
index ad616af75..31c6c6824 100644
--- a/patches/server/0007-Remove-method-profiler-callers.patch
+++ b/patches/server/0006-Remove-method-profiler-callers.patch
@@ -1,4 +1,4 @@
-From 1cd7a5bc5ab1cad4c1003be208514a6fb0af9da4 Mon Sep 17 00:00:00 2001
+From 26bf028609cb41f18f1a2c7f87452a634316dac0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 12:30:35 +0800
diff --git a/patches/server/0008-Disable-Snooper.patch b/patches/server/0007-Disable-Snooper.patch
similarity index 95%
rename from patches/server/0008-Disable-Snooper.patch
rename to patches/server/0007-Disable-Snooper.patch
index 329522ed2..add066165 100644
--- a/patches/server/0008-Disable-Snooper.patch
+++ b/patches/server/0007-Disable-Snooper.patch
@@ -1,4 +1,4 @@
-From 589352e8c977d4d5ec8892189bfc301673d6e4a0 Mon Sep 17 00:00:00 2001
+From 182dbbfd403360666165f4891c327bd192f72cb3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 14:03:29 +0800
diff --git a/patches/server/0009-Server-Config.patch b/patches/server/0008-Server-Config.patch
similarity index 99%
rename from patches/server/0009-Server-Config.patch
rename to patches/server/0008-Server-Config.patch
index 90a708f24..dbb976fd7 100644
--- a/patches/server/0009-Server-Config.patch
+++ b/patches/server/0008-Server-Config.patch
@@ -1,4 +1,4 @@
-From 68e577f5a3bf6dc0d11192195504283577d0766f Mon Sep 17 00:00:00 2001
+From 349848cf30419fd7efb71994947772fd2e53e82a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 14:59:22 +0800
diff --git a/patches/server/0010-Async-pathfinder.patch b/patches/server/0009-Async-pathfinder.patch
similarity index 99%
rename from patches/server/0010-Async-pathfinder.patch
rename to patches/server/0009-Async-pathfinder.patch
index 46b9c90b5..50afaf975 100644
--- a/patches/server/0010-Async-pathfinder.patch
+++ b/patches/server/0009-Async-pathfinder.patch
@@ -1,4 +1,4 @@
-From 781a4d837723ce20e1c393c6241b8ceb448e8c58 Mon Sep 17 00:00:00 2001
+From 99a39146d21bcc43e19d390ba38b0e68fee07a4f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 13:01:13 +0800
diff --git a/patches/server/0011-Optimizations-for-network.patch b/patches/server/0010-Optimizations-for-network.patch
similarity index 99%
rename from patches/server/0011-Optimizations-for-network.patch
rename to patches/server/0010-Optimizations-for-network.patch
index 68c190cb1..b2491375d 100644
--- a/patches/server/0011-Optimizations-for-network.patch
+++ b/patches/server/0010-Optimizations-for-network.patch
@@ -1,4 +1,4 @@
-From 2ba25bbb1325ee65491aae7feb63ae11a2e471cf Mon Sep 17 00:00:00 2001
+From ebdb668fecb4645da404f049e490dc8445a9e0ce Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 14:59:10 +0800
diff --git a/patches/server/0012-Swaps-the-predicate-order-of-collision.patch b/patches/server/0011-Swaps-the-predicate-order-of-collision.patch
similarity index 97%
rename from patches/server/0012-Swaps-the-predicate-order-of-collision.patch
rename to patches/server/0011-Swaps-the-predicate-order-of-collision.patch
index 0a45e399b..90b8222ee 100644
--- a/patches/server/0012-Swaps-the-predicate-order-of-collision.patch
+++ b/patches/server/0011-Swaps-the-predicate-order-of-collision.patch
@@ -1,4 +1,4 @@
-From d6bc81fc34f98233fc50fa11345b06314c9cf923 Mon Sep 17 00:00:00 2001
+From fdece31a81ccf54cfdac946d08c3fdf763cff360 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 10 Apr 2020 15:47:15 +0800
diff --git a/patches/server/0013-Akarin-Metrics.patch b/patches/server/0012-Akarin-Metrics.patch
similarity index 94%
rename from patches/server/0013-Akarin-Metrics.patch
rename to patches/server/0012-Akarin-Metrics.patch
index d9120d8c6..aea9ff597 100644
--- a/patches/server/0013-Akarin-Metrics.patch
+++ b/patches/server/0012-Akarin-Metrics.patch
@@ -1,4 +1,4 @@
-From e818bed4db1c1fb7777e31f7400a7b6a1f47c6a0 Mon Sep 17 00:00:00 2001
+From 7a2c1555aecec9486babe0ee4b39fc65446336ed Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Mon, 13 Apr 2020 13:18:27 +0800