diff --git a/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java b/src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java
similarity index 100%
rename from client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java
rename to src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java
diff --git a/client/cpw/mods/fml/client/FMLClientHandler.java b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
similarity index 100%
rename from client/cpw/mods/fml/client/FMLClientHandler.java
rename to src/main/java/cpw/mods/fml/client/FMLClientHandler.java
diff --git a/client/cpw/mods/fml/client/FMLFileResourcePack.java b/src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java
similarity index 100%
rename from client/cpw/mods/fml/client/FMLFileResourcePack.java
rename to src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java
diff --git a/client/cpw/mods/fml/client/FMLFolderResourcePack.java b/src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java
similarity index 100%
rename from client/cpw/mods/fml/client/FMLFolderResourcePack.java
rename to src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java
diff --git a/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java b/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java
rename to src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java
diff --git a/client/cpw/mods/fml/client/GuiDupesFound.java b/src/main/java/cpw/mods/fml/client/GuiDupesFound.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiDupesFound.java
rename to src/main/java/cpw/mods/fml/client/GuiDupesFound.java
diff --git a/client/cpw/mods/fml/client/GuiIdMismatchScreen.java b/src/main/java/cpw/mods/fml/client/GuiIdMismatchScreen.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiIdMismatchScreen.java
rename to src/main/java/cpw/mods/fml/client/GuiIdMismatchScreen.java
diff --git a/client/cpw/mods/fml/client/GuiModList.java b/src/main/java/cpw/mods/fml/client/GuiModList.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiModList.java
rename to src/main/java/cpw/mods/fml/client/GuiModList.java
diff --git a/client/cpw/mods/fml/client/GuiModsMissing.java b/src/main/java/cpw/mods/fml/client/GuiModsMissing.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiModsMissing.java
rename to src/main/java/cpw/mods/fml/client/GuiModsMissing.java
diff --git a/client/cpw/mods/fml/client/GuiModsMissingForServer.java b/src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiModsMissingForServer.java
rename to src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java
diff --git a/client/cpw/mods/fml/client/GuiScrollingList.java b/src/main/java/cpw/mods/fml/client/GuiScrollingList.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiScrollingList.java
rename to src/main/java/cpw/mods/fml/client/GuiScrollingList.java
diff --git a/client/cpw/mods/fml/client/GuiSlotModList.java b/src/main/java/cpw/mods/fml/client/GuiSlotModList.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiSlotModList.java
rename to src/main/java/cpw/mods/fml/client/GuiSlotModList.java
diff --git a/client/cpw/mods/fml/client/GuiSortingProblem.java b/src/main/java/cpw/mods/fml/client/GuiSortingProblem.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiSortingProblem.java
rename to src/main/java/cpw/mods/fml/client/GuiSortingProblem.java
diff --git a/client/cpw/mods/fml/client/GuiWrongMinecraft.java b/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java
similarity index 100%
rename from client/cpw/mods/fml/client/GuiWrongMinecraft.java
rename to src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java
diff --git a/client/cpw/mods/fml/client/TextureFXManager.java b/src/main/java/cpw/mods/fml/client/TextureFXManager.java
similarity index 100%
rename from client/cpw/mods/fml/client/TextureFXManager.java
rename to src/main/java/cpw/mods/fml/client/TextureFXManager.java
diff --git a/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java b/src/main/java/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java
similarity index 100%
rename from client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java
rename to src/main/java/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java
diff --git a/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java b/src/main/java/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
similarity index 100%
rename from client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
rename to src/main/java/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
diff --git a/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java b/src/main/java/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java
similarity index 100%
rename from client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java
rename to src/main/java/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java
diff --git a/client/cpw/mods/fml/client/registry/ClientRegistry.java b/src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java
similarity index 100%
rename from client/cpw/mods/fml/client/registry/ClientRegistry.java
rename to src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java
diff --git a/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java b/src/main/java/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java
similarity index 100%
rename from client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java
rename to src/main/java/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java
diff --git a/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java b/src/main/java/cpw/mods/fml/client/registry/KeyBindingRegistry.java
similarity index 100%
rename from client/cpw/mods/fml/client/registry/KeyBindingRegistry.java
rename to src/main/java/cpw/mods/fml/client/registry/KeyBindingRegistry.java
diff --git a/client/cpw/mods/fml/client/registry/RenderingRegistry.java b/src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java
similarity index 100%
rename from client/cpw/mods/fml/client/registry/RenderingRegistry.java
rename to src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java
diff --git a/common/cpw/mods/fml/common/API.java b/src/main/java/cpw/mods/fml/common/API.java
similarity index 100%
rename from common/cpw/mods/fml/common/API.java
rename to src/main/java/cpw/mods/fml/common/API.java
diff --git a/common/cpw/mods/fml/common/BukkitPluginRef.java b/src/main/java/cpw/mods/fml/common/BukkitPluginRef.java
similarity index 100%
rename from common/cpw/mods/fml/common/BukkitPluginRef.java
rename to src/main/java/cpw/mods/fml/common/BukkitPluginRef.java
diff --git a/common/cpw/mods/fml/common/BukkitProxy.java b/src/main/java/cpw/mods/fml/common/BukkitProxy.java
similarity index 100%
rename from common/cpw/mods/fml/common/BukkitProxy.java
rename to src/main/java/cpw/mods/fml/common/BukkitProxy.java
diff --git a/common/cpw/mods/fml/common/CertificateHelper.java b/src/main/java/cpw/mods/fml/common/CertificateHelper.java
similarity index 100%
rename from common/cpw/mods/fml/common/CertificateHelper.java
rename to src/main/java/cpw/mods/fml/common/CertificateHelper.java
diff --git a/common/cpw/mods/fml/common/DummyModContainer.java b/src/main/java/cpw/mods/fml/common/DummyModContainer.java
similarity index 100%
rename from common/cpw/mods/fml/common/DummyModContainer.java
rename to src/main/java/cpw/mods/fml/common/DummyModContainer.java
diff --git a/common/cpw/mods/fml/common/DuplicateModsFoundException.java b/src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java
similarity index 100%
rename from common/cpw/mods/fml/common/DuplicateModsFoundException.java
rename to src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java
diff --git a/common/cpw/mods/fml/common/FMLCommonHandler.java b/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/FMLCommonHandler.java
rename to src/main/java/cpw/mods/fml/common/FMLCommonHandler.java
diff --git a/common/cpw/mods/fml/common/FMLDummyContainer.java b/src/main/java/cpw/mods/fml/common/FMLDummyContainer.java
similarity index 100%
rename from common/cpw/mods/fml/common/FMLDummyContainer.java
rename to src/main/java/cpw/mods/fml/common/FMLDummyContainer.java
diff --git a/common/cpw/mods/fml/common/FMLLog.java b/src/main/java/cpw/mods/fml/common/FMLLog.java
similarity index 100%
rename from common/cpw/mods/fml/common/FMLLog.java
rename to src/main/java/cpw/mods/fml/common/FMLLog.java
diff --git a/common/cpw/mods/fml/common/FMLModContainer.java b/src/main/java/cpw/mods/fml/common/FMLModContainer.java
similarity index 100%
rename from common/cpw/mods/fml/common/FMLModContainer.java
rename to src/main/java/cpw/mods/fml/common/FMLModContainer.java
diff --git a/common/cpw/mods/fml/common/IASMHook.java b/src/main/java/cpw/mods/fml/common/IASMHook.java
similarity index 100%
rename from common/cpw/mods/fml/common/IASMHook.java
rename to src/main/java/cpw/mods/fml/common/IASMHook.java
diff --git a/common/cpw/mods/fml/common/IConsoleHandler.java b/src/main/java/cpw/mods/fml/common/IConsoleHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/IConsoleHandler.java
rename to src/main/java/cpw/mods/fml/common/IConsoleHandler.java
diff --git a/common/cpw/mods/fml/common/ICraftingHandler.java b/src/main/java/cpw/mods/fml/common/ICraftingHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/ICraftingHandler.java
rename to src/main/java/cpw/mods/fml/common/ICraftingHandler.java
diff --git a/common/cpw/mods/fml/common/ICrashCallable.java b/src/main/java/cpw/mods/fml/common/ICrashCallable.java
similarity index 100%
rename from common/cpw/mods/fml/common/ICrashCallable.java
rename to src/main/java/cpw/mods/fml/common/ICrashCallable.java
diff --git a/common/cpw/mods/fml/common/IFMLHandledException.java b/src/main/java/cpw/mods/fml/common/IFMLHandledException.java
similarity index 100%
rename from common/cpw/mods/fml/common/IFMLHandledException.java
rename to src/main/java/cpw/mods/fml/common/IFMLHandledException.java
diff --git a/common/cpw/mods/fml/common/IFMLSidedHandler.java b/src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/IFMLSidedHandler.java
rename to src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java
diff --git a/common/cpw/mods/fml/common/IFuelHandler.java b/src/main/java/cpw/mods/fml/common/IFuelHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/IFuelHandler.java
rename to src/main/java/cpw/mods/fml/common/IFuelHandler.java
diff --git a/common/cpw/mods/fml/common/ILanguageAdapter.java b/src/main/java/cpw/mods/fml/common/ILanguageAdapter.java
similarity index 100%
rename from common/cpw/mods/fml/common/ILanguageAdapter.java
rename to src/main/java/cpw/mods/fml/common/ILanguageAdapter.java
diff --git a/common/cpw/mods/fml/common/INetworkHandler.java b/src/main/java/cpw/mods/fml/common/INetworkHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/INetworkHandler.java
rename to src/main/java/cpw/mods/fml/common/INetworkHandler.java
diff --git a/common/cpw/mods/fml/common/IPickupNotifier.java b/src/main/java/cpw/mods/fml/common/IPickupNotifier.java
similarity index 100%
rename from common/cpw/mods/fml/common/IPickupNotifier.java
rename to src/main/java/cpw/mods/fml/common/IPickupNotifier.java
diff --git a/common/cpw/mods/fml/common/IPlayerTracker.java b/src/main/java/cpw/mods/fml/common/IPlayerTracker.java
similarity index 100%
rename from common/cpw/mods/fml/common/IPlayerTracker.java
rename to src/main/java/cpw/mods/fml/common/IPlayerTracker.java
diff --git a/common/cpw/mods/fml/common/IScheduledTickHandler.java b/src/main/java/cpw/mods/fml/common/IScheduledTickHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/IScheduledTickHandler.java
rename to src/main/java/cpw/mods/fml/common/IScheduledTickHandler.java
diff --git a/common/cpw/mods/fml/common/ITickHandler.java b/src/main/java/cpw/mods/fml/common/ITickHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/ITickHandler.java
rename to src/main/java/cpw/mods/fml/common/ITickHandler.java
diff --git a/common/cpw/mods/fml/common/IWorldGenerator.java b/src/main/java/cpw/mods/fml/common/IWorldGenerator.java
similarity index 100%
rename from common/cpw/mods/fml/common/IWorldGenerator.java
rename to src/main/java/cpw/mods/fml/common/IWorldGenerator.java
diff --git a/common/cpw/mods/fml/common/InjectedModContainer.java b/src/main/java/cpw/mods/fml/common/InjectedModContainer.java
similarity index 100%
rename from common/cpw/mods/fml/common/InjectedModContainer.java
rename to src/main/java/cpw/mods/fml/common/InjectedModContainer.java
diff --git a/common/cpw/mods/fml/common/LoadController.java b/src/main/java/cpw/mods/fml/common/LoadController.java
similarity index 100%
rename from common/cpw/mods/fml/common/LoadController.java
rename to src/main/java/cpw/mods/fml/common/LoadController.java
diff --git a/common/cpw/mods/fml/common/Loader.java b/src/main/java/cpw/mods/fml/common/Loader.java
similarity index 100%
rename from common/cpw/mods/fml/common/Loader.java
rename to src/main/java/cpw/mods/fml/common/Loader.java
diff --git a/common/cpw/mods/fml/common/LoaderException.java b/src/main/java/cpw/mods/fml/common/LoaderException.java
similarity index 100%
rename from common/cpw/mods/fml/common/LoaderException.java
rename to src/main/java/cpw/mods/fml/common/LoaderException.java
diff --git a/common/cpw/mods/fml/common/LoaderState.java b/src/main/java/cpw/mods/fml/common/LoaderState.java
similarity index 100%
rename from common/cpw/mods/fml/common/LoaderState.java
rename to src/main/java/cpw/mods/fml/common/LoaderState.java
diff --git a/common/cpw/mods/fml/common/MCPDummyContainer.java b/src/main/java/cpw/mods/fml/common/MCPDummyContainer.java
similarity index 100%
rename from common/cpw/mods/fml/common/MCPDummyContainer.java
rename to src/main/java/cpw/mods/fml/common/MCPDummyContainer.java
diff --git a/common/cpw/mods/fml/common/MetadataCollection.java b/src/main/java/cpw/mods/fml/common/MetadataCollection.java
similarity index 100%
rename from common/cpw/mods/fml/common/MetadataCollection.java
rename to src/main/java/cpw/mods/fml/common/MetadataCollection.java
diff --git a/common/cpw/mods/fml/common/MinecraftDummyContainer.java b/src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java
similarity index 100%
rename from common/cpw/mods/fml/common/MinecraftDummyContainer.java
rename to src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java
diff --git a/common/cpw/mods/fml/common/MissingModsException.java b/src/main/java/cpw/mods/fml/common/MissingModsException.java
similarity index 100%
rename from common/cpw/mods/fml/common/MissingModsException.java
rename to src/main/java/cpw/mods/fml/common/MissingModsException.java
diff --git a/common/cpw/mods/fml/common/Mod.java b/src/main/java/cpw/mods/fml/common/Mod.java
similarity index 100%
rename from common/cpw/mods/fml/common/Mod.java
rename to src/main/java/cpw/mods/fml/common/Mod.java
diff --git a/common/cpw/mods/fml/common/ModAPIManager.java b/src/main/java/cpw/mods/fml/common/ModAPIManager.java
similarity index 100%
rename from common/cpw/mods/fml/common/ModAPIManager.java
rename to src/main/java/cpw/mods/fml/common/ModAPIManager.java
diff --git a/common/cpw/mods/fml/common/ModClassLoader.java b/src/main/java/cpw/mods/fml/common/ModClassLoader.java
similarity index 100%
rename from common/cpw/mods/fml/common/ModClassLoader.java
rename to src/main/java/cpw/mods/fml/common/ModClassLoader.java
diff --git a/common/cpw/mods/fml/common/ModContainer.java b/src/main/java/cpw/mods/fml/common/ModContainer.java
similarity index 100%
rename from common/cpw/mods/fml/common/ModContainer.java
rename to src/main/java/cpw/mods/fml/common/ModContainer.java
diff --git a/common/cpw/mods/fml/common/ModContainerFactory.java b/src/main/java/cpw/mods/fml/common/ModContainerFactory.java
similarity index 100%
rename from common/cpw/mods/fml/common/ModContainerFactory.java
rename to src/main/java/cpw/mods/fml/common/ModContainerFactory.java
diff --git a/common/cpw/mods/fml/common/ModMetadata.java b/src/main/java/cpw/mods/fml/common/ModMetadata.java
similarity index 100%
rename from common/cpw/mods/fml/common/ModMetadata.java
rename to src/main/java/cpw/mods/fml/common/ModMetadata.java
diff --git a/common/cpw/mods/fml/common/ObfuscationReflectionHelper.java b/src/main/java/cpw/mods/fml/common/ObfuscationReflectionHelper.java
similarity index 100%
rename from common/cpw/mods/fml/common/ObfuscationReflectionHelper.java
rename to src/main/java/cpw/mods/fml/common/ObfuscationReflectionHelper.java
diff --git a/common/cpw/mods/fml/common/Optional.java b/src/main/java/cpw/mods/fml/common/Optional.java
similarity index 100%
rename from common/cpw/mods/fml/common/Optional.java
rename to src/main/java/cpw/mods/fml/common/Optional.java
diff --git a/common/cpw/mods/fml/common/ProxyInjector.java b/src/main/java/cpw/mods/fml/common/ProxyInjector.java
similarity index 100%
rename from common/cpw/mods/fml/common/ProxyInjector.java
rename to src/main/java/cpw/mods/fml/common/ProxyInjector.java
diff --git a/common/cpw/mods/fml/common/SidedProxy.java b/src/main/java/cpw/mods/fml/common/SidedProxy.java
similarity index 100%
rename from common/cpw/mods/fml/common/SidedProxy.java
rename to src/main/java/cpw/mods/fml/common/SidedProxy.java
diff --git a/common/cpw/mods/fml/common/SingleIntervalHandler.java b/src/main/java/cpw/mods/fml/common/SingleIntervalHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/SingleIntervalHandler.java
rename to src/main/java/cpw/mods/fml/common/SingleIntervalHandler.java
diff --git a/common/cpw/mods/fml/common/TickType.java b/src/main/java/cpw/mods/fml/common/TickType.java
similarity index 100%
rename from common/cpw/mods/fml/common/TickType.java
rename to src/main/java/cpw/mods/fml/common/TickType.java
diff --git a/common/cpw/mods/fml/common/WorldAccessContainer.java b/src/main/java/cpw/mods/fml/common/WorldAccessContainer.java
similarity index 100%
rename from common/cpw/mods/fml/common/WorldAccessContainer.java
rename to src/main/java/cpw/mods/fml/common/WorldAccessContainer.java
diff --git a/common/cpw/mods/fml/common/WrongMinecraftVersionException.java b/src/main/java/cpw/mods/fml/common/WrongMinecraftVersionException.java
similarity index 100%
rename from common/cpw/mods/fml/common/WrongMinecraftVersionException.java
rename to src/main/java/cpw/mods/fml/common/WrongMinecraftVersionException.java
diff --git a/common/cpw/mods/fml/common/asm/ASMTransformer.java b/src/main/java/cpw/mods/fml/common/asm/ASMTransformer.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/ASMTransformer.java
rename to src/main/java/cpw/mods/fml/common/asm/ASMTransformer.java
diff --git a/common/cpw/mods/fml/common/asm/FMLSanityChecker.java b/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/FMLSanityChecker.java
rename to src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java
diff --git a/common/cpw/mods/fml/common/asm/ReobfuscationMarker.java b/src/main/java/cpw/mods/fml/common/asm/ReobfuscationMarker.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/ReobfuscationMarker.java
rename to src/main/java/cpw/mods/fml/common/asm/ReobfuscationMarker.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java b/src/main/java/cpw/mods/fml/common/asm/transformers/MCPMerger.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/MCPMerger.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/MCPMerger.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/ModAPITransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/ModAPITransformer.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/ModAPITransformer.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/ModAPITransformer.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/PatchingTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/PatchingTransformer.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/PatchingTransformer.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/PatchingTransformer.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/SideTransformer.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/SideTransformer.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/SideTransformer.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLRemappingAdapter.java
diff --git a/common/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java
similarity index 100%
rename from common/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java
rename to src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java
diff --git a/common/cpw/mods/fml/common/discovery/ASMDataTable.java b/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/ASMDataTable.java
rename to src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java
diff --git a/common/cpw/mods/fml/common/discovery/ContainerType.java b/src/main/java/cpw/mods/fml/common/discovery/ContainerType.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/ContainerType.java
rename to src/main/java/cpw/mods/fml/common/discovery/ContainerType.java
diff --git a/common/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java b/src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java
rename to src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java
diff --git a/common/cpw/mods/fml/common/discovery/ITypeDiscoverer.java b/src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/ITypeDiscoverer.java
rename to src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java
diff --git a/common/cpw/mods/fml/common/discovery/JarDiscoverer.java b/src/main/java/cpw/mods/fml/common/discovery/JarDiscoverer.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/JarDiscoverer.java
rename to src/main/java/cpw/mods/fml/common/discovery/JarDiscoverer.java
diff --git a/common/cpw/mods/fml/common/discovery/ModCandidate.java b/src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/ModCandidate.java
rename to src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java
diff --git a/common/cpw/mods/fml/common/discovery/ModDiscoverer.java b/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/ModDiscoverer.java
rename to src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java
diff --git a/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ASMModParser.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/asm/ASMModParser.java
rename to src/main/java/cpw/mods/fml/common/discovery/asm/ASMModParser.java
diff --git a/common/cpw/mods/fml/common/discovery/asm/ModAnnotation.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotation.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/asm/ModAnnotation.java
rename to src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotation.java
diff --git a/common/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java
rename to src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java
diff --git a/common/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java
rename to src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java
diff --git a/common/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java
rename to src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java
diff --git a/common/cpw/mods/fml/common/discovery/asm/ModLoaderPropertiesMethodVisitor.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModLoaderPropertiesMethodVisitor.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/asm/ModLoaderPropertiesMethodVisitor.java
rename to src/main/java/cpw/mods/fml/common/discovery/asm/ModLoaderPropertiesMethodVisitor.java
diff --git a/common/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java b/src/main/java/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java
similarity index 100%
rename from common/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java
rename to src/main/java/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java
diff --git a/common/cpw/mods/fml/common/event/FMLConstructionEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLConstructionEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLConstructionEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLConstructionEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLInitializationEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLInitializationEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLInitializationEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLInitializationEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLInterModComms.java b/src/main/java/cpw/mods/fml/common/event/FMLInterModComms.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLInterModComms.java
rename to src/main/java/cpw/mods/fml/common/event/FMLInterModComms.java
diff --git a/common/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLLoadEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLLoadEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLLoadEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLLoadEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLPostInitializationEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLPostInitializationEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLPostInitializationEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLPostInitializationEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLPreInitializationEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLPreInitializationEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLPreInitializationEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLPreInitializationEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLServerStartedEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerStartedEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLServerStartedEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLServerStartedEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerStartingEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLServerStartingEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLServerStartingEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLServerStoppedEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerStoppedEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLServerStoppedEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLServerStoppedEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLServerStoppingEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLServerStoppingEvent.java
diff --git a/common/cpw/mods/fml/common/event/FMLStateEvent.java b/src/main/java/cpw/mods/fml/common/event/FMLStateEvent.java
similarity index 100%
rename from common/cpw/mods/fml/common/event/FMLStateEvent.java
rename to src/main/java/cpw/mods/fml/common/event/FMLStateEvent.java
diff --git a/common/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java b/src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java
similarity index 100%
rename from common/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java
rename to src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java
diff --git a/common/cpw/mods/fml/common/functions/ModIdFunction.java b/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java
similarity index 100%
rename from common/cpw/mods/fml/common/functions/ModIdFunction.java
rename to src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java
diff --git a/common/cpw/mods/fml/common/functions/ModNameFunction.java b/src/main/java/cpw/mods/fml/common/functions/ModNameFunction.java
similarity index 100%
rename from common/cpw/mods/fml/common/functions/ModNameFunction.java
rename to src/main/java/cpw/mods/fml/common/functions/ModNameFunction.java
diff --git a/common/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java b/src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java
similarity index 100%
rename from common/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java
rename to src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java
diff --git a/common/cpw/mods/fml/common/launcher/FMLInjectionAndSortingTweaker.java b/src/main/java/cpw/mods/fml/common/launcher/FMLInjectionAndSortingTweaker.java
similarity index 100%
rename from common/cpw/mods/fml/common/launcher/FMLInjectionAndSortingTweaker.java
rename to src/main/java/cpw/mods/fml/common/launcher/FMLInjectionAndSortingTweaker.java
diff --git a/common/cpw/mods/fml/common/launcher/FMLServerTweaker.java b/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java
similarity index 100%
rename from common/cpw/mods/fml/common/launcher/FMLServerTweaker.java
rename to src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java
diff --git a/common/cpw/mods/fml/common/launcher/FMLTweaker.java b/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java
similarity index 100%
rename from common/cpw/mods/fml/common/launcher/FMLTweaker.java
rename to src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java
diff --git a/common/cpw/mods/fml/common/modloader/BaseModProxy.java b/src/main/java/cpw/mods/fml/common/modloader/BaseModProxy.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/BaseModProxy.java
rename to src/main/java/cpw/mods/fml/common/modloader/BaseModProxy.java
diff --git a/common/cpw/mods/fml/common/modloader/BaseModTicker.java b/src/main/java/cpw/mods/fml/common/modloader/BaseModTicker.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/BaseModTicker.java
rename to src/main/java/cpw/mods/fml/common/modloader/BaseModTicker.java
diff --git a/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java b/src/main/java/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java
rename to src/main/java/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderChatListener.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderChatListener.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderHelper.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderHelper.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderNetworkHandler.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderNetworkHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderNetworkHandler.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderNetworkHandler.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java b/src/main/java/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java
diff --git a/common/cpw/mods/fml/common/modloader/ModProperty.java b/src/main/java/cpw/mods/fml/common/modloader/ModProperty.java
similarity index 100%
rename from common/cpw/mods/fml/common/modloader/ModProperty.java
rename to src/main/java/cpw/mods/fml/common/modloader/ModProperty.java
diff --git a/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java b/src/main/java/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java
rename to src/main/java/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java
diff --git a/common/cpw/mods/fml/common/network/EntitySpawnPacket.java b/src/main/java/cpw/mods/fml/common/network/EntitySpawnPacket.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/EntitySpawnPacket.java
rename to src/main/java/cpw/mods/fml/common/network/EntitySpawnPacket.java
diff --git a/common/cpw/mods/fml/common/network/FMLNetworkException.java b/src/main/java/cpw/mods/fml/common/network/FMLNetworkException.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/FMLNetworkException.java
rename to src/main/java/cpw/mods/fml/common/network/FMLNetworkException.java
diff --git a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/src/main/java/cpw/mods/fml/common/network/FMLNetworkHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/FMLNetworkHandler.java
rename to src/main/java/cpw/mods/fml/common/network/FMLNetworkHandler.java
diff --git a/common/cpw/mods/fml/common/network/FMLPacket.java b/src/main/java/cpw/mods/fml/common/network/FMLPacket.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/FMLPacket.java
rename to src/main/java/cpw/mods/fml/common/network/FMLPacket.java
diff --git a/common/cpw/mods/fml/common/network/IChatListener.java b/src/main/java/cpw/mods/fml/common/network/IChatListener.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/IChatListener.java
rename to src/main/java/cpw/mods/fml/common/network/IChatListener.java
diff --git a/common/cpw/mods/fml/common/network/IConnectionHandler.java b/src/main/java/cpw/mods/fml/common/network/IConnectionHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/IConnectionHandler.java
rename to src/main/java/cpw/mods/fml/common/network/IConnectionHandler.java
diff --git a/common/cpw/mods/fml/common/network/IGuiHandler.java b/src/main/java/cpw/mods/fml/common/network/IGuiHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/IGuiHandler.java
rename to src/main/java/cpw/mods/fml/common/network/IGuiHandler.java
diff --git a/common/cpw/mods/fml/common/network/IPacketHandler.java b/src/main/java/cpw/mods/fml/common/network/IPacketHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/IPacketHandler.java
rename to src/main/java/cpw/mods/fml/common/network/IPacketHandler.java
diff --git a/common/cpw/mods/fml/common/network/ITinyPacketHandler.java b/src/main/java/cpw/mods/fml/common/network/ITinyPacketHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/ITinyPacketHandler.java
rename to src/main/java/cpw/mods/fml/common/network/ITinyPacketHandler.java
diff --git a/common/cpw/mods/fml/common/network/ModIdMapPacket.java b/src/main/java/cpw/mods/fml/common/network/ModIdMapPacket.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/ModIdMapPacket.java
rename to src/main/java/cpw/mods/fml/common/network/ModIdMapPacket.java
diff --git a/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java b/src/main/java/cpw/mods/fml/common/network/ModIdentifiersPacket.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/ModIdentifiersPacket.java
rename to src/main/java/cpw/mods/fml/common/network/ModIdentifiersPacket.java
diff --git a/common/cpw/mods/fml/common/network/ModListRequestPacket.java b/src/main/java/cpw/mods/fml/common/network/ModListRequestPacket.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/ModListRequestPacket.java
rename to src/main/java/cpw/mods/fml/common/network/ModListRequestPacket.java
diff --git a/common/cpw/mods/fml/common/network/ModListResponsePacket.java b/src/main/java/cpw/mods/fml/common/network/ModListResponsePacket.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/ModListResponsePacket.java
rename to src/main/java/cpw/mods/fml/common/network/ModListResponsePacket.java
diff --git a/common/cpw/mods/fml/common/network/ModMissingPacket.java b/src/main/java/cpw/mods/fml/common/network/ModMissingPacket.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/ModMissingPacket.java
rename to src/main/java/cpw/mods/fml/common/network/ModMissingPacket.java
diff --git a/common/cpw/mods/fml/common/network/NetworkMod.java b/src/main/java/cpw/mods/fml/common/network/NetworkMod.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/NetworkMod.java
rename to src/main/java/cpw/mods/fml/common/network/NetworkMod.java
diff --git a/common/cpw/mods/fml/common/network/NetworkModHandler.java b/src/main/java/cpw/mods/fml/common/network/NetworkModHandler.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/NetworkModHandler.java
rename to src/main/java/cpw/mods/fml/common/network/NetworkModHandler.java
diff --git a/common/cpw/mods/fml/common/network/NetworkRegistry.java b/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/NetworkRegistry.java
rename to src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java
diff --git a/common/cpw/mods/fml/common/network/OpenGuiPacket.java b/src/main/java/cpw/mods/fml/common/network/OpenGuiPacket.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/OpenGuiPacket.java
rename to src/main/java/cpw/mods/fml/common/network/OpenGuiPacket.java
diff --git a/common/cpw/mods/fml/common/network/PacketDispatcher.java b/src/main/java/cpw/mods/fml/common/network/PacketDispatcher.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/PacketDispatcher.java
rename to src/main/java/cpw/mods/fml/common/network/PacketDispatcher.java
diff --git a/common/cpw/mods/fml/common/network/Player.java b/src/main/java/cpw/mods/fml/common/network/Player.java
similarity index 100%
rename from common/cpw/mods/fml/common/network/Player.java
rename to src/main/java/cpw/mods/fml/common/network/Player.java
diff --git a/common/cpw/mods/fml/common/patcher/ClassPatch.java b/src/main/java/cpw/mods/fml/common/patcher/ClassPatch.java
similarity index 100%
rename from common/cpw/mods/fml/common/patcher/ClassPatch.java
rename to src/main/java/cpw/mods/fml/common/patcher/ClassPatch.java
diff --git a/common/cpw/mods/fml/common/patcher/ClassPatchManager.java b/src/main/java/cpw/mods/fml/common/patcher/ClassPatchManager.java
similarity index 100%
rename from common/cpw/mods/fml/common/patcher/ClassPatchManager.java
rename to src/main/java/cpw/mods/fml/common/patcher/ClassPatchManager.java
diff --git a/common/cpw/mods/fml/common/patcher/GenDiffSet.java b/src/main/java/cpw/mods/fml/common/patcher/GenDiffSet.java
similarity index 100%
rename from common/cpw/mods/fml/common/patcher/GenDiffSet.java
rename to src/main/java/cpw/mods/fml/common/patcher/GenDiffSet.java
diff --git a/common/cpw/mods/fml/common/registry/BlockProxy.java b/src/main/java/cpw/mods/fml/common/registry/BlockProxy.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/BlockProxy.java
rename to src/main/java/cpw/mods/fml/common/registry/BlockProxy.java
diff --git a/common/cpw/mods/fml/common/registry/BlockTracker.java b/src/main/java/cpw/mods/fml/common/registry/BlockTracker.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/BlockTracker.java
rename to src/main/java/cpw/mods/fml/common/registry/BlockTracker.java
diff --git a/common/cpw/mods/fml/common/registry/EntityRegistry.java b/src/main/java/cpw/mods/fml/common/registry/EntityRegistry.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/EntityRegistry.java
rename to src/main/java/cpw/mods/fml/common/registry/EntityRegistry.java
diff --git a/common/cpw/mods/fml/common/registry/GameData.java b/src/main/java/cpw/mods/fml/common/registry/GameData.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/GameData.java
rename to src/main/java/cpw/mods/fml/common/registry/GameData.java
diff --git a/common/cpw/mods/fml/common/registry/GameRegistry.java b/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/GameRegistry.java
rename to src/main/java/cpw/mods/fml/common/registry/GameRegistry.java
diff --git a/common/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java b/src/main/java/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java
rename to src/main/java/cpw/mods/fml/common/registry/IEntityAdditionalSpawnData.java
diff --git a/common/cpw/mods/fml/common/registry/IThrowableEntity.java b/src/main/java/cpw/mods/fml/common/registry/IThrowableEntity.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/IThrowableEntity.java
rename to src/main/java/cpw/mods/fml/common/registry/IThrowableEntity.java
diff --git a/common/cpw/mods/fml/common/registry/ItemData.java b/src/main/java/cpw/mods/fml/common/registry/ItemData.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/ItemData.java
rename to src/main/java/cpw/mods/fml/common/registry/ItemData.java
diff --git a/common/cpw/mods/fml/common/registry/ItemProxy.java b/src/main/java/cpw/mods/fml/common/registry/ItemProxy.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/ItemProxy.java
rename to src/main/java/cpw/mods/fml/common/registry/ItemProxy.java
diff --git a/common/cpw/mods/fml/common/registry/LanguageRegistry.java b/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/LanguageRegistry.java
rename to src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java
diff --git a/common/cpw/mods/fml/common/registry/TickRegistry.java b/src/main/java/cpw/mods/fml/common/registry/TickRegistry.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/TickRegistry.java
rename to src/main/java/cpw/mods/fml/common/registry/TickRegistry.java
diff --git a/common/cpw/mods/fml/common/registry/VillagerRegistry.java b/src/main/java/cpw/mods/fml/common/registry/VillagerRegistry.java
similarity index 100%
rename from common/cpw/mods/fml/common/registry/VillagerRegistry.java
rename to src/main/java/cpw/mods/fml/common/registry/VillagerRegistry.java
diff --git a/common/cpw/mods/fml/common/toposort/ModSorter.java b/src/main/java/cpw/mods/fml/common/toposort/ModSorter.java
similarity index 100%
rename from common/cpw/mods/fml/common/toposort/ModSorter.java
rename to src/main/java/cpw/mods/fml/common/toposort/ModSorter.java
diff --git a/common/cpw/mods/fml/common/toposort/ModSortingException.java b/src/main/java/cpw/mods/fml/common/toposort/ModSortingException.java
similarity index 100%
rename from common/cpw/mods/fml/common/toposort/ModSortingException.java
rename to src/main/java/cpw/mods/fml/common/toposort/ModSortingException.java
diff --git a/common/cpw/mods/fml/common/toposort/TopologicalSort.java b/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java
similarity index 100%
rename from common/cpw/mods/fml/common/toposort/TopologicalSort.java
rename to src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java
diff --git a/common/cpw/mods/fml/common/versioning/ArtifactVersion.java b/src/main/java/cpw/mods/fml/common/versioning/ArtifactVersion.java
similarity index 100%
rename from common/cpw/mods/fml/common/versioning/ArtifactVersion.java
rename to src/main/java/cpw/mods/fml/common/versioning/ArtifactVersion.java
diff --git a/common/cpw/mods/fml/common/versioning/ComparableVersion.java b/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java
similarity index 100%
rename from common/cpw/mods/fml/common/versioning/ComparableVersion.java
rename to src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java
diff --git a/common/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java b/src/main/java/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java
similarity index 100%
rename from common/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java
rename to src/main/java/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java
diff --git a/common/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java b/src/main/java/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java
similarity index 100%
rename from common/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java
rename to src/main/java/cpw/mods/fml/common/versioning/InvalidVersionSpecificationException.java
diff --git a/common/cpw/mods/fml/common/versioning/Restriction.java b/src/main/java/cpw/mods/fml/common/versioning/Restriction.java
similarity index 100%
rename from common/cpw/mods/fml/common/versioning/Restriction.java
rename to src/main/java/cpw/mods/fml/common/versioning/Restriction.java
diff --git a/common/cpw/mods/fml/common/versioning/VersionParser.java b/src/main/java/cpw/mods/fml/common/versioning/VersionParser.java
similarity index 100%
rename from common/cpw/mods/fml/common/versioning/VersionParser.java
rename to src/main/java/cpw/mods/fml/common/versioning/VersionParser.java
diff --git a/common/cpw/mods/fml/common/versioning/VersionRange.java b/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java
similarity index 100%
rename from common/cpw/mods/fml/common/versioning/VersionRange.java
rename to src/main/java/cpw/mods/fml/common/versioning/VersionRange.java
diff --git a/common/cpw/mods/fml/relauncher/CoreModManager.java b/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/CoreModManager.java
rename to src/main/java/cpw/mods/fml/relauncher/CoreModManager.java
diff --git a/common/cpw/mods/fml/relauncher/FMLCorePlugin.java b/src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/FMLCorePlugin.java
rename to src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java
diff --git a/common/cpw/mods/fml/relauncher/FMLInjectionData.java b/src/main/java/cpw/mods/fml/relauncher/FMLInjectionData.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/FMLInjectionData.java
rename to src/main/java/cpw/mods/fml/relauncher/FMLInjectionData.java
diff --git a/common/cpw/mods/fml/relauncher/FMLLaunchHandler.java b/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/FMLLaunchHandler.java
rename to src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java
diff --git a/common/cpw/mods/fml/relauncher/FMLLogFormatter.java b/src/main/java/cpw/mods/fml/relauncher/FMLLogFormatter.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/FMLLogFormatter.java
rename to src/main/java/cpw/mods/fml/relauncher/FMLLogFormatter.java
diff --git a/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java b/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/FMLRelaunchLog.java
rename to src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java
diff --git a/common/cpw/mods/fml/relauncher/IFMLCallHook.java b/src/main/java/cpw/mods/fml/relauncher/IFMLCallHook.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/IFMLCallHook.java
rename to src/main/java/cpw/mods/fml/relauncher/IFMLCallHook.java
diff --git a/common/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java b/src/main/java/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java
rename to src/main/java/cpw/mods/fml/relauncher/IFMLLoadingPlugin.java
diff --git a/common/cpw/mods/fml/relauncher/ILibrarySet.java b/src/main/java/cpw/mods/fml/relauncher/ILibrarySet.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/ILibrarySet.java
rename to src/main/java/cpw/mods/fml/relauncher/ILibrarySet.java
diff --git a/common/cpw/mods/fml/relauncher/ReflectionHelper.java b/src/main/java/cpw/mods/fml/relauncher/ReflectionHelper.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/ReflectionHelper.java
rename to src/main/java/cpw/mods/fml/relauncher/ReflectionHelper.java
diff --git a/common/cpw/mods/fml/relauncher/ServerLaunchWrapper.java b/src/main/java/cpw/mods/fml/relauncher/ServerLaunchWrapper.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/ServerLaunchWrapper.java
rename to src/main/java/cpw/mods/fml/relauncher/ServerLaunchWrapper.java
diff --git a/common/cpw/mods/fml/relauncher/Side.java b/src/main/java/cpw/mods/fml/relauncher/Side.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/Side.java
rename to src/main/java/cpw/mods/fml/relauncher/Side.java
diff --git a/common/cpw/mods/fml/relauncher/SideOnly.java b/src/main/java/cpw/mods/fml/relauncher/SideOnly.java
similarity index 100%
rename from common/cpw/mods/fml/relauncher/SideOnly.java
rename to src/main/java/cpw/mods/fml/relauncher/SideOnly.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Checksum.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/Delta.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Delta.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/Delta.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/Delta.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffPatcher.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/PatchException.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/PatchException.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/PatchException.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/PatchException.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java
diff --git a/common/cpw/mods/fml/repackage/com/nothome/delta/SeekableSource.java b/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/SeekableSource.java
similarity index 100%
rename from common/cpw/mods/fml/repackage/com/nothome/delta/SeekableSource.java
rename to src/main/java/cpw/mods/fml/repackage/com/nothome/delta/SeekableSource.java
diff --git a/common/cpw/mods/fml/server/FMLServerHandler.java b/src/main/java/cpw/mods/fml/server/FMLServerHandler.java
similarity index 100%
rename from common/cpw/mods/fml/server/FMLServerHandler.java
rename to src/main/java/cpw/mods/fml/server/FMLServerHandler.java
diff --git a/client/net/minecraft/src/BaseMod.java b/src/main/java/net/minecraft/src/BaseMod.java
similarity index 100%
rename from client/net/minecraft/src/BaseMod.java
rename to src/main/java/net/minecraft/src/BaseMod.java
diff --git a/client/net/minecraft/src/EntityRendererProxy.java b/src/main/java/net/minecraft/src/EntityRendererProxy.java
similarity index 100%
rename from client/net/minecraft/src/EntityRendererProxy.java
rename to src/main/java/net/minecraft/src/EntityRendererProxy.java
diff --git a/client/net/minecraft/src/FMLRenderAccessLibrary.java b/src/main/java/net/minecraft/src/FMLRenderAccessLibrary.java
similarity index 100%
rename from client/net/minecraft/src/FMLRenderAccessLibrary.java
rename to src/main/java/net/minecraft/src/FMLRenderAccessLibrary.java
diff --git a/client/net/minecraft/src/MLProp.java b/src/main/java/net/minecraft/src/MLProp.java
similarity index 100%
rename from client/net/minecraft/src/MLProp.java
rename to src/main/java/net/minecraft/src/MLProp.java
diff --git a/client/net/minecraft/src/ModLoader.java b/src/main/java/net/minecraft/src/ModLoader.java
similarity index 100%
rename from client/net/minecraft/src/ModLoader.java
rename to src/main/java/net/minecraft/src/ModLoader.java
diff --git a/client/net/minecraft/src/TradeEntry.java b/src/main/java/net/minecraft/src/TradeEntry.java
similarity index 100%
rename from client/net/minecraft/src/TradeEntry.java
rename to src/main/java/net/minecraft/src/TradeEntry.java
diff --git a/common/fml_at.cfg b/src/main/resources/fml_at.cfg
similarity index 100%
rename from common/fml_at.cfg
rename to src/main/resources/fml_at.cfg
diff --git a/common/fml_marker.cfg b/src/main/resources/fml_marker.cfg
similarity index 100%
rename from common/fml_marker.cfg
rename to src/main/resources/fml_marker.cfg
diff --git a/client/mcplogo.png b/src/main/resources/mcplogo.png
similarity index 100%
rename from client/mcplogo.png
rename to src/main/resources/mcplogo.png
diff --git a/common/mcpmod.info b/src/main/resources/mcpmod.info
similarity index 100%
rename from common/mcpmod.info
rename to src/main/resources/mcpmod.info
diff --git a/test/cpw/mods/fml/test/TestModSorting.java b/src/test/java/cpw/mods/fml/test/TestModSorting.java
similarity index 100%
rename from test/cpw/mods/fml/test/TestModSorting.java
rename to src/test/java/cpw/mods/fml/test/TestModSorting.java