diff --git a/.gitignore b/.gitignore
index 43c50e746..349494889 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-/*
-!/forge
\ No newline at end of file
+/fml/
+/logs/
+/*.pyc
+/forge-*/
diff --git a/forge/bin/diff.exe b/bin/diff.exe
similarity index 100%
rename from forge/bin/diff.exe
rename to bin/diff.exe
diff --git a/forge/bin/find.exe b/bin/find.exe
similarity index 100%
rename from forge/bin/find.exe
rename to bin/find.exe
diff --git a/forge/bin/grep.exe b/bin/grep.exe
similarity index 100%
rename from forge/bin/grep.exe
rename to bin/grep.exe
diff --git a/forge/bin/libiconv2.dll b/bin/libiconv2.dll
similarity index 100%
rename from forge/bin/libiconv2.dll
rename to bin/libiconv2.dll
diff --git a/forge/bin/libintl3.dll b/bin/libintl3.dll
similarity index 100%
rename from forge/bin/libintl3.dll
rename to bin/libintl3.dll
diff --git a/forge/bin/mkdir.exe b/bin/mkdir.exe
similarity index 100%
rename from forge/bin/mkdir.exe
rename to bin/mkdir.exe
diff --git a/forge/bin/pcre3.dll b/bin/pcre3.dll
similarity index 100%
rename from forge/bin/pcre3.dll
rename to bin/pcre3.dll
diff --git a/forge/bin/regex2.dll b/bin/regex2.dll
similarity index 100%
rename from forge/bin/regex2.dll
rename to bin/regex2.dll
diff --git a/forge/bin/sed.exe b/bin/sed.exe
similarity index 100%
rename from forge/bin/sed.exe
rename to bin/sed.exe
diff --git a/forge/bin/tr.exe b/bin/tr.exe
similarity index 100%
rename from forge/bin/tr.exe
rename to bin/tr.exe
diff --git a/forge/build.bat b/build.bat
old mode 100755
new mode 100644
similarity index 100%
rename from forge/build.bat
rename to build.bat
diff --git a/forge/build.py b/build.py
similarity index 100%
rename from forge/build.py
rename to build.py
diff --git a/forge/build.sh b/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from forge/build.sh
rename to build.sh
diff --git a/forge/conf/astyle.cfg b/conf/astyle.cfg
similarity index 100%
rename from forge/conf/astyle.cfg
rename to conf/astyle.cfg
diff --git a/forge/conf/client.exc b/conf/client.exc
similarity index 100%
rename from forge/conf/client.exc
rename to conf/client.exc
diff --git a/forge/conf/client.srg b/conf/client.srg
similarity index 100%
rename from forge/conf/client.srg
rename to conf/client.srg
diff --git a/forge/conf/fields.csv b/conf/fields.csv
similarity index 100%
rename from forge/conf/fields.csv
rename to conf/fields.csv
diff --git a/forge/conf/mcp.cfg b/conf/mcp.cfg
similarity index 100%
rename from forge/conf/mcp.cfg
rename to conf/mcp.cfg
diff --git a/forge/conf/methods.csv b/conf/methods.csv
similarity index 100%
rename from forge/conf/methods.csv
rename to conf/methods.csv
diff --git a/forge/conf/params.csv b/conf/params.csv
similarity index 100%
rename from forge/conf/params.csv
rename to conf/params.csv
diff --git a/forge/conf/patches/Start.java b/conf/patches/Start.java
similarity index 100%
rename from forge/conf/patches/Start.java
rename to conf/patches/Start.java
diff --git a/forge/conf/patches/gk.java b/conf/patches/gk.java
similarity index 100%
rename from forge/conf/patches/gk.java
rename to conf/patches/gk.java
diff --git a/forge/conf/patches/minecraft.patch b/conf/patches/minecraft.patch
similarity index 100%
rename from forge/conf/patches/minecraft.patch
rename to conf/patches/minecraft.patch
diff --git a/forge/conf/patches/minecraft_ff.patch b/conf/patches/minecraft_ff.patch
similarity index 100%
rename from forge/conf/patches/minecraft_ff.patch
rename to conf/patches/minecraft_ff.patch
diff --git a/forge/conf/patches/minecraft_osx.patch b/conf/patches/minecraft_osx.patch
similarity index 100%
rename from forge/conf/patches/minecraft_osx.patch
rename to conf/patches/minecraft_osx.patch
diff --git a/forge/conf/patches/minecraft_server.patch b/conf/patches/minecraft_server.patch
similarity index 100%
rename from forge/conf/patches/minecraft_server.patch
rename to conf/patches/minecraft_server.patch
diff --git a/forge/conf/patches/minecraft_server_ff.patch b/conf/patches/minecraft_server_ff.patch
similarity index 100%
rename from forge/conf/patches/minecraft_server_ff.patch
rename to conf/patches/minecraft_server_ff.patch
diff --git a/forge/conf/patches/minecraft_server_osx.patch b/conf/patches/minecraft_server_osx.patch
similarity index 100%
rename from forge/conf/patches/minecraft_server_osx.patch
rename to conf/patches/minecraft_server_osx.patch
diff --git a/forge/conf/patches/splashes.txt b/conf/patches/splashes.txt
similarity index 100%
rename from forge/conf/patches/splashes.txt
rename to conf/patches/splashes.txt
diff --git a/forge/conf/server.exc b/conf/server.exc
similarity index 100%
rename from forge/conf/server.exc
rename to conf/server.exc
diff --git a/forge/conf/server.srg b/conf/server.srg
similarity index 100%
rename from forge/conf/server.srg
rename to conf/server.srg
diff --git a/forge/conf/version.cfg b/conf/version.cfg
similarity index 100%
rename from forge/conf/version.cfg
rename to conf/version.cfg
diff --git a/forge/fml-src-2.2.106.176.zip b/fml-src-2.2.106.176.zip
similarity index 100%
rename from forge/fml-src-2.2.106.176.zip
rename to fml-src-2.2.106.176.zip
diff --git a/forge/forge.py b/forge.py
similarity index 100%
rename from forge/forge.py
rename to forge.py
diff --git a/forge/.gitignore b/forge/.gitignore
deleted file mode 100644
index 349494889..000000000
--- a/forge/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/fml/
-/logs/
-/*.pyc
-/forge-*/
diff --git a/forge/forge_client/.classpath b/forge_client/.classpath
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_client/.classpath
rename to forge_client/.classpath
diff --git a/forge/forge_client/.gitignore b/forge_client/.gitignore
similarity index 100%
rename from forge/forge_client/.gitignore
rename to forge_client/.gitignore
diff --git a/forge/forge_client/.project b/forge_client/.project
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_client/.project
rename to forge_client/.project
diff --git a/forge/forge_client/src/forge_logo.png b/forge_client/src/forge_logo.png
similarity index 100%
rename from forge/forge_client/src/forge_logo.png
rename to forge_client/src/forge_logo.png
diff --git a/forge/forge_client/src/ibxm/Channel.java b/forge_client/src/ibxm/Channel.java
similarity index 100%
rename from forge/forge_client/src/ibxm/Channel.java
rename to forge_client/src/ibxm/Channel.java
diff --git a/forge/forge_client/src/ibxm/Envelope.java b/forge_client/src/ibxm/Envelope.java
similarity index 100%
rename from forge/forge_client/src/ibxm/Envelope.java
rename to forge_client/src/ibxm/Envelope.java
diff --git a/forge/forge_client/src/ibxm/FastTracker2.java b/forge_client/src/ibxm/FastTracker2.java
similarity index 100%
rename from forge/forge_client/src/ibxm/FastTracker2.java
rename to forge_client/src/ibxm/FastTracker2.java
diff --git a/forge/forge_client/src/ibxm/IBXM.java b/forge_client/src/ibxm/IBXM.java
similarity index 100%
rename from forge/forge_client/src/ibxm/IBXM.java
rename to forge_client/src/ibxm/IBXM.java
diff --git a/forge/forge_client/src/ibxm/Instrument.java b/forge_client/src/ibxm/Instrument.java
similarity index 100%
rename from forge/forge_client/src/ibxm/Instrument.java
rename to forge_client/src/ibxm/Instrument.java
diff --git a/forge/forge_client/src/ibxm/LogTable.java b/forge_client/src/ibxm/LogTable.java
similarity index 100%
rename from forge/forge_client/src/ibxm/LogTable.java
rename to forge_client/src/ibxm/LogTable.java
diff --git a/forge/forge_client/src/ibxm/Module.java b/forge_client/src/ibxm/Module.java
similarity index 100%
rename from forge/forge_client/src/ibxm/Module.java
rename to forge_client/src/ibxm/Module.java
diff --git a/forge/forge_client/src/ibxm/Pattern.java b/forge_client/src/ibxm/Pattern.java
similarity index 100%
rename from forge/forge_client/src/ibxm/Pattern.java
rename to forge_client/src/ibxm/Pattern.java
diff --git a/forge/forge_client/src/ibxm/Player.java b/forge_client/src/ibxm/Player.java
similarity index 100%
rename from forge/forge_client/src/ibxm/Player.java
rename to forge_client/src/ibxm/Player.java
diff --git a/forge/forge_client/src/ibxm/ProTracker.java b/forge_client/src/ibxm/ProTracker.java
similarity index 100%
rename from forge/forge_client/src/ibxm/ProTracker.java
rename to forge_client/src/ibxm/ProTracker.java
diff --git a/forge/forge_client/src/ibxm/Sample.java b/forge_client/src/ibxm/Sample.java
similarity index 100%
rename from forge/forge_client/src/ibxm/Sample.java
rename to forge_client/src/ibxm/Sample.java
diff --git a/forge/forge_client/src/ibxm/ScreamTracker3.java b/forge_client/src/ibxm/ScreamTracker3.java
similarity index 100%
rename from forge/forge_client/src/ibxm/ScreamTracker3.java
rename to forge_client/src/ibxm/ScreamTracker3.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java b/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java
rename to forge_client/src/net/minecraft/src/forge/EnumHelperClient.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java
rename to forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/GuiControlsScrollPanel.java b/forge_client/src/net/minecraft/src/forge/GuiControlsScrollPanel.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/GuiControlsScrollPanel.java
rename to forge_client/src/net/minecraft/src/forge/GuiControlsScrollPanel.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/GuiMissingMods.java b/forge_client/src/net/minecraft/src/forge/GuiMissingMods.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/GuiMissingMods.java
rename to forge_client/src/net/minecraft/src/forge/GuiMissingMods.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java b/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java
rename to forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/IHighlightHandler.java b/forge_client/src/net/minecraft/src/forge/IHighlightHandler.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/IHighlightHandler.java
rename to forge_client/src/net/minecraft/src/forge/IHighlightHandler.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/IItemRenderer.java b/forge_client/src/net/minecraft/src/forge/IItemRenderer.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/IItemRenderer.java
rename to forge_client/src/net/minecraft/src/forge/IItemRenderer.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java b/forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java
rename to forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java b/forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java
rename to forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/ISoundHandler.java b/forge_client/src/net/minecraft/src/forge/ISoundHandler.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/ISoundHandler.java
rename to forge_client/src/net/minecraft/src/forge/ISoundHandler.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/ITextureLoadHandler.java b/forge_client/src/net/minecraft/src/forge/ITextureLoadHandler.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/ITextureLoadHandler.java
rename to forge_client/src/net/minecraft/src/forge/ITextureLoadHandler.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/ItemRenderType.java b/forge_client/src/net/minecraft/src/forge/ItemRenderType.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/ItemRenderType.java
rename to forge_client/src/net/minecraft/src/forge/ItemRenderType.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java
rename to forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/ModCompatibilityClient.java b/forge_client/src/net/minecraft/src/forge/ModCompatibilityClient.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/ModCompatibilityClient.java
rename to forge_client/src/net/minecraft/src/forge/ModCompatibilityClient.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/PacketHandlerClient.java b/forge_client/src/net/minecraft/src/forge/PacketHandlerClient.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/PacketHandlerClient.java
rename to forge_client/src/net/minecraft/src/forge/PacketHandlerClient.java
diff --git a/forge/forge_client/src/net/minecraft/src/forge/adaptors/SoundHandlerAdaptor.java b/forge_client/src/net/minecraft/src/forge/adaptors/SoundHandlerAdaptor.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/forge/adaptors/SoundHandlerAdaptor.java
rename to forge_client/src/net/minecraft/src/forge/adaptors/SoundHandlerAdaptor.java
diff --git a/forge/forge_client/src/net/minecraft/src/mod_MinecraftForge.java b/forge_client/src/net/minecraft/src/mod_MinecraftForge.java
similarity index 100%
rename from forge/forge_client/src/net/minecraft/src/mod_MinecraftForge.java
rename to forge_client/src/net/minecraft/src/mod_MinecraftForge.java
diff --git a/forge/forge_client/src/paulscode/sound/codecs/CodecIBXM.java b/forge_client/src/paulscode/sound/codecs/CodecIBXM.java
similarity index 100%
rename from forge/forge_client/src/paulscode/sound/codecs/CodecIBXM.java
rename to forge_client/src/paulscode/sound/codecs/CodecIBXM.java
diff --git a/forge/forge_common/mod_MinecraftForge.info b/forge_common/mod_MinecraftForge.info
similarity index 100%
rename from forge/forge_common/mod_MinecraftForge.info
rename to forge_common/mod_MinecraftForge.info
diff --git a/forge/forge_common/net/minecraft/src/forge/AchievementPage.java b/forge_common/net/minecraft/src/forge/AchievementPage.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/AchievementPage.java
rename to forge_common/net/minecraft/src/forge/AchievementPage.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java b/forge_common/net/minecraft/src/forge/ArmorProperties.java
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ArmorProperties.java
rename to forge_common/net/minecraft/src/forge/ArmorProperties.java
diff --git a/forge/forge_common/net/minecraft/src/forge/Configuration.java b/forge_common/net/minecraft/src/forge/Configuration.java
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/Configuration.java
rename to forge_common/net/minecraft/src/forge/Configuration.java
diff --git a/forge/forge_common/net/minecraft/src/forge/DimensionManager.java b/forge_common/net/minecraft/src/forge/DimensionManager.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/DimensionManager.java
rename to forge_common/net/minecraft/src/forge/DimensionManager.java
diff --git a/forge/forge_common/net/minecraft/src/forge/DungeonLoot.java b/forge_common/net/minecraft/src/forge/DungeonLoot.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/DungeonLoot.java
rename to forge_common/net/minecraft/src/forge/DungeonLoot.java
diff --git a/forge/forge_common/net/minecraft/src/forge/EntityTrackerInfo.java b/forge_common/net/minecraft/src/forge/EntityTrackerInfo.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/EntityTrackerInfo.java
rename to forge_common/net/minecraft/src/forge/EntityTrackerInfo.java
diff --git a/forge/forge_common/net/minecraft/src/forge/EnumHelper.java b/forge_common/net/minecraft/src/forge/EnumHelper.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/EnumHelper.java
rename to forge_common/net/minecraft/src/forge/EnumHelper.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge_common/net/minecraft/src/forge/ForgeHooks.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ForgeHooks.java
rename to forge_common/net/minecraft/src/forge/ForgeHooks.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IArrowLooseHandler.java b/forge_common/net/minecraft/src/forge/IArrowLooseHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IArrowLooseHandler.java
rename to forge_common/net/minecraft/src/forge/IArrowLooseHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IArrowNockHandler.java b/forge_common/net/minecraft/src/forge/IArrowNockHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IArrowNockHandler.java
rename to forge_common/net/minecraft/src/forge/IArrowNockHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IBonemealHandler.java b/forge_common/net/minecraft/src/forge/IBonemealHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IBonemealHandler.java
rename to forge_common/net/minecraft/src/forge/IBonemealHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java b/forge_common/net/minecraft/src/forge/IBucketHandler.java
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IBucketHandler.java
rename to forge_common/net/minecraft/src/forge/IBucketHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IChatHandler.java b/forge_common/net/minecraft/src/forge/IChatHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IChatHandler.java
rename to forge_common/net/minecraft/src/forge/IChatHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java b/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java
rename to forge_common/net/minecraft/src/forge/IChunkLoadHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java b/forge_common/net/minecraft/src/forge/IConnectRedstone.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java
rename to forge_common/net/minecraft/src/forge/IConnectRedstone.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IConnectionHandler.java b/forge_common/net/minecraft/src/forge/IConnectionHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IConnectionHandler.java
rename to forge_common/net/minecraft/src/forge/IConnectionHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ICraftingHandler.java b/forge_common/net/minecraft/src/forge/ICraftingHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ICraftingHandler.java
rename to forge_common/net/minecraft/src/forge/ICraftingHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java b/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java
rename to forge_common/net/minecraft/src/forge/IDestroyToolHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IEntityInteractHandler.java b/forge_common/net/minecraft/src/forge/IEntityInteractHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IEntityInteractHandler.java
rename to forge_common/net/minecraft/src/forge/IEntityInteractHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IEntityLivingHandler.java b/forge_common/net/minecraft/src/forge/IEntityLivingHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IEntityLivingHandler.java
rename to forge_common/net/minecraft/src/forge/IEntityLivingHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IFuelHandler.java b/forge_common/net/minecraft/src/forge/IFuelHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IFuelHandler.java
rename to forge_common/net/minecraft/src/forge/IFuelHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IGuiHandler.java b/forge_common/net/minecraft/src/forge/IGuiHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IGuiHandler.java
rename to forge_common/net/minecraft/src/forge/IGuiHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IHoeHandler.java b/forge_common/net/minecraft/src/forge/IHoeHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IHoeHandler.java
rename to forge_common/net/minecraft/src/forge/IHoeHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IMinecartCollisionHandler.java b/forge_common/net/minecraft/src/forge/IMinecartCollisionHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IMinecartCollisionHandler.java
rename to forge_common/net/minecraft/src/forge/IMinecartCollisionHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IMinecartHandler.java b/forge_common/net/minecraft/src/forge/IMinecartHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IMinecartHandler.java
rename to forge_common/net/minecraft/src/forge/IMinecartHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java b/forge_common/net/minecraft/src/forge/IMultipassRender.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IMultipassRender.java
rename to forge_common/net/minecraft/src/forge/IMultipassRender.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IOreHandler.java b/forge_common/net/minecraft/src/forge/IOreHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IOreHandler.java
rename to forge_common/net/minecraft/src/forge/IOreHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java b/forge_common/net/minecraft/src/forge/IOverrideReplace.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java
rename to forge_common/net/minecraft/src/forge/IOverrideReplace.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IPacketHandler.java b/forge_common/net/minecraft/src/forge/IPacketHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IPacketHandler.java
rename to forge_common/net/minecraft/src/forge/IPacketHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IPickupHandler.java b/forge_common/net/minecraft/src/forge/IPickupHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IPickupHandler.java
rename to forge_common/net/minecraft/src/forge/IPickupHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ISaveEventHandler.java b/forge_common/net/minecraft/src/forge/ISaveEventHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ISaveEventHandler.java
rename to forge_common/net/minecraft/src/forge/ISaveEventHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IShearable.java b/forge_common/net/minecraft/src/forge/IShearable.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IShearable.java
rename to forge_common/net/minecraft/src/forge/IShearable.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ISidedInventory.java b/forge_common/net/minecraft/src/forge/ISidedInventory.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ISidedInventory.java
rename to forge_common/net/minecraft/src/forge/ISidedInventory.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ISleepHandler.java b/forge_common/net/minecraft/src/forge/ISleepHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ISleepHandler.java
rename to forge_common/net/minecraft/src/forge/ISleepHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ISpawnHandler.java b/forge_common/net/minecraft/src/forge/ISpawnHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ISpawnHandler.java
rename to forge_common/net/minecraft/src/forge/ISpawnHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java b/forge_common/net/minecraft/src/forge/ISpecialArmor.java
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java
rename to forge_common/net/minecraft/src/forge/ISpecialArmor.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ISpecialMobSpawnHandler.java b/forge_common/net/minecraft/src/forge/ISpecialMobSpawnHandler.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ISpecialMobSpawnHandler.java
rename to forge_common/net/minecraft/src/forge/ISpecialMobSpawnHandler.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java b/forge_common/net/minecraft/src/forge/ISpecialResistance.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java
rename to forge_common/net/minecraft/src/forge/ISpecialResistance.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ITextureProvider.java b/forge_common/net/minecraft/src/forge/ITextureProvider.java
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ITextureProvider.java
rename to forge_common/net/minecraft/src/forge/ITextureProvider.java
diff --git a/forge/forge_common/net/minecraft/src/forge/IThrowableEntity.java b/forge_common/net/minecraft/src/forge/IThrowableEntity.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/IThrowableEntity.java
rename to forge_common/net/minecraft/src/forge/IThrowableEntity.java
diff --git a/forge/forge_common/net/minecraft/src/forge/MessageManager.java b/forge_common/net/minecraft/src/forge/MessageManager.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/MessageManager.java
rename to forge_common/net/minecraft/src/forge/MessageManager.java
diff --git a/forge/forge_common/net/minecraft/src/forge/MinecartKey.java b/forge_common/net/minecraft/src/forge/MinecartKey.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/MinecartKey.java
rename to forge_common/net/minecraft/src/forge/MinecartKey.java
diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge_common/net/minecraft/src/forge/MinecraftForge.java
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/MinecraftForge.java
rename to forge_common/net/minecraft/src/forge/MinecraftForge.java
diff --git a/forge/forge_common/net/minecraft/src/forge/NetworkMod.java b/forge_common/net/minecraft/src/forge/NetworkMod.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/NetworkMod.java
rename to forge_common/net/minecraft/src/forge/NetworkMod.java
diff --git a/forge/forge_common/net/minecraft/src/forge/ObjectPair.java b/forge_common/net/minecraft/src/forge/ObjectPair.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/ObjectPair.java
rename to forge_common/net/minecraft/src/forge/ObjectPair.java
diff --git a/forge/forge_common/net/minecraft/src/forge/Property.java b/forge_common/net/minecraft/src/forge/Property.java
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/Property.java
rename to forge_common/net/minecraft/src/forge/Property.java
diff --git a/forge/forge_common/net/minecraft/src/forge/adaptors/EntityLivingHandlerAdaptor.java b/forge_common/net/minecraft/src/forge/adaptors/EntityLivingHandlerAdaptor.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/adaptors/EntityLivingHandlerAdaptor.java
rename to forge_common/net/minecraft/src/forge/adaptors/EntityLivingHandlerAdaptor.java
diff --git a/forge/forge_common/net/minecraft/src/forge/oredict/OreDictionary.java b/forge_common/net/minecraft/src/forge/oredict/OreDictionary.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/oredict/OreDictionary.java
rename to forge_common/net/minecraft/src/forge/oredict/OreDictionary.java
diff --git a/forge/forge_common/net/minecraft/src/forge/oredict/ShapedOreRecipe.java b/forge_common/net/minecraft/src/forge/oredict/ShapedOreRecipe.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/oredict/ShapedOreRecipe.java
rename to forge_common/net/minecraft/src/forge/oredict/ShapedOreRecipe.java
diff --git a/forge/forge_common/net/minecraft/src/forge/oredict/ShapelessOreRecipe.java b/forge_common/net/minecraft/src/forge/oredict/ShapelessOreRecipe.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/oredict/ShapelessOreRecipe.java
rename to forge_common/net/minecraft/src/forge/oredict/ShapelessOreRecipe.java
diff --git a/forge/forge_common/net/minecraft/src/forge/packets/ForgePacket.java b/forge_common/net/minecraft/src/forge/packets/ForgePacket.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/packets/ForgePacket.java
rename to forge_common/net/minecraft/src/forge/packets/ForgePacket.java
diff --git a/forge/forge_common/net/minecraft/src/forge/packets/PacketEntitySpawn.java b/forge_common/net/minecraft/src/forge/packets/PacketEntitySpawn.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/packets/PacketEntitySpawn.java
rename to forge_common/net/minecraft/src/forge/packets/PacketEntitySpawn.java
diff --git a/forge/forge_common/net/minecraft/src/forge/packets/PacketEntityTrack.java b/forge_common/net/minecraft/src/forge/packets/PacketEntityTrack.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/packets/PacketEntityTrack.java
rename to forge_common/net/minecraft/src/forge/packets/PacketEntityTrack.java
diff --git a/forge/forge_common/net/minecraft/src/forge/packets/PacketHandlerBase.java b/forge_common/net/minecraft/src/forge/packets/PacketHandlerBase.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/packets/PacketHandlerBase.java
rename to forge_common/net/minecraft/src/forge/packets/PacketHandlerBase.java
diff --git a/forge/forge_common/net/minecraft/src/forge/packets/PacketMissingMods.java b/forge_common/net/minecraft/src/forge/packets/PacketMissingMods.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/packets/PacketMissingMods.java
rename to forge_common/net/minecraft/src/forge/packets/PacketMissingMods.java
diff --git a/forge/forge_common/net/minecraft/src/forge/packets/PacketModList.java b/forge_common/net/minecraft/src/forge/packets/PacketModList.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/packets/PacketModList.java
rename to forge_common/net/minecraft/src/forge/packets/PacketModList.java
diff --git a/forge/forge_common/net/minecraft/src/forge/packets/PacketOpenGUI.java b/forge_common/net/minecraft/src/forge/packets/PacketOpenGUI.java
similarity index 100%
rename from forge/forge_common/net/minecraft/src/forge/packets/PacketOpenGUI.java
rename to forge_common/net/minecraft/src/forge/packets/PacketOpenGUI.java
diff --git a/forge/forge_server/.classpath b/forge_server/.classpath
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_server/.classpath
rename to forge_server/.classpath
diff --git a/forge/forge_server/.gitignore b/forge_server/.gitignore
similarity index 100%
rename from forge/forge_server/.gitignore
rename to forge_server/.gitignore
diff --git a/forge/forge_server/.project b/forge_server/.project
old mode 100755
new mode 100644
similarity index 100%
rename from forge/forge_server/.project
rename to forge_server/.project
diff --git a/forge/forge_server/src/net/minecraft/src/forge/ForgeHooksServer.java b/forge_server/src/net/minecraft/src/forge/ForgeHooksServer.java
similarity index 100%
rename from forge/forge_server/src/net/minecraft/src/forge/ForgeHooksServer.java
rename to forge_server/src/net/minecraft/src/forge/ForgeHooksServer.java
diff --git a/forge/forge_server/src/net/minecraft/src/forge/PacketHandlerServer.java b/forge_server/src/net/minecraft/src/forge/PacketHandlerServer.java
similarity index 100%
rename from forge/forge_server/src/net/minecraft/src/forge/PacketHandlerServer.java
rename to forge_server/src/net/minecraft/src/forge/PacketHandlerServer.java
diff --git a/forge/forge_server/src/net/minecraft/src/mod_MinecraftForge.java b/forge_server/src/net/minecraft/src/mod_MinecraftForge.java
similarity index 100%
rename from forge/forge_server/src/net/minecraft/src/mod_MinecraftForge.java
rename to forge_server/src/net/minecraft/src/mod_MinecraftForge.java
diff --git a/forge/install/MinecraftForge-Credits.txt b/install/MinecraftForge-Credits.txt
similarity index 100%
rename from forge/install/MinecraftForge-Credits.txt
rename to install/MinecraftForge-Credits.txt
diff --git a/forge/install/MinecraftForge-License.txt b/install/MinecraftForge-License.txt
similarity index 100%
rename from forge/install/MinecraftForge-License.txt
rename to install/MinecraftForge-License.txt
diff --git a/forge/install/Paulscode IBXM Library License.txt b/install/Paulscode IBXM Library License.txt
similarity index 100%
rename from forge/install/Paulscode IBXM Library License.txt
rename to install/Paulscode IBXM Library License.txt
diff --git a/forge/install/Paulscode SoundSystem CodecIBXM License.txt b/install/Paulscode SoundSystem CodecIBXM License.txt
similarity index 100%
rename from forge/install/Paulscode SoundSystem CodecIBXM License.txt
rename to install/Paulscode SoundSystem CodecIBXM License.txt
diff --git a/forge/install/README-MinecraftForge.txt b/install/README-MinecraftForge.txt
similarity index 100%
rename from forge/install/README-MinecraftForge.txt
rename to install/README-MinecraftForge.txt
diff --git a/forge/install/install.cmd b/install/install.cmd
old mode 100755
new mode 100644
similarity index 100%
rename from forge/install/install.cmd
rename to install/install.cmd
diff --git a/forge/install/install.py b/install/install.py
similarity index 100%
rename from forge/install/install.py
rename to install/install.py
diff --git a/forge/install/install.sh b/install/install.sh
similarity index 100%
rename from forge/install/install.sh
rename to install/install.sh
diff --git a/forge/jenkins.bat b/jenkins.bat
similarity index 100%
rename from forge/jenkins.bat
rename to jenkins.bat
diff --git a/forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch
rename to patches/minecraft/net/minecraft/client/Minecraft.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/AnvilChunkLoader.java.patch b/patches/minecraft/net/minecraft/src/AnvilChunkLoader.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/AnvilChunkLoader.java.patch
rename to patches/minecraft/net/minecraft/src/AnvilChunkLoader.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/AnvilSaveHandler.java.patch b/patches/minecraft/net/minecraft/src/AnvilSaveHandler.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/AnvilSaveHandler.java.patch
rename to patches/minecraft/net/minecraft/src/AnvilSaveHandler.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/patches/minecraft/net/minecraft/src/Block.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/Block.java.patch
rename to patches/minecraft/net/minecraft/src/Block.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch b/patches/minecraft/net/minecraft/src/BlockButton.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch
rename to patches/minecraft/net/minecraft/src/BlockButton.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch b/patches/minecraft/net/minecraft/src/BlockChest.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch
rename to patches/minecraft/net/minecraft/src/BlockChest.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch b/patches/minecraft/net/minecraft/src/BlockContainer.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch
rename to patches/minecraft/net/minecraft/src/BlockContainer.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/patches/minecraft/net/minecraft/src/BlockCrops.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch
rename to patches/minecraft/net/minecraft/src/BlockCrops.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch b/patches/minecraft/net/minecraft/src/BlockDoor.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch
rename to patches/minecraft/net/minecraft/src/BlockDoor.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch b/patches/minecraft/net/minecraft/src/BlockFire.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch
rename to patches/minecraft/net/minecraft/src/BlockFire.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch b/patches/minecraft/net/minecraft/src/BlockLadder.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch
rename to patches/minecraft/net/minecraft/src/BlockLadder.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLeaves.java.patch b/patches/minecraft/net/minecraft/src/BlockLeaves.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockLeaves.java.patch
rename to patches/minecraft/net/minecraft/src/BlockLeaves.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch b/patches/minecraft/net/minecraft/src/BlockLever.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch
rename to patches/minecraft/net/minecraft/src/BlockLever.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLog.java.patch b/patches/minecraft/net/minecraft/src/BlockLog.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockLog.java.patch
rename to patches/minecraft/net/minecraft/src/BlockLog.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch b/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch
rename to patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch b/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch
rename to patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch b/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch
rename to patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch b/patches/minecraft/net/minecraft/src/BlockRail.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch
rename to patches/minecraft/net/minecraft/src/BlockRail.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch b/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch
rename to patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch b/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch
rename to patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch b/patches/minecraft/net/minecraft/src/BlockSnow.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockSnow.java.patch
rename to patches/minecraft/net/minecraft/src/BlockSnow.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch b/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch
rename to patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch b/patches/minecraft/net/minecraft/src/BlockTorch.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch
rename to patches/minecraft/net/minecraft/src/BlockTorch.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch b/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch
rename to patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch b/patches/minecraft/net/minecraft/src/BlockVine.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch
rename to patches/minecraft/net/minecraft/src/BlockVine.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/patches/minecraft/net/minecraft/src/Chunk.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/Chunk.java.patch
rename to patches/minecraft/net/minecraft/src/Chunk.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch b/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch
rename to patches/minecraft/net/minecraft/src/ChunkProvider.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch b/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch
rename to patches/minecraft/net/minecraft/src/ContainerCreative.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ContainerFurnace.java.patch b/patches/minecraft/net/minecraft/src/ContainerFurnace.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ContainerFurnace.java.patch
rename to patches/minecraft/net/minecraft/src/ContainerFurnace.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/CraftingManager.java.patch b/patches/minecraft/net/minecraft/src/CraftingManager.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/CraftingManager.java.patch
rename to patches/minecraft/net/minecraft/src/CraftingManager.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch
rename to patches/minecraft/net/minecraft/src/EffectRenderer.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch b/patches/minecraft/net/minecraft/src/Enchantment.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch
rename to patches/minecraft/net/minecraft/src/Enchantment.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EnchantmentHelper.java.patch b/patches/minecraft/net/minecraft/src/EnchantmentHelper.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EnchantmentHelper.java.patch
rename to patches/minecraft/net/minecraft/src/EnchantmentHelper.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/Entity.java.patch b/patches/minecraft/net/minecraft/src/Entity.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/Entity.java.patch
rename to patches/minecraft/net/minecraft/src/Entity.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityEnderman.java.patch b/patches/minecraft/net/minecraft/src/EntityEnderman.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EntityEnderman.java.patch
rename to patches/minecraft/net/minecraft/src/EntityEnderman.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityItem.java.patch b/patches/minecraft/net/minecraft/src/EntityItem.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EntityItem.java.patch
rename to patches/minecraft/net/minecraft/src/EntityItem.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch b/patches/minecraft/net/minecraft/src/EntityLiving.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch
rename to patches/minecraft/net/minecraft/src/EntityLiving.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityMinecart.java.patch b/patches/minecraft/net/minecraft/src/EntityMinecart.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EntityMinecart.java.patch
rename to patches/minecraft/net/minecraft/src/EntityMinecart.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityMooshroom.java.patch b/patches/minecraft/net/minecraft/src/EntityMooshroom.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EntityMooshroom.java.patch
rename to patches/minecraft/net/minecraft/src/EntityMooshroom.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityOcelot.java.patch b/patches/minecraft/net/minecraft/src/EntityOcelot.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EntityOcelot.java.patch
rename to patches/minecraft/net/minecraft/src/EntityOcelot.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
rename to patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch
rename to patches/minecraft/net/minecraft/src/EntityRenderer.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/EntitySheep.java.patch b/patches/minecraft/net/minecraft/src/EntitySheep.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/EntitySheep.java.patch
rename to patches/minecraft/net/minecraft/src/EntitySheep.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch b/patches/minecraft/net/minecraft/src/Explosion.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/Explosion.java.patch
rename to patches/minecraft/net/minecraft/src/Explosion.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch b/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch
rename to patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/GuiAchievements.java.patch b/patches/minecraft/net/minecraft/src/GuiAchievements.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/GuiAchievements.java.patch
rename to patches/minecraft/net/minecraft/src/GuiAchievements.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/GuiControls.java.patch b/patches/minecraft/net/minecraft/src/GuiControls.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/GuiControls.java.patch
rename to patches/minecraft/net/minecraft/src/GuiControls.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/GuiIngame.java.patch b/patches/minecraft/net/minecraft/src/GuiIngame.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/GuiIngame.java.patch
rename to patches/minecraft/net/minecraft/src/GuiIngame.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/patches/minecraft/net/minecraft/src/Item.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/Item.java.patch
rename to patches/minecraft/net/minecraft/src/Item.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch b/patches/minecraft/net/minecraft/src/ItemBlock.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch
rename to patches/minecraft/net/minecraft/src/ItemBlock.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBow.java.patch b/patches/minecraft/net/minecraft/src/ItemBow.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ItemBow.java.patch
rename to patches/minecraft/net/minecraft/src/ItemBow.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch b/patches/minecraft/net/minecraft/src/ItemBucket.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch
rename to patches/minecraft/net/minecraft/src/ItemBucket.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch b/patches/minecraft/net/minecraft/src/ItemDye.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch
rename to patches/minecraft/net/minecraft/src/ItemDye.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch b/patches/minecraft/net/minecraft/src/ItemHoe.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch
rename to patches/minecraft/net/minecraft/src/ItemHoe.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemMap.java.patch b/patches/minecraft/net/minecraft/src/ItemMap.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ItemMap.java.patch
rename to patches/minecraft/net/minecraft/src/ItemMap.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch
rename to patches/minecraft/net/minecraft/src/ItemRenderer.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemShears.java.patch b/patches/minecraft/net/minecraft/src/ItemShears.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ItemShears.java.patch
rename to patches/minecraft/net/minecraft/src/ItemShears.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch b/patches/minecraft/net/minecraft/src/ItemTool.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch
rename to patches/minecraft/net/minecraft/src/ItemTool.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch b/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch
rename to patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch b/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
rename to patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/NetworkManager.java.patch b/patches/minecraft/net/minecraft/src/NetworkManager.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/NetworkManager.java.patch
rename to patches/minecraft/net/minecraft/src/NetworkManager.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/Packet53BlockChange.java.patch b/patches/minecraft/net/minecraft/src/Packet53BlockChange.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/Packet53BlockChange.java.patch
rename to patches/minecraft/net/minecraft/src/Packet53BlockChange.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch b/patches/minecraft/net/minecraft/src/PlayerController.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch
rename to patches/minecraft/net/minecraft/src/PlayerController.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerCreative.java.patch b/patches/minecraft/net/minecraft/src/PlayerControllerCreative.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/PlayerControllerCreative.java.patch
rename to patches/minecraft/net/minecraft/src/PlayerControllerCreative.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch
rename to patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch
rename to patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/RailLogic.java.patch b/patches/minecraft/net/minecraft/src/RailLogic.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/RailLogic.java.patch
rename to patches/minecraft/net/minecraft/src/RailLogic.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBiped.java.patch b/patches/minecraft/net/minecraft/src/RenderBiped.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/RenderBiped.java.patch
rename to patches/minecraft/net/minecraft/src/RenderBiped.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
rename to patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/patches/minecraft/net/minecraft/src/RenderEngine.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch
rename to patches/minecraft/net/minecraft/src/RenderEngine.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch b/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch
rename to patches/minecraft/net/minecraft/src/RenderGlobal.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/patches/minecraft/net/minecraft/src/RenderItem.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch
rename to patches/minecraft/net/minecraft/src/RenderItem.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/RenderManager.java.patch b/patches/minecraft/net/minecraft/src/RenderManager.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/RenderManager.java.patch
rename to patches/minecraft/net/minecraft/src/RenderManager.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch b/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch
rename to patches/minecraft/net/minecraft/src/RenderPlayer.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/RenderSnowMan.java.patch b/patches/minecraft/net/minecraft/src/RenderSnowMan.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/RenderSnowMan.java.patch
rename to patches/minecraft/net/minecraft/src/RenderSnowMan.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch
rename to patches/minecraft/net/minecraft/src/SlotCrafting.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/SoundManager.java.patch b/patches/minecraft/net/minecraft/src/SoundManager.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/SoundManager.java.patch
rename to patches/minecraft/net/minecraft/src/SoundManager.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/SoundPool.java.patch b/patches/minecraft/net/minecraft/src/SoundPool.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/SoundPool.java.patch
rename to patches/minecraft/net/minecraft/src/SoundPool.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/SpawnerAnimals.java.patch b/patches/minecraft/net/minecraft/src/SpawnerAnimals.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/SpawnerAnimals.java.patch
rename to patches/minecraft/net/minecraft/src/SpawnerAnimals.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/StatList.java.patch b/patches/minecraft/net/minecraft/src/StatList.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/StatList.java.patch
rename to patches/minecraft/net/minecraft/src/StatList.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/Teleporter.java.patch b/patches/minecraft/net/minecraft/src/Teleporter.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/Teleporter.java.patch
rename to patches/minecraft/net/minecraft/src/Teleporter.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch b/patches/minecraft/net/minecraft/src/Tessellator.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch
rename to patches/minecraft/net/minecraft/src/Tessellator.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/patches/minecraft/net/minecraft/src/TileEntity.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch
rename to patches/minecraft/net/minecraft/src/TileEntity.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityBrewingStand.java.patch b/patches/minecraft/net/minecraft/src/TileEntityBrewingStand.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/TileEntityBrewingStand.java.patch
rename to patches/minecraft/net/minecraft/src/TileEntityBrewingStand.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch
rename to patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch b/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch
rename to patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/patches/minecraft/net/minecraft/src/World.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/World.java.patch
rename to patches/minecraft/net/minecraft/src/World.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenBigMushroom.java.patch b/patches/minecraft/net/minecraft/src/WorldGenBigMushroom.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenBigMushroom.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenBigMushroom.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenDeadBush.java.patch b/patches/minecraft/net/minecraft/src/WorldGenDeadBush.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenDeadBush.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenDeadBush.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenDungeons.java.patch b/patches/minecraft/net/minecraft/src/WorldGenDungeons.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenDungeons.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenDungeons.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenForest.java.patch b/patches/minecraft/net/minecraft/src/WorldGenForest.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenForest.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenForest.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenHugeTrees.java.patch b/patches/minecraft/net/minecraft/src/WorldGenHugeTrees.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenHugeTrees.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenHugeTrees.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenMinable.java.patch b/patches/minecraft/net/minecraft/src/WorldGenMinable.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenMinable.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenMinable.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenShrub.java.patch b/patches/minecraft/net/minecraft/src/WorldGenShrub.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenShrub.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenShrub.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenSwamp.java.patch b/patches/minecraft/net/minecraft/src/WorldGenSwamp.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenSwamp.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenSwamp.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenTaiga1.java.patch b/patches/minecraft/net/minecraft/src/WorldGenTaiga1.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenTaiga1.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenTaiga1.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenTaiga2.java.patch b/patches/minecraft/net/minecraft/src/WorldGenTaiga2.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenTaiga2.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenTaiga2.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenTallGrass.java.patch b/patches/minecraft/net/minecraft/src/WorldGenTallGrass.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenTallGrass.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenTallGrass.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenTrees.java.patch b/patches/minecraft/net/minecraft/src/WorldGenTrees.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldGenTrees.java.patch
rename to patches/minecraft/net/minecraft/src/WorldGenTrees.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldProvider.java.patch b/patches/minecraft/net/minecraft/src/WorldProvider.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldProvider.java.patch
rename to patches/minecraft/net/minecraft/src/WorldProvider.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldProviderEnd.java.patch b/patches/minecraft/net/minecraft/src/WorldProviderEnd.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldProviderEnd.java.patch
rename to patches/minecraft/net/minecraft/src/WorldProviderEnd.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldProviderHell.java.patch b/patches/minecraft/net/minecraft/src/WorldProviderHell.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldProviderHell.java.patch
rename to patches/minecraft/net/minecraft/src/WorldProviderHell.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldProviderSurface.java.patch b/patches/minecraft/net/minecraft/src/WorldProviderSurface.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldProviderSurface.java.patch
rename to patches/minecraft/net/minecraft/src/WorldProviderSurface.java.patch
diff --git a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch b/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch
similarity index 100%
rename from forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch
rename to patches/minecraft/net/minecraft/src/WorldRenderer.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
rename to patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/AnvilChunkLoader.java.patch b/patches/minecraft_server/net/minecraft/src/AnvilChunkLoader.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/AnvilChunkLoader.java.patch
rename to patches/minecraft_server/net/minecraft/src/AnvilChunkLoader.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/AnvilSaveHandler.java.patch b/patches/minecraft_server/net/minecraft/src/AnvilSaveHandler.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/AnvilSaveHandler.java.patch
rename to patches/minecraft_server/net/minecraft/src/AnvilSaveHandler.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/patches/minecraft_server/net/minecraft/src/Block.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/Block.java.patch
rename to patches/minecraft_server/net/minecraft/src/Block.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch b/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockButton.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch b/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockChest.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch b/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch b/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch b/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockFire.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockFire.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch b/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLeaves.java.patch b/patches/minecraft_server/net/minecraft/src/BlockLeaves.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockLeaves.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockLeaves.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch b/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockLever.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLog.java.patch b/patches/minecraft_server/net/minecraft/src/BlockLog.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockLog.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockLog.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockNetherStalk.java.patch b/patches/minecraft_server/net/minecraft/src/BlockNetherStalk.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockNetherStalk.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockNetherStalk.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockPistonBase.java.patch b/patches/minecraft_server/net/minecraft/src/BlockPistonBase.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockPistonBase.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockPistonBase.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch b/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch b/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockRail.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch b/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch b/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch b/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockSnow.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch b/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch b/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch b/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch b/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch
rename to patches/minecraft_server/net/minecraft/src/BlockVine.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/patches/minecraft_server/net/minecraft/src/Chunk.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch
rename to patches/minecraft_server/net/minecraft/src/Chunk.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ChunkProvider.java.patch b/patches/minecraft_server/net/minecraft/src/ChunkProvider.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ChunkProvider.java.patch
rename to patches/minecraft_server/net/minecraft/src/ChunkProvider.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch b/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch
rename to patches/minecraft_server/net/minecraft/src/ChunkProviderServer.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch b/patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch
rename to patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ContainerFurnace.java.patch b/patches/minecraft_server/net/minecraft/src/ContainerFurnace.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ContainerFurnace.java.patch
rename to patches/minecraft_server/net/minecraft/src/ContainerFurnace.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch b/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch
rename to patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch b/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch
rename to patches/minecraft_server/net/minecraft/src/Enchantment.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EnchantmentHelper.java.patch b/patches/minecraft_server/net/minecraft/src/EnchantmentHelper.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EnchantmentHelper.java.patch
rename to patches/minecraft_server/net/minecraft/src/EnchantmentHelper.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch b/patches/minecraft_server/net/minecraft/src/Entity.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch
rename to patches/minecraft_server/net/minecraft/src/Entity.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityEnderman.java.patch b/patches/minecraft_server/net/minecraft/src/EntityEnderman.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityEnderman.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityEnderman.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch b/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityItem.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityItem.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch b/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch b/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityMooshroom.java.patch b/patches/minecraft_server/net/minecraft/src/EntityMooshroom.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityMooshroom.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityMooshroom.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityOcelot.java.patch b/patches/minecraft_server/net/minecraft/src/EntityOcelot.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityOcelot.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityOcelot.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch b/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntitySheep.java.patch b/patches/minecraft_server/net/minecraft/src/EntitySheep.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntitySheep.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntitySheep.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityTracker.java.patch b/patches/minecraft_server/net/minecraft/src/EntityTracker.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityTracker.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityTracker.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityTrackerEntry.java.patch b/patches/minecraft_server/net/minecraft/src/EntityTrackerEntry.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/EntityTrackerEntry.java.patch
rename to patches/minecraft_server/net/minecraft/src/EntityTrackerEntry.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch b/patches/minecraft_server/net/minecraft/src/Explosion.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch
rename to patches/minecraft_server/net/minecraft/src/Explosion.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch b/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch
rename to patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/GuiStatsComponent.java.patch b/patches/minecraft_server/net/minecraft/src/GuiStatsComponent.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/GuiStatsComponent.java.patch
rename to patches/minecraft_server/net/minecraft/src/GuiStatsComponent.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/patches/minecraft_server/net/minecraft/src/Item.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/Item.java.patch
rename to patches/minecraft_server/net/minecraft/src/Item.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch b/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch
rename to patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBow.java.patch b/patches/minecraft_server/net/minecraft/src/ItemBow.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ItemBow.java.patch
rename to patches/minecraft_server/net/minecraft/src/ItemBow.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch b/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch
rename to patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch b/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch
rename to patches/minecraft_server/net/minecraft/src/ItemDye.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch b/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch
rename to patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch
rename to patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemMap.java.patch b/patches/minecraft_server/net/minecraft/src/ItemMap.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ItemMap.java.patch
rename to patches/minecraft_server/net/minecraft/src/ItemMap.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemShears.java.patch b/patches/minecraft_server/net/minecraft/src/ItemShears.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ItemShears.java.patch
rename to patches/minecraft_server/net/minecraft/src/ItemShears.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch b/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch
rename to patches/minecraft_server/net/minecraft/src/ItemTool.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch b/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch
rename to patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch b/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch
rename to patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch b/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
rename to patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/NetworkManager.java.patch b/patches/minecraft_server/net/minecraft/src/NetworkManager.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/NetworkManager.java.patch
rename to patches/minecraft_server/net/minecraft/src/NetworkManager.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet53BlockChange.java.patch b/patches/minecraft_server/net/minecraft/src/Packet53BlockChange.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/Packet53BlockChange.java.patch
rename to patches/minecraft_server/net/minecraft/src/Packet53BlockChange.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/RailLogic.java.patch b/patches/minecraft_server/net/minecraft/src/RailLogic.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/RailLogic.java.patch
rename to patches/minecraft_server/net/minecraft/src/RailLogic.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch b/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch
rename to patches/minecraft_server/net/minecraft/src/ServerConfigurationManager.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch b/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch
rename to patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/SpawnerAnimals.java.patch b/patches/minecraft_server/net/minecraft/src/SpawnerAnimals.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/SpawnerAnimals.java.patch
rename to patches/minecraft_server/net/minecraft/src/SpawnerAnimals.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/StatList.java.patch b/patches/minecraft_server/net/minecraft/src/StatList.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/StatList.java.patch
rename to patches/minecraft_server/net/minecraft/src/StatList.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch b/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch
rename to patches/minecraft_server/net/minecraft/src/Teleporter.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch b/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch
rename to patches/minecraft_server/net/minecraft/src/TileEntity.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch b/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch
rename to patches/minecraft_server/net/minecraft/src/TileEntityBrewingStand.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch
rename to patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/patches/minecraft_server/net/minecraft/src/World.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/World.java.patch
rename to patches/minecraft_server/net/minecraft/src/World.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenDeadBush.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenDeadBush.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenDeadBush.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenDeadBush.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenDungeons.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenDungeons.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenDungeons.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenDungeons.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenForest.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenForest.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenForest.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenForest.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenHugeTrees.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenHugeTrees.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenHugeTrees.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenHugeTrees.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenMinable.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenMinable.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenMinable.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenMinable.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenShrub.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenShrub.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenShrub.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenShrub.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenSwamp.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenSwamp.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenSwamp.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenSwamp.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenTaiga1.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenTaiga1.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenTaiga1.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenTaiga1.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenTaiga2.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenTaiga2.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenTaiga2.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenTaiga2.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenTallGrass.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenTallGrass.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenTallGrass.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenTallGrass.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenTrees.java.patch b/patches/minecraft_server/net/minecraft/src/WorldGenTrees.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldGenTrees.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldGenTrees.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch b/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldProvider.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldProviderEnd.java.patch b/patches/minecraft_server/net/minecraft/src/WorldProviderEnd.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldProviderEnd.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldProviderEnd.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldProviderHell.java.patch b/patches/minecraft_server/net/minecraft/src/WorldProviderHell.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldProviderHell.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldProviderHell.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldProviderSurface.java.patch b/patches/minecraft_server/net/minecraft/src/WorldProviderSurface.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldProviderSurface.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldProviderSurface.java.patch
diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch b/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch
similarity index 100%
rename from forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch
rename to patches/minecraft_server/net/minecraft/src/WorldServer.java.patch
diff --git a/forge/release.bat b/release.bat
old mode 100755
new mode 100644
similarity index 100%
rename from forge/release.bat
rename to release.bat
diff --git a/forge/release.py b/release.py
similarity index 100%
rename from forge/release.py
rename to release.py
diff --git a/forge/setup.bat b/setup.bat
old mode 100755
new mode 100644
similarity index 100%
rename from forge/setup.bat
rename to setup.bat
diff --git a/forge/setup.py b/setup.py
similarity index 100%
rename from forge/setup.py
rename to setup.py
diff --git a/forge/setup.sh b/setup.sh
old mode 100755
new mode 100644
similarity index 100%
rename from forge/setup.sh
rename to setup.sh
diff --git a/forge/update_patches.bat b/update_patches.bat
similarity index 100%
rename from forge/update_patches.bat
rename to update_patches.bat
diff --git a/forge/update_patches.py b/update_patches.py
similarity index 100%
rename from forge/update_patches.py
rename to update_patches.py
diff --git a/forge/update_patches.sh b/update_patches.sh
old mode 100755
new mode 100644
similarity index 100%
rename from forge/update_patches.sh
rename to update_patches.sh