diff --git a/.gitignore b/.gitignore
index 44084bc..0da720f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-/java/run
-/java/bin
+/common/dev
+/common/bin
 /client/bin
+/client/run
 /server/bin
-/java/dev
+/server/run
 /export
 /.metadata
diff --git a/java/src/common/IClient.java b/common/src/common/IClient.java
similarity index 100%
rename from java/src/common/IClient.java
rename to common/src/common/IClient.java
diff --git a/java/src/common/IServer.java b/common/src/common/IServer.java
similarity index 100%
rename from java/src/common/IServer.java
rename to common/src/common/IServer.java
diff --git a/java/src/common/ai/AIFireballAttack.java b/common/src/common/ai/AIFireballAttack.java
similarity index 100%
rename from java/src/common/ai/AIFireballAttack.java
rename to common/src/common/ai/AIFireballAttack.java
diff --git a/java/src/common/ai/AIFlyingBoxAttack.java b/common/src/common/ai/AIFlyingBoxAttack.java
similarity index 100%
rename from java/src/common/ai/AIFlyingBoxAttack.java
rename to common/src/common/ai/AIFlyingBoxAttack.java
diff --git a/java/src/common/ai/AIRangedAttack.java b/common/src/common/ai/AIRangedAttack.java
similarity index 100%
rename from java/src/common/ai/AIRangedAttack.java
rename to common/src/common/ai/AIRangedAttack.java
diff --git a/java/src/common/ai/AISmallFireballAttack.java b/common/src/common/ai/AISmallFireballAttack.java
similarity index 100%
rename from java/src/common/ai/AISmallFireballAttack.java
rename to common/src/common/ai/AISmallFireballAttack.java
diff --git a/java/src/common/ai/EntityAIAttackOnCollide.java b/common/src/common/ai/EntityAIAttackOnCollide.java
similarity index 100%
rename from java/src/common/ai/EntityAIAttackOnCollide.java
rename to common/src/common/ai/EntityAIAttackOnCollide.java
diff --git a/java/src/common/ai/EntityAIAvoidEntity.java b/common/src/common/ai/EntityAIAvoidEntity.java
similarity index 100%
rename from java/src/common/ai/EntityAIAvoidEntity.java
rename to common/src/common/ai/EntityAIAvoidEntity.java
diff --git a/java/src/common/ai/EntityAIBase.java b/common/src/common/ai/EntityAIBase.java
similarity index 100%
rename from java/src/common/ai/EntityAIBase.java
rename to common/src/common/ai/EntityAIBase.java
diff --git a/java/src/common/ai/EntityAIBeg.java b/common/src/common/ai/EntityAIBeg.java
similarity index 100%
rename from java/src/common/ai/EntityAIBeg.java
rename to common/src/common/ai/EntityAIBeg.java
diff --git a/java/src/common/ai/EntityAIControlledByPlayer.java b/common/src/common/ai/EntityAIControlledByPlayer.java
similarity index 100%
rename from java/src/common/ai/EntityAIControlledByPlayer.java
rename to common/src/common/ai/EntityAIControlledByPlayer.java
diff --git a/java/src/common/ai/EntityAIDoorInteract.java b/common/src/common/ai/EntityAIDoorInteract.java
similarity index 100%
rename from java/src/common/ai/EntityAIDoorInteract.java
rename to common/src/common/ai/EntityAIDoorInteract.java
diff --git a/java/src/common/ai/EntityAIEatGrass.java b/common/src/common/ai/EntityAIEatGrass.java
similarity index 100%
rename from java/src/common/ai/EntityAIEatGrass.java
rename to common/src/common/ai/EntityAIEatGrass.java
diff --git a/java/src/common/ai/EntityAIExplode.java b/common/src/common/ai/EntityAIExplode.java
similarity index 100%
rename from java/src/common/ai/EntityAIExplode.java
rename to common/src/common/ai/EntityAIExplode.java
diff --git a/java/src/common/ai/EntityAIFindEntityNearest.java b/common/src/common/ai/EntityAIFindEntityNearest.java
similarity index 100%
rename from java/src/common/ai/EntityAIFindEntityNearest.java
rename to common/src/common/ai/EntityAIFindEntityNearest.java
diff --git a/java/src/common/ai/EntityAIFleeSun.java b/common/src/common/ai/EntityAIFleeSun.java
similarity index 100%
rename from java/src/common/ai/EntityAIFleeSun.java
rename to common/src/common/ai/EntityAIFleeSun.java
diff --git a/java/src/common/ai/EntityAIFollowOwner.java b/common/src/common/ai/EntityAIFollowOwner.java
similarity index 100%
rename from java/src/common/ai/EntityAIFollowOwner.java
rename to common/src/common/ai/EntityAIFollowOwner.java
diff --git a/java/src/common/ai/EntityAIFollowParent.java b/common/src/common/ai/EntityAIFollowParent.java
similarity index 100%
rename from java/src/common/ai/EntityAIFollowParent.java
rename to common/src/common/ai/EntityAIFollowParent.java
diff --git a/java/src/common/ai/EntityAIHarvestFarmland.java b/common/src/common/ai/EntityAIHarvestFarmland.java
similarity index 100%
rename from java/src/common/ai/EntityAIHarvestFarmland.java
rename to common/src/common/ai/EntityAIHarvestFarmland.java
diff --git a/java/src/common/ai/EntityAIHurtByTarget.java b/common/src/common/ai/EntityAIHurtByTarget.java
similarity index 100%
rename from java/src/common/ai/EntityAIHurtByTarget.java
rename to common/src/common/ai/EntityAIHurtByTarget.java
diff --git a/java/src/common/ai/EntityAILeapAtTarget.java b/common/src/common/ai/EntityAILeapAtTarget.java
similarity index 100%
rename from java/src/common/ai/EntityAILeapAtTarget.java
rename to common/src/common/ai/EntityAILeapAtTarget.java
diff --git a/java/src/common/ai/EntityAILookAtTalkingPlayer.java b/common/src/common/ai/EntityAILookAtTalkingPlayer.java
similarity index 100%
rename from java/src/common/ai/EntityAILookAtTalkingPlayer.java
rename to common/src/common/ai/EntityAILookAtTalkingPlayer.java
diff --git a/java/src/common/ai/EntityAILookIdle.java b/common/src/common/ai/EntityAILookIdle.java
similarity index 100%
rename from java/src/common/ai/EntityAILookIdle.java
rename to common/src/common/ai/EntityAILookIdle.java
diff --git a/java/src/common/ai/EntityAIMate.java b/common/src/common/ai/EntityAIMate.java
similarity index 100%
rename from java/src/common/ai/EntityAIMate.java
rename to common/src/common/ai/EntityAIMate.java
diff --git a/java/src/common/ai/EntityAIMoveIndoors.java b/common/src/common/ai/EntityAIMoveIndoors.java
similarity index 100%
rename from java/src/common/ai/EntityAIMoveIndoors.java
rename to common/src/common/ai/EntityAIMoveIndoors.java
diff --git a/java/src/common/ai/EntityAIMoveThroughVillage.java b/common/src/common/ai/EntityAIMoveThroughVillage.java
similarity index 100%
rename from java/src/common/ai/EntityAIMoveThroughVillage.java
rename to common/src/common/ai/EntityAIMoveThroughVillage.java
diff --git a/java/src/common/ai/EntityAIMoveToBlock.java b/common/src/common/ai/EntityAIMoveToBlock.java
similarity index 100%
rename from java/src/common/ai/EntityAIMoveToBlock.java
rename to common/src/common/ai/EntityAIMoveToBlock.java
diff --git a/java/src/common/ai/EntityAIMoveTowardsRestriction.java b/common/src/common/ai/EntityAIMoveTowardsRestriction.java
similarity index 100%
rename from java/src/common/ai/EntityAIMoveTowardsRestriction.java
rename to common/src/common/ai/EntityAIMoveTowardsRestriction.java
diff --git a/java/src/common/ai/EntityAIMoveTowardsTarget.java b/common/src/common/ai/EntityAIMoveTowardsTarget.java
similarity index 100%
rename from java/src/common/ai/EntityAIMoveTowardsTarget.java
rename to common/src/common/ai/EntityAIMoveTowardsTarget.java
diff --git a/java/src/common/ai/EntityAINagPlayer.java b/common/src/common/ai/EntityAINagPlayer.java
similarity index 100%
rename from java/src/common/ai/EntityAINagPlayer.java
rename to common/src/common/ai/EntityAINagPlayer.java
diff --git a/java/src/common/ai/EntityAINearestAttackableTarget.java b/common/src/common/ai/EntityAINearestAttackableTarget.java
similarity index 100%
rename from java/src/common/ai/EntityAINearestAttackableTarget.java
rename to common/src/common/ai/EntityAINearestAttackableTarget.java
diff --git a/java/src/common/ai/EntityAINpcInteract.java b/common/src/common/ai/EntityAINpcInteract.java
similarity index 100%
rename from java/src/common/ai/EntityAINpcInteract.java
rename to common/src/common/ai/EntityAINpcInteract.java
diff --git a/java/src/common/ai/EntityAINpcMate.java b/common/src/common/ai/EntityAINpcMate.java
similarity index 100%
rename from java/src/common/ai/EntityAINpcMate.java
rename to common/src/common/ai/EntityAINpcMate.java
diff --git a/java/src/common/ai/EntityAIOcelotAttack.java b/common/src/common/ai/EntityAIOcelotAttack.java
similarity index 100%
rename from java/src/common/ai/EntityAIOcelotAttack.java
rename to common/src/common/ai/EntityAIOcelotAttack.java
diff --git a/java/src/common/ai/EntityAIOcelotSit.java b/common/src/common/ai/EntityAIOcelotSit.java
similarity index 100%
rename from java/src/common/ai/EntityAIOcelotSit.java
rename to common/src/common/ai/EntityAIOcelotSit.java
diff --git a/java/src/common/ai/EntityAIOpenDoor.java b/common/src/common/ai/EntityAIOpenDoor.java
similarity index 100%
rename from java/src/common/ai/EntityAIOpenDoor.java
rename to common/src/common/ai/EntityAIOpenDoor.java
diff --git a/java/src/common/ai/EntityAIOwnerHurtByTarget.java b/common/src/common/ai/EntityAIOwnerHurtByTarget.java
similarity index 100%
rename from java/src/common/ai/EntityAIOwnerHurtByTarget.java
rename to common/src/common/ai/EntityAIOwnerHurtByTarget.java
diff --git a/java/src/common/ai/EntityAIOwnerHurtTarget.java b/common/src/common/ai/EntityAIOwnerHurtTarget.java
similarity index 100%
rename from java/src/common/ai/EntityAIOwnerHurtTarget.java
rename to common/src/common/ai/EntityAIOwnerHurtTarget.java
diff --git a/java/src/common/ai/EntityAIPanic.java b/common/src/common/ai/EntityAIPanic.java
similarity index 100%
rename from java/src/common/ai/EntityAIPanic.java
rename to common/src/common/ai/EntityAIPanic.java
diff --git a/java/src/common/ai/EntityAIPlay.java b/common/src/common/ai/EntityAIPlay.java
similarity index 100%
rename from java/src/common/ai/EntityAIPlay.java
rename to common/src/common/ai/EntityAIPlay.java
diff --git a/java/src/common/ai/EntityAIRestrictOpenDoor.java b/common/src/common/ai/EntityAIRestrictOpenDoor.java
similarity index 100%
rename from java/src/common/ai/EntityAIRestrictOpenDoor.java
rename to common/src/common/ai/EntityAIRestrictOpenDoor.java
diff --git a/java/src/common/ai/EntityAIRestrictSun.java b/common/src/common/ai/EntityAIRestrictSun.java
similarity index 100%
rename from java/src/common/ai/EntityAIRestrictSun.java
rename to common/src/common/ai/EntityAIRestrictSun.java
diff --git a/java/src/common/ai/EntityAIRunAroundLikeCrazy.java b/common/src/common/ai/EntityAIRunAroundLikeCrazy.java
similarity index 100%
rename from java/src/common/ai/EntityAIRunAroundLikeCrazy.java
rename to common/src/common/ai/EntityAIRunAroundLikeCrazy.java
diff --git a/java/src/common/ai/EntityAIShareItems.java b/common/src/common/ai/EntityAIShareItems.java
similarity index 100%
rename from java/src/common/ai/EntityAIShareItems.java
rename to common/src/common/ai/EntityAIShareItems.java
diff --git a/java/src/common/ai/EntityAISit.java b/common/src/common/ai/EntityAISit.java
similarity index 100%
rename from java/src/common/ai/EntityAISit.java
rename to common/src/common/ai/EntityAISit.java
diff --git a/java/src/common/ai/EntityAISwimming.java b/common/src/common/ai/EntityAISwimming.java
similarity index 100%
rename from java/src/common/ai/EntityAISwimming.java
rename to common/src/common/ai/EntityAISwimming.java
diff --git a/java/src/common/ai/EntityAITakePlace.java b/common/src/common/ai/EntityAITakePlace.java
similarity index 100%
rename from java/src/common/ai/EntityAITakePlace.java
rename to common/src/common/ai/EntityAITakePlace.java
diff --git a/java/src/common/ai/EntityAITarget.java b/common/src/common/ai/EntityAITarget.java
similarity index 100%
rename from java/src/common/ai/EntityAITarget.java
rename to common/src/common/ai/EntityAITarget.java
diff --git a/java/src/common/ai/EntityAITargetNonTamed.java b/common/src/common/ai/EntityAITargetNonTamed.java
similarity index 100%
rename from java/src/common/ai/EntityAITargetNonTamed.java
rename to common/src/common/ai/EntityAITargetNonTamed.java
diff --git a/java/src/common/ai/EntityAITasks.java b/common/src/common/ai/EntityAITasks.java
similarity index 100%
rename from java/src/common/ai/EntityAITasks.java
rename to common/src/common/ai/EntityAITasks.java
diff --git a/java/src/common/ai/EntityAITempt.java b/common/src/common/ai/EntityAITempt.java
similarity index 100%
rename from java/src/common/ai/EntityAITempt.java
rename to common/src/common/ai/EntityAITempt.java
diff --git a/java/src/common/ai/EntityAIWander.java b/common/src/common/ai/EntityAIWander.java
similarity index 100%
rename from java/src/common/ai/EntityAIWander.java
rename to common/src/common/ai/EntityAIWander.java
diff --git a/java/src/common/ai/EntityAIWatchClosest.java b/common/src/common/ai/EntityAIWatchClosest.java
similarity index 100%
rename from java/src/common/ai/EntityAIWatchClosest.java
rename to common/src/common/ai/EntityAIWatchClosest.java
diff --git a/java/src/common/ai/EntityAIWatchClosest2.java b/common/src/common/ai/EntityAIWatchClosest2.java
similarity index 100%
rename from java/src/common/ai/EntityAIWatchClosest2.java
rename to common/src/common/ai/EntityAIWatchClosest2.java
diff --git a/java/src/common/ai/EntityJumpHelper.java b/common/src/common/ai/EntityJumpHelper.java
similarity index 100%
rename from java/src/common/ai/EntityJumpHelper.java
rename to common/src/common/ai/EntityJumpHelper.java
diff --git a/java/src/common/ai/EntityLookHelper.java b/common/src/common/ai/EntityLookHelper.java
similarity index 100%
rename from java/src/common/ai/EntityLookHelper.java
rename to common/src/common/ai/EntityLookHelper.java
diff --git a/java/src/common/ai/EntityMoveHelper.java b/common/src/common/ai/EntityMoveHelper.java
similarity index 100%
rename from java/src/common/ai/EntityMoveHelper.java
rename to common/src/common/ai/EntityMoveHelper.java
diff --git a/java/src/common/ai/EntitySenses.java b/common/src/common/ai/EntitySenses.java
similarity index 100%
rename from java/src/common/ai/EntitySenses.java
rename to common/src/common/ai/EntitySenses.java
diff --git a/java/src/common/ai/RandomPositionGenerator.java b/common/src/common/ai/RandomPositionGenerator.java
similarity index 100%
rename from java/src/common/ai/RandomPositionGenerator.java
rename to common/src/common/ai/RandomPositionGenerator.java
diff --git a/java/src/common/biome/Biome.java b/common/src/common/biome/Biome.java
similarity index 100%
rename from java/src/common/biome/Biome.java
rename to common/src/common/biome/Biome.java
diff --git a/java/src/common/biome/BiomeBeach.java b/common/src/common/biome/BiomeBeach.java
similarity index 100%
rename from java/src/common/biome/BiomeBeach.java
rename to common/src/common/biome/BiomeBeach.java
diff --git a/java/src/common/biome/BiomeBlackened.java b/common/src/common/biome/BiomeBlackened.java
similarity index 100%
rename from java/src/common/biome/BiomeBlackened.java
rename to common/src/common/biome/BiomeBlackened.java
diff --git a/java/src/common/biome/BiomeChaos.java b/common/src/common/biome/BiomeChaos.java
similarity index 100%
rename from java/src/common/biome/BiomeChaos.java
rename to common/src/common/biome/BiomeChaos.java
diff --git a/java/src/common/biome/BiomeDesert.java b/common/src/common/biome/BiomeDesert.java
similarity index 100%
rename from java/src/common/biome/BiomeDesert.java
rename to common/src/common/biome/BiomeDesert.java
diff --git a/java/src/common/biome/BiomeExterminated.java b/common/src/common/biome/BiomeExterminated.java
similarity index 100%
rename from java/src/common/biome/BiomeExterminated.java
rename to common/src/common/biome/BiomeExterminated.java
diff --git a/java/src/common/biome/BiomeForest.java b/common/src/common/biome/BiomeForest.java
similarity index 100%
rename from java/src/common/biome/BiomeForest.java
rename to common/src/common/biome/BiomeForest.java
diff --git a/java/src/common/biome/BiomeHell.java b/common/src/common/biome/BiomeHell.java
similarity index 100%
rename from java/src/common/biome/BiomeHell.java
rename to common/src/common/biome/BiomeHell.java
diff --git a/java/src/common/biome/BiomeHills.java b/common/src/common/biome/BiomeHills.java
similarity index 100%
rename from java/src/common/biome/BiomeHills.java
rename to common/src/common/biome/BiomeHills.java
diff --git a/java/src/common/biome/BiomeJungle.java b/common/src/common/biome/BiomeJungle.java
similarity index 100%
rename from java/src/common/biome/BiomeJungle.java
rename to common/src/common/biome/BiomeJungle.java
diff --git a/java/src/common/biome/BiomeMesa.java b/common/src/common/biome/BiomeMesa.java
similarity index 100%
rename from java/src/common/biome/BiomeMesa.java
rename to common/src/common/biome/BiomeMesa.java
diff --git a/java/src/common/biome/BiomeMoon.java b/common/src/common/biome/BiomeMoon.java
similarity index 100%
rename from java/src/common/biome/BiomeMoon.java
rename to common/src/common/biome/BiomeMoon.java
diff --git a/java/src/common/biome/BiomeMushroom.java b/common/src/common/biome/BiomeMushroom.java
similarity index 100%
rename from java/src/common/biome/BiomeMushroom.java
rename to common/src/common/biome/BiomeMushroom.java
diff --git a/java/src/common/biome/BiomeMutated.java b/common/src/common/biome/BiomeMutated.java
similarity index 100%
rename from java/src/common/biome/BiomeMutated.java
rename to common/src/common/biome/BiomeMutated.java
diff --git a/java/src/common/biome/BiomeNone.java b/common/src/common/biome/BiomeNone.java
similarity index 100%
rename from java/src/common/biome/BiomeNone.java
rename to common/src/common/biome/BiomeNone.java
diff --git a/java/src/common/biome/BiomePlains.java b/common/src/common/biome/BiomePlains.java
similarity index 100%
rename from java/src/common/biome/BiomePlains.java
rename to common/src/common/biome/BiomePlains.java
diff --git a/java/src/common/biome/BiomeSavanna.java b/common/src/common/biome/BiomeSavanna.java
similarity index 100%
rename from java/src/common/biome/BiomeSavanna.java
rename to common/src/common/biome/BiomeSavanna.java
diff --git a/java/src/common/biome/BiomeSnow.java b/common/src/common/biome/BiomeSnow.java
similarity index 100%
rename from java/src/common/biome/BiomeSnow.java
rename to common/src/common/biome/BiomeSnow.java
diff --git a/java/src/common/biome/BiomeSnowLand.java b/common/src/common/biome/BiomeSnowLand.java
similarity index 100%
rename from java/src/common/biome/BiomeSnowLand.java
rename to common/src/common/biome/BiomeSnowLand.java
diff --git a/java/src/common/biome/BiomeSpace.java b/common/src/common/biome/BiomeSpace.java
similarity index 100%
rename from java/src/common/biome/BiomeSpace.java
rename to common/src/common/biome/BiomeSpace.java
diff --git a/java/src/common/biome/BiomeStoneBeach.java b/common/src/common/biome/BiomeStoneBeach.java
similarity index 100%
rename from java/src/common/biome/BiomeStoneBeach.java
rename to common/src/common/biome/BiomeStoneBeach.java
diff --git a/java/src/common/biome/BiomeSwamp.java b/common/src/common/biome/BiomeSwamp.java
similarity index 100%
rename from java/src/common/biome/BiomeSwamp.java
rename to common/src/common/biome/BiomeSwamp.java
diff --git a/java/src/common/biome/BiomeTaiga.java b/common/src/common/biome/BiomeTaiga.java
similarity index 100%
rename from java/src/common/biome/BiomeTaiga.java
rename to common/src/common/biome/BiomeTaiga.java
diff --git a/java/src/common/biome/BiomeTian.java b/common/src/common/biome/BiomeTian.java
similarity index 100%
rename from java/src/common/biome/BiomeTian.java
rename to common/src/common/biome/BiomeTian.java
diff --git a/java/src/common/biome/BiomeWater.java b/common/src/common/biome/BiomeWater.java
similarity index 100%
rename from java/src/common/biome/BiomeWater.java
rename to common/src/common/biome/BiomeWater.java
diff --git a/java/src/common/biome/RngSpawn.java b/common/src/common/biome/RngSpawn.java
similarity index 100%
rename from java/src/common/biome/RngSpawn.java
rename to common/src/common/biome/RngSpawn.java
diff --git a/java/src/common/biome/Scaling.java b/common/src/common/biome/Scaling.java
similarity index 100%
rename from java/src/common/biome/Scaling.java
rename to common/src/common/biome/Scaling.java
diff --git a/java/src/common/biome/Temperature.java b/common/src/common/biome/Temperature.java
similarity index 100%
rename from java/src/common/biome/Temperature.java
rename to common/src/common/biome/Temperature.java
diff --git a/java/src/common/block/Block.java b/common/src/common/block/Block.java
similarity index 100%
rename from java/src/common/block/Block.java
rename to common/src/common/block/Block.java
diff --git a/java/src/common/block/BlockAir.java b/common/src/common/block/BlockAir.java
similarity index 100%
rename from java/src/common/block/BlockAir.java
rename to common/src/common/block/BlockAir.java
diff --git a/java/src/common/block/BlockAnvil.java b/common/src/common/block/BlockAnvil.java
similarity index 100%
rename from java/src/common/block/BlockAnvil.java
rename to common/src/common/block/BlockAnvil.java
diff --git a/java/src/common/block/BlockBanner.java b/common/src/common/block/BlockBanner.java
similarity index 100%
rename from java/src/common/block/BlockBanner.java
rename to common/src/common/block/BlockBanner.java
diff --git a/java/src/common/block/BlockBaseFlower.java b/common/src/common/block/BlockBaseFlower.java
similarity index 100%
rename from java/src/common/block/BlockBaseFlower.java
rename to common/src/common/block/BlockBaseFlower.java
diff --git a/java/src/common/block/BlockBasePressurePlate.java b/common/src/common/block/BlockBasePressurePlate.java
similarity index 100%
rename from java/src/common/block/BlockBasePressurePlate.java
rename to common/src/common/block/BlockBasePressurePlate.java
diff --git a/java/src/common/block/BlockBeacon.java b/common/src/common/block/BlockBeacon.java
similarity index 100%
rename from java/src/common/block/BlockBeacon.java
rename to common/src/common/block/BlockBeacon.java
diff --git a/java/src/common/block/BlockBed.java b/common/src/common/block/BlockBed.java
similarity index 100%
rename from java/src/common/block/BlockBed.java
rename to common/src/common/block/BlockBed.java
diff --git a/java/src/common/block/BlockBedrock.java b/common/src/common/block/BlockBedrock.java
similarity index 100%
rename from java/src/common/block/BlockBedrock.java
rename to common/src/common/block/BlockBedrock.java
diff --git a/java/src/common/block/BlockBlackenedDirt.java b/common/src/common/block/BlockBlackenedDirt.java
similarity index 100%
rename from java/src/common/block/BlockBlackenedDirt.java
rename to common/src/common/block/BlockBlackenedDirt.java
diff --git a/java/src/common/block/BlockBlackenedSoil.java b/common/src/common/block/BlockBlackenedSoil.java
similarity index 100%
rename from java/src/common/block/BlockBlackenedSoil.java
rename to common/src/common/block/BlockBlackenedSoil.java
diff --git a/java/src/common/block/BlockBlackenedStone.java b/common/src/common/block/BlockBlackenedStone.java
similarity index 100%
rename from java/src/common/block/BlockBlackenedStone.java
rename to common/src/common/block/BlockBlackenedStone.java
diff --git a/java/src/common/block/BlockBlueShroom.java b/common/src/common/block/BlockBlueShroom.java
similarity index 100%
rename from java/src/common/block/BlockBlueShroom.java
rename to common/src/common/block/BlockBlueShroom.java
diff --git a/java/src/common/block/BlockBookshelf.java b/common/src/common/block/BlockBookshelf.java
similarity index 100%
rename from java/src/common/block/BlockBookshelf.java
rename to common/src/common/block/BlockBookshelf.java
diff --git a/java/src/common/block/BlockBreakable.java b/common/src/common/block/BlockBreakable.java
similarity index 100%
rename from java/src/common/block/BlockBreakable.java
rename to common/src/common/block/BlockBreakable.java
diff --git a/java/src/common/block/BlockBrewingStand.java b/common/src/common/block/BlockBrewingStand.java
similarity index 100%
rename from java/src/common/block/BlockBrewingStand.java
rename to common/src/common/block/BlockBrewingStand.java
diff --git a/java/src/common/block/BlockBush.java b/common/src/common/block/BlockBush.java
similarity index 100%
rename from java/src/common/block/BlockBush.java
rename to common/src/common/block/BlockBush.java
diff --git a/java/src/common/block/BlockButton.java b/common/src/common/block/BlockButton.java
similarity index 100%
rename from java/src/common/block/BlockButton.java
rename to common/src/common/block/BlockButton.java
diff --git a/java/src/common/block/BlockCactus.java b/common/src/common/block/BlockCactus.java
similarity index 100%
rename from java/src/common/block/BlockCactus.java
rename to common/src/common/block/BlockCactus.java
diff --git a/java/src/common/block/BlockCake.java b/common/src/common/block/BlockCake.java
similarity index 100%
rename from java/src/common/block/BlockCake.java
rename to common/src/common/block/BlockCake.java
diff --git a/java/src/common/block/BlockCarpet.java b/common/src/common/block/BlockCarpet.java
similarity index 100%
rename from java/src/common/block/BlockCarpet.java
rename to common/src/common/block/BlockCarpet.java
diff --git a/java/src/common/block/BlockCarrot.java b/common/src/common/block/BlockCarrot.java
similarity index 100%
rename from java/src/common/block/BlockCarrot.java
rename to common/src/common/block/BlockCarrot.java
diff --git a/java/src/common/block/BlockCauldron.java b/common/src/common/block/BlockCauldron.java
similarity index 100%
rename from java/src/common/block/BlockCauldron.java
rename to common/src/common/block/BlockCauldron.java
diff --git a/java/src/common/block/BlockChest.java b/common/src/common/block/BlockChest.java
similarity index 100%
rename from java/src/common/block/BlockChest.java
rename to common/src/common/block/BlockChest.java
diff --git a/java/src/common/block/BlockClay.java b/common/src/common/block/BlockClay.java
similarity index 100%
rename from java/src/common/block/BlockClay.java
rename to common/src/common/block/BlockClay.java
diff --git a/java/src/common/block/BlockCocoa.java b/common/src/common/block/BlockCocoa.java
similarity index 100%
rename from java/src/common/block/BlockCocoa.java
rename to common/src/common/block/BlockCocoa.java
diff --git a/java/src/common/block/BlockColored.java b/common/src/common/block/BlockColored.java
similarity index 100%
rename from java/src/common/block/BlockColored.java
rename to common/src/common/block/BlockColored.java
diff --git a/java/src/common/block/BlockCompressedPowered.java b/common/src/common/block/BlockCompressedPowered.java
similarity index 100%
rename from java/src/common/block/BlockCompressedPowered.java
rename to common/src/common/block/BlockCompressedPowered.java
diff --git a/java/src/common/block/BlockContainer.java b/common/src/common/block/BlockContainer.java
similarity index 100%
rename from java/src/common/block/BlockContainer.java
rename to common/src/common/block/BlockContainer.java
diff --git a/java/src/common/block/BlockCore.java b/common/src/common/block/BlockCore.java
similarity index 100%
rename from java/src/common/block/BlockCore.java
rename to common/src/common/block/BlockCore.java
diff --git a/java/src/common/block/BlockCrops.java b/common/src/common/block/BlockCrops.java
similarity index 100%
rename from java/src/common/block/BlockCrops.java
rename to common/src/common/block/BlockCrops.java
diff --git a/java/src/common/block/BlockDaylightDetector.java b/common/src/common/block/BlockDaylightDetector.java
similarity index 100%
rename from java/src/common/block/BlockDaylightDetector.java
rename to common/src/common/block/BlockDaylightDetector.java
diff --git a/java/src/common/block/BlockDeadBush.java b/common/src/common/block/BlockDeadBush.java
similarity index 100%
rename from java/src/common/block/BlockDeadBush.java
rename to common/src/common/block/BlockDeadBush.java
diff --git a/java/src/common/block/BlockDirectional.java b/common/src/common/block/BlockDirectional.java
similarity index 100%
rename from java/src/common/block/BlockDirectional.java
rename to common/src/common/block/BlockDirectional.java
diff --git a/java/src/common/block/BlockDirt.java b/common/src/common/block/BlockDirt.java
similarity index 100%
rename from java/src/common/block/BlockDirt.java
rename to common/src/common/block/BlockDirt.java
diff --git a/java/src/common/block/BlockDispenser.java b/common/src/common/block/BlockDispenser.java
similarity index 100%
rename from java/src/common/block/BlockDispenser.java
rename to common/src/common/block/BlockDispenser.java
diff --git a/java/src/common/block/BlockDoor.java b/common/src/common/block/BlockDoor.java
similarity index 100%
rename from java/src/common/block/BlockDoor.java
rename to common/src/common/block/BlockDoor.java
diff --git a/java/src/common/block/BlockDoublePlant.java b/common/src/common/block/BlockDoublePlant.java
similarity index 100%
rename from java/src/common/block/BlockDoublePlant.java
rename to common/src/common/block/BlockDoublePlant.java
diff --git a/java/src/common/block/BlockDragonEgg.java b/common/src/common/block/BlockDragonEgg.java
similarity index 100%
rename from java/src/common/block/BlockDragonEgg.java
rename to common/src/common/block/BlockDragonEgg.java
diff --git a/java/src/common/block/BlockDropper.java b/common/src/common/block/BlockDropper.java
similarity index 100%
rename from java/src/common/block/BlockDropper.java
rename to common/src/common/block/BlockDropper.java
diff --git a/java/src/common/block/BlockDryLeaves.java b/common/src/common/block/BlockDryLeaves.java
similarity index 100%
rename from java/src/common/block/BlockDryLeaves.java
rename to common/src/common/block/BlockDryLeaves.java
diff --git a/java/src/common/block/BlockDynamicLiquid.java b/common/src/common/block/BlockDynamicLiquid.java
similarity index 100%
rename from java/src/common/block/BlockDynamicLiquid.java
rename to common/src/common/block/BlockDynamicLiquid.java
diff --git a/java/src/common/block/BlockEnchantmentTable.java b/common/src/common/block/BlockEnchantmentTable.java
similarity index 100%
rename from java/src/common/block/BlockEnchantmentTable.java
rename to common/src/common/block/BlockEnchantmentTable.java
diff --git a/java/src/common/block/BlockEventData.java b/common/src/common/block/BlockEventData.java
similarity index 100%
rename from java/src/common/block/BlockEventData.java
rename to common/src/common/block/BlockEventData.java
diff --git a/java/src/common/block/BlockFalling.java b/common/src/common/block/BlockFalling.java
similarity index 100%
rename from java/src/common/block/BlockFalling.java
rename to common/src/common/block/BlockFalling.java
diff --git a/java/src/common/block/BlockFarmland.java b/common/src/common/block/BlockFarmland.java
similarity index 100%
rename from java/src/common/block/BlockFarmland.java
rename to common/src/common/block/BlockFarmland.java
diff --git a/java/src/common/block/BlockFence.java b/common/src/common/block/BlockFence.java
similarity index 100%
rename from java/src/common/block/BlockFence.java
rename to common/src/common/block/BlockFence.java
diff --git a/java/src/common/block/BlockFenceGate.java b/common/src/common/block/BlockFenceGate.java
similarity index 100%
rename from java/src/common/block/BlockFenceGate.java
rename to common/src/common/block/BlockFenceGate.java
diff --git a/java/src/common/block/BlockFire.java b/common/src/common/block/BlockFire.java
similarity index 100%
rename from java/src/common/block/BlockFire.java
rename to common/src/common/block/BlockFire.java
diff --git a/java/src/common/block/BlockFloorPortal.java b/common/src/common/block/BlockFloorPortal.java
similarity index 100%
rename from java/src/common/block/BlockFloorPortal.java
rename to common/src/common/block/BlockFloorPortal.java
diff --git a/java/src/common/block/BlockFlower.java b/common/src/common/block/BlockFlower.java
similarity index 100%
rename from java/src/common/block/BlockFlower.java
rename to common/src/common/block/BlockFlower.java
diff --git a/java/src/common/block/BlockFlowerPot.java b/common/src/common/block/BlockFlowerPot.java
similarity index 100%
rename from java/src/common/block/BlockFlowerPot.java
rename to common/src/common/block/BlockFlowerPot.java
diff --git a/java/src/common/block/BlockFurnace.java b/common/src/common/block/BlockFurnace.java
similarity index 100%
rename from java/src/common/block/BlockFurnace.java
rename to common/src/common/block/BlockFurnace.java
diff --git a/java/src/common/block/BlockGlass.java b/common/src/common/block/BlockGlass.java
similarity index 100%
rename from java/src/common/block/BlockGlass.java
rename to common/src/common/block/BlockGlass.java
diff --git a/java/src/common/block/BlockGlowstone.java b/common/src/common/block/BlockGlowstone.java
similarity index 100%
rename from java/src/common/block/BlockGlowstone.java
rename to common/src/common/block/BlockGlowstone.java
diff --git a/java/src/common/block/BlockGrass.java b/common/src/common/block/BlockGrass.java
similarity index 100%
rename from java/src/common/block/BlockGrass.java
rename to common/src/common/block/BlockGrass.java
diff --git a/java/src/common/block/BlockGravel.java b/common/src/common/block/BlockGravel.java
similarity index 100%
rename from java/src/common/block/BlockGravel.java
rename to common/src/common/block/BlockGravel.java
diff --git a/java/src/common/block/BlockHardenedClay.java b/common/src/common/block/BlockHardenedClay.java
similarity index 100%
rename from java/src/common/block/BlockHardenedClay.java
rename to common/src/common/block/BlockHardenedClay.java
diff --git a/java/src/common/block/BlockHay.java b/common/src/common/block/BlockHay.java
similarity index 100%
rename from java/src/common/block/BlockHay.java
rename to common/src/common/block/BlockHay.java
diff --git a/java/src/common/block/BlockHellRock.java b/common/src/common/block/BlockHellRock.java
similarity index 100%
rename from java/src/common/block/BlockHellRock.java
rename to common/src/common/block/BlockHellRock.java
diff --git a/java/src/common/block/BlockHopper.java b/common/src/common/block/BlockHopper.java
similarity index 100%
rename from java/src/common/block/BlockHopper.java
rename to common/src/common/block/BlockHopper.java
diff --git a/java/src/common/block/BlockHugeMushroom.java b/common/src/common/block/BlockHugeMushroom.java
similarity index 100%
rename from java/src/common/block/BlockHugeMushroom.java
rename to common/src/common/block/BlockHugeMushroom.java
diff --git a/java/src/common/block/BlockIce.java b/common/src/common/block/BlockIce.java
similarity index 100%
rename from java/src/common/block/BlockIce.java
rename to common/src/common/block/BlockIce.java
diff --git a/java/src/common/block/BlockJukebox.java b/common/src/common/block/BlockJukebox.java
similarity index 100%
rename from java/src/common/block/BlockJukebox.java
rename to common/src/common/block/BlockJukebox.java
diff --git a/java/src/common/block/BlockLadder.java b/common/src/common/block/BlockLadder.java
similarity index 100%
rename from java/src/common/block/BlockLadder.java
rename to common/src/common/block/BlockLadder.java
diff --git a/java/src/common/block/BlockLeaves.java b/common/src/common/block/BlockLeaves.java
similarity index 100%
rename from java/src/common/block/BlockLeaves.java
rename to common/src/common/block/BlockLeaves.java
diff --git a/java/src/common/block/BlockLeavesBase.java b/common/src/common/block/BlockLeavesBase.java
similarity index 100%
rename from java/src/common/block/BlockLeavesBase.java
rename to common/src/common/block/BlockLeavesBase.java
diff --git a/java/src/common/block/BlockLever.java b/common/src/common/block/BlockLever.java
similarity index 100%
rename from java/src/common/block/BlockLever.java
rename to common/src/common/block/BlockLever.java
diff --git a/java/src/common/block/BlockLilyPad.java b/common/src/common/block/BlockLilyPad.java
similarity index 100%
rename from java/src/common/block/BlockLilyPad.java
rename to common/src/common/block/BlockLilyPad.java
diff --git a/java/src/common/block/BlockLiquid.java b/common/src/common/block/BlockLiquid.java
similarity index 100%
rename from java/src/common/block/BlockLiquid.java
rename to common/src/common/block/BlockLiquid.java
diff --git a/java/src/common/block/BlockLog.java b/common/src/common/block/BlockLog.java
similarity index 100%
rename from java/src/common/block/BlockLog.java
rename to common/src/common/block/BlockLog.java
diff --git a/java/src/common/block/BlockMachine.java b/common/src/common/block/BlockMachine.java
similarity index 100%
rename from java/src/common/block/BlockMachine.java
rename to common/src/common/block/BlockMachine.java
diff --git a/java/src/common/block/BlockMelon.java b/common/src/common/block/BlockMelon.java
similarity index 100%
rename from java/src/common/block/BlockMelon.java
rename to common/src/common/block/BlockMelon.java
diff --git a/java/src/common/block/BlockMobSpawner.java b/common/src/common/block/BlockMobSpawner.java
similarity index 100%
rename from java/src/common/block/BlockMobSpawner.java
rename to common/src/common/block/BlockMobSpawner.java
diff --git a/java/src/common/block/BlockMushroom.java b/common/src/common/block/BlockMushroom.java
similarity index 100%
rename from java/src/common/block/BlockMushroom.java
rename to common/src/common/block/BlockMushroom.java
diff --git a/java/src/common/block/BlockMycelium.java b/common/src/common/block/BlockMycelium.java
similarity index 100%
rename from java/src/common/block/BlockMycelium.java
rename to common/src/common/block/BlockMycelium.java
diff --git a/java/src/common/block/BlockNote.java b/common/src/common/block/BlockNote.java
similarity index 100%
rename from java/src/common/block/BlockNote.java
rename to common/src/common/block/BlockNote.java
diff --git a/java/src/common/block/BlockNuke.java b/common/src/common/block/BlockNuke.java
similarity index 100%
rename from java/src/common/block/BlockNuke.java
rename to common/src/common/block/BlockNuke.java
diff --git a/java/src/common/block/BlockObsidian.java b/common/src/common/block/BlockObsidian.java
similarity index 100%
rename from java/src/common/block/BlockObsidian.java
rename to common/src/common/block/BlockObsidian.java
diff --git a/java/src/common/block/BlockOre.java b/common/src/common/block/BlockOre.java
similarity index 100%
rename from java/src/common/block/BlockOre.java
rename to common/src/common/block/BlockOre.java
diff --git a/java/src/common/block/BlockPackedIce.java b/common/src/common/block/BlockPackedIce.java
similarity index 100%
rename from java/src/common/block/BlockPackedIce.java
rename to common/src/common/block/BlockPackedIce.java
diff --git a/java/src/common/block/BlockPane.java b/common/src/common/block/BlockPane.java
similarity index 100%
rename from java/src/common/block/BlockPane.java
rename to common/src/common/block/BlockPane.java
diff --git a/java/src/common/block/BlockPistonBase.java b/common/src/common/block/BlockPistonBase.java
similarity index 100%
rename from java/src/common/block/BlockPistonBase.java
rename to common/src/common/block/BlockPistonBase.java
diff --git a/java/src/common/block/BlockPistonHead.java b/common/src/common/block/BlockPistonHead.java
similarity index 100%
rename from java/src/common/block/BlockPistonHead.java
rename to common/src/common/block/BlockPistonHead.java
diff --git a/java/src/common/block/BlockPistonMoving.java b/common/src/common/block/BlockPistonMoving.java
similarity index 100%
rename from java/src/common/block/BlockPistonMoving.java
rename to common/src/common/block/BlockPistonMoving.java
diff --git a/java/src/common/block/BlockPortal.java b/common/src/common/block/BlockPortal.java
similarity index 100%
rename from java/src/common/block/BlockPortal.java
rename to common/src/common/block/BlockPortal.java
diff --git a/java/src/common/block/BlockPortalFrame.java b/common/src/common/block/BlockPortalFrame.java
similarity index 100%
rename from java/src/common/block/BlockPortalFrame.java
rename to common/src/common/block/BlockPortalFrame.java
diff --git a/java/src/common/block/BlockPotato.java b/common/src/common/block/BlockPotato.java
similarity index 100%
rename from java/src/common/block/BlockPotato.java
rename to common/src/common/block/BlockPotato.java
diff --git a/java/src/common/block/BlockPressurePlate.java b/common/src/common/block/BlockPressurePlate.java
similarity index 100%
rename from java/src/common/block/BlockPressurePlate.java
rename to common/src/common/block/BlockPressurePlate.java
diff --git a/java/src/common/block/BlockPressurePlateWeighted.java b/common/src/common/block/BlockPressurePlateWeighted.java
similarity index 100%
rename from java/src/common/block/BlockPressurePlateWeighted.java
rename to common/src/common/block/BlockPressurePlateWeighted.java
diff --git a/java/src/common/block/BlockPumpkin.java b/common/src/common/block/BlockPumpkin.java
similarity index 100%
rename from java/src/common/block/BlockPumpkin.java
rename to common/src/common/block/BlockPumpkin.java
diff --git a/java/src/common/block/BlockQuartz.java b/common/src/common/block/BlockQuartz.java
similarity index 100%
rename from java/src/common/block/BlockQuartz.java
rename to common/src/common/block/BlockQuartz.java
diff --git a/java/src/common/block/BlockRail.java b/common/src/common/block/BlockRail.java
similarity index 100%
rename from java/src/common/block/BlockRail.java
rename to common/src/common/block/BlockRail.java
diff --git a/java/src/common/block/BlockRailBase.java b/common/src/common/block/BlockRailBase.java
similarity index 100%
rename from java/src/common/block/BlockRailBase.java
rename to common/src/common/block/BlockRailBase.java
diff --git a/java/src/common/block/BlockRailDetector.java b/common/src/common/block/BlockRailDetector.java
similarity index 100%
rename from java/src/common/block/BlockRailDetector.java
rename to common/src/common/block/BlockRailDetector.java
diff --git a/java/src/common/block/BlockRailPowered.java b/common/src/common/block/BlockRailPowered.java
similarity index 100%
rename from java/src/common/block/BlockRailPowered.java
rename to common/src/common/block/BlockRailPowered.java
diff --git a/java/src/common/block/BlockRedstoneComparator.java b/common/src/common/block/BlockRedstoneComparator.java
similarity index 100%
rename from java/src/common/block/BlockRedstoneComparator.java
rename to common/src/common/block/BlockRedstoneComparator.java
diff --git a/java/src/common/block/BlockRedstoneDiode.java b/common/src/common/block/BlockRedstoneDiode.java
similarity index 100%
rename from java/src/common/block/BlockRedstoneDiode.java
rename to common/src/common/block/BlockRedstoneDiode.java
diff --git a/java/src/common/block/BlockRedstoneLight.java b/common/src/common/block/BlockRedstoneLight.java
similarity index 100%
rename from java/src/common/block/BlockRedstoneLight.java
rename to common/src/common/block/BlockRedstoneLight.java
diff --git a/java/src/common/block/BlockRedstoneOre.java b/common/src/common/block/BlockRedstoneOre.java
similarity index 100%
rename from java/src/common/block/BlockRedstoneOre.java
rename to common/src/common/block/BlockRedstoneOre.java
diff --git a/java/src/common/block/BlockRedstoneRepeater.java b/common/src/common/block/BlockRedstoneRepeater.java
similarity index 100%
rename from java/src/common/block/BlockRedstoneRepeater.java
rename to common/src/common/block/BlockRedstoneRepeater.java
diff --git a/java/src/common/block/BlockRedstoneTorch.java b/common/src/common/block/BlockRedstoneTorch.java
similarity index 100%
rename from java/src/common/block/BlockRedstoneTorch.java
rename to common/src/common/block/BlockRedstoneTorch.java
diff --git a/java/src/common/block/BlockRedstoneWire.java b/common/src/common/block/BlockRedstoneWire.java
similarity index 100%
rename from java/src/common/block/BlockRedstoneWire.java
rename to common/src/common/block/BlockRedstoneWire.java
diff --git a/java/src/common/block/BlockReed.java b/common/src/common/block/BlockReed.java
similarity index 100%
rename from java/src/common/block/BlockReed.java
rename to common/src/common/block/BlockReed.java
diff --git a/java/src/common/block/BlockRock.java b/common/src/common/block/BlockRock.java
similarity index 100%
rename from java/src/common/block/BlockRock.java
rename to common/src/common/block/BlockRock.java
diff --git a/java/src/common/block/BlockRotatedPillar.java b/common/src/common/block/BlockRotatedPillar.java
similarity index 100%
rename from java/src/common/block/BlockRotatedPillar.java
rename to common/src/common/block/BlockRotatedPillar.java
diff --git a/java/src/common/block/BlockSand.java b/common/src/common/block/BlockSand.java
similarity index 100%
rename from java/src/common/block/BlockSand.java
rename to common/src/common/block/BlockSand.java
diff --git a/java/src/common/block/BlockSandStone.java b/common/src/common/block/BlockSandStone.java
similarity index 100%
rename from java/src/common/block/BlockSandStone.java
rename to common/src/common/block/BlockSandStone.java
diff --git a/java/src/common/block/BlockSapling.java b/common/src/common/block/BlockSapling.java
similarity index 100%
rename from java/src/common/block/BlockSapling.java
rename to common/src/common/block/BlockSapling.java
diff --git a/java/src/common/block/BlockSign.java b/common/src/common/block/BlockSign.java
similarity index 100%
rename from java/src/common/block/BlockSign.java
rename to common/src/common/block/BlockSign.java
diff --git a/java/src/common/block/BlockSkull.java b/common/src/common/block/BlockSkull.java
similarity index 100%
rename from java/src/common/block/BlockSkull.java
rename to common/src/common/block/BlockSkull.java
diff --git a/java/src/common/block/BlockSlab.java b/common/src/common/block/BlockSlab.java
similarity index 100%
rename from java/src/common/block/BlockSlab.java
rename to common/src/common/block/BlockSlab.java
diff --git a/java/src/common/block/BlockSlime.java b/common/src/common/block/BlockSlime.java
similarity index 100%
rename from java/src/common/block/BlockSlime.java
rename to common/src/common/block/BlockSlime.java
diff --git a/java/src/common/block/BlockSnow.java b/common/src/common/block/BlockSnow.java
similarity index 100%
rename from java/src/common/block/BlockSnow.java
rename to common/src/common/block/BlockSnow.java
diff --git a/java/src/common/block/BlockSnowBlock.java b/common/src/common/block/BlockSnowBlock.java
similarity index 100%
rename from java/src/common/block/BlockSnowBlock.java
rename to common/src/common/block/BlockSnowBlock.java
diff --git a/java/src/common/block/BlockSoulSand.java b/common/src/common/block/BlockSoulSand.java
similarity index 100%
rename from java/src/common/block/BlockSoulSand.java
rename to common/src/common/block/BlockSoulSand.java
diff --git a/java/src/common/block/BlockSourceImpl.java b/common/src/common/block/BlockSourceImpl.java
similarity index 100%
rename from java/src/common/block/BlockSourceImpl.java
rename to common/src/common/block/BlockSourceImpl.java
diff --git a/java/src/common/block/BlockStainedGlass.java b/common/src/common/block/BlockStainedGlass.java
similarity index 100%
rename from java/src/common/block/BlockStainedGlass.java
rename to common/src/common/block/BlockStainedGlass.java
diff --git a/java/src/common/block/BlockStainedGlassPane.java b/common/src/common/block/BlockStainedGlassPane.java
similarity index 100%
rename from java/src/common/block/BlockStainedGlassPane.java
rename to common/src/common/block/BlockStainedGlassPane.java
diff --git a/java/src/common/block/BlockStairs.java b/common/src/common/block/BlockStairs.java
similarity index 100%
rename from java/src/common/block/BlockStairs.java
rename to common/src/common/block/BlockStairs.java
diff --git a/java/src/common/block/BlockStandingSign.java b/common/src/common/block/BlockStandingSign.java
similarity index 100%
rename from java/src/common/block/BlockStandingSign.java
rename to common/src/common/block/BlockStandingSign.java
diff --git a/java/src/common/block/BlockStaticLiquid.java b/common/src/common/block/BlockStaticLiquid.java
similarity index 100%
rename from java/src/common/block/BlockStaticLiquid.java
rename to common/src/common/block/BlockStaticLiquid.java
diff --git a/java/src/common/block/BlockStem.java b/common/src/common/block/BlockStem.java
similarity index 100%
rename from java/src/common/block/BlockStem.java
rename to common/src/common/block/BlockStem.java
diff --git a/java/src/common/block/BlockStone.java b/common/src/common/block/BlockStone.java
similarity index 100%
rename from java/src/common/block/BlockStone.java
rename to common/src/common/block/BlockStone.java
diff --git a/java/src/common/block/BlockStoneBrick.java b/common/src/common/block/BlockStoneBrick.java
similarity index 100%
rename from java/src/common/block/BlockStoneBrick.java
rename to common/src/common/block/BlockStoneBrick.java
diff --git a/java/src/common/block/BlockTNT.java b/common/src/common/block/BlockTNT.java
similarity index 100%
rename from java/src/common/block/BlockTNT.java
rename to common/src/common/block/BlockTNT.java
diff --git a/java/src/common/block/BlockTallGrass.java b/common/src/common/block/BlockTallGrass.java
similarity index 100%
rename from java/src/common/block/BlockTallGrass.java
rename to common/src/common/block/BlockTallGrass.java
diff --git a/java/src/common/block/BlockTianReactor.java b/common/src/common/block/BlockTianReactor.java
similarity index 100%
rename from java/src/common/block/BlockTianReactor.java
rename to common/src/common/block/BlockTianReactor.java
diff --git a/java/src/common/block/BlockTianSoil.java b/common/src/common/block/BlockTianSoil.java
similarity index 100%
rename from java/src/common/block/BlockTianSoil.java
rename to common/src/common/block/BlockTianSoil.java
diff --git a/java/src/common/block/BlockTorch.java b/common/src/common/block/BlockTorch.java
similarity index 100%
rename from java/src/common/block/BlockTorch.java
rename to common/src/common/block/BlockTorch.java
diff --git a/java/src/common/block/BlockTrapDoor.java b/common/src/common/block/BlockTrapDoor.java
similarity index 100%
rename from java/src/common/block/BlockTrapDoor.java
rename to common/src/common/block/BlockTrapDoor.java
diff --git a/java/src/common/block/BlockTreasure.java b/common/src/common/block/BlockTreasure.java
similarity index 100%
rename from java/src/common/block/BlockTreasure.java
rename to common/src/common/block/BlockTreasure.java
diff --git a/java/src/common/block/BlockTripWire.java b/common/src/common/block/BlockTripWire.java
similarity index 100%
rename from java/src/common/block/BlockTripWire.java
rename to common/src/common/block/BlockTripWire.java
diff --git a/java/src/common/block/BlockTripWireHook.java b/common/src/common/block/BlockTripWireHook.java
similarity index 100%
rename from java/src/common/block/BlockTripWireHook.java
rename to common/src/common/block/BlockTripWireHook.java
diff --git a/java/src/common/block/BlockVine.java b/common/src/common/block/BlockVine.java
similarity index 100%
rename from java/src/common/block/BlockVine.java
rename to common/src/common/block/BlockVine.java
diff --git a/java/src/common/block/BlockWall.java b/common/src/common/block/BlockWall.java
similarity index 100%
rename from java/src/common/block/BlockWall.java
rename to common/src/common/block/BlockWall.java
diff --git a/java/src/common/block/BlockWallSign.java b/common/src/common/block/BlockWallSign.java
similarity index 100%
rename from java/src/common/block/BlockWallSign.java
rename to common/src/common/block/BlockWallSign.java
diff --git a/java/src/common/block/BlockWarpChest.java b/common/src/common/block/BlockWarpChest.java
similarity index 100%
rename from java/src/common/block/BlockWarpChest.java
rename to common/src/common/block/BlockWarpChest.java
diff --git a/java/src/common/block/BlockWart.java b/common/src/common/block/BlockWart.java
similarity index 100%
rename from java/src/common/block/BlockWart.java
rename to common/src/common/block/BlockWart.java
diff --git a/java/src/common/block/BlockWeb.java b/common/src/common/block/BlockWeb.java
similarity index 100%
rename from java/src/common/block/BlockWeb.java
rename to common/src/common/block/BlockWeb.java
diff --git a/java/src/common/block/BlockWorkbench.java b/common/src/common/block/BlockWorkbench.java
similarity index 100%
rename from java/src/common/block/BlockWorkbench.java
rename to common/src/common/block/BlockWorkbench.java
diff --git a/java/src/common/block/IGrowable.java b/common/src/common/block/IGrowable.java
similarity index 100%
rename from java/src/common/block/IGrowable.java
rename to common/src/common/block/IGrowable.java
diff --git a/java/src/common/block/ITileEntityProvider.java b/common/src/common/block/ITileEntityProvider.java
similarity index 100%
rename from java/src/common/block/ITileEntityProvider.java
rename to common/src/common/block/ITileEntityProvider.java
diff --git a/java/src/common/block/LeavesType.java b/common/src/common/block/LeavesType.java
similarity index 100%
rename from java/src/common/block/LeavesType.java
rename to common/src/common/block/LeavesType.java
diff --git a/java/src/common/block/SoundType.java b/common/src/common/block/SoundType.java
similarity index 100%
rename from java/src/common/block/SoundType.java
rename to common/src/common/block/SoundType.java
diff --git a/java/src/common/clipboard/BlockTransform.java b/common/src/common/clipboard/BlockTransform.java
similarity index 100%
rename from java/src/common/clipboard/BlockTransform.java
rename to common/src/common/clipboard/BlockTransform.java
diff --git a/java/src/common/clipboard/ClipboardBlock.java b/common/src/common/clipboard/ClipboardBlock.java
similarity index 100%
rename from java/src/common/clipboard/ClipboardBlock.java
rename to common/src/common/clipboard/ClipboardBlock.java
diff --git a/java/src/common/clipboard/ClipboardPlacer.java b/common/src/common/clipboard/ClipboardPlacer.java
similarity index 100%
rename from java/src/common/clipboard/ClipboardPlacer.java
rename to common/src/common/clipboard/ClipboardPlacer.java
diff --git a/java/src/common/clipboard/Rotation.java b/common/src/common/clipboard/Rotation.java
similarity index 100%
rename from java/src/common/clipboard/Rotation.java
rename to common/src/common/clipboard/Rotation.java
diff --git a/java/src/common/clipboard/RotationValue.java b/common/src/common/clipboard/RotationValue.java
similarity index 100%
rename from java/src/common/clipboard/RotationValue.java
rename to common/src/common/clipboard/RotationValue.java
diff --git a/java/src/common/clipboard/Vector.java b/common/src/common/clipboard/Vector.java
similarity index 100%
rename from java/src/common/clipboard/Vector.java
rename to common/src/common/clipboard/Vector.java
diff --git a/java/src/common/collect/AbstractBiMap.java b/common/src/common/collect/AbstractBiMap.java
similarity index 100%
rename from java/src/common/collect/AbstractBiMap.java
rename to common/src/common/collect/AbstractBiMap.java
diff --git a/java/src/common/collect/AbstractIndexedListIterator.java b/common/src/common/collect/AbstractIndexedListIterator.java
similarity index 100%
rename from java/src/common/collect/AbstractIndexedListIterator.java
rename to common/src/common/collect/AbstractIndexedListIterator.java
diff --git a/java/src/common/collect/AbstractIterator.java b/common/src/common/collect/AbstractIterator.java
similarity index 100%
rename from java/src/common/collect/AbstractIterator.java
rename to common/src/common/collect/AbstractIterator.java
diff --git a/java/src/common/collect/AbstractMapEntry.java b/common/src/common/collect/AbstractMapEntry.java
similarity index 100%
rename from java/src/common/collect/AbstractMapEntry.java
rename to common/src/common/collect/AbstractMapEntry.java
diff --git a/java/src/common/collect/AbstractTable.java b/common/src/common/collect/AbstractTable.java
similarity index 100%
rename from java/src/common/collect/AbstractTable.java
rename to common/src/common/collect/AbstractTable.java
diff --git a/java/src/common/collect/BiMap.java b/common/src/common/collect/BiMap.java
similarity index 100%
rename from java/src/common/collect/BiMap.java
rename to common/src/common/collect/BiMap.java
diff --git a/java/src/common/collect/CollectPreconditions.java b/common/src/common/collect/CollectPreconditions.java
similarity index 100%
rename from java/src/common/collect/CollectPreconditions.java
rename to common/src/common/collect/CollectPreconditions.java
diff --git a/java/src/common/collect/DenseImmutableTable.java b/common/src/common/collect/DenseImmutableTable.java
similarity index 100%
rename from java/src/common/collect/DenseImmutableTable.java
rename to common/src/common/collect/DenseImmutableTable.java
diff --git a/java/src/common/collect/EmptyImmutableMap.java b/common/src/common/collect/EmptyImmutableMap.java
similarity index 100%
rename from java/src/common/collect/EmptyImmutableMap.java
rename to common/src/common/collect/EmptyImmutableMap.java
diff --git a/java/src/common/collect/EmptyImmutableSet.java b/common/src/common/collect/EmptyImmutableSet.java
similarity index 100%
rename from java/src/common/collect/EmptyImmutableSet.java
rename to common/src/common/collect/EmptyImmutableSet.java
diff --git a/java/src/common/collect/Filter.java b/common/src/common/collect/Filter.java
similarity index 100%
rename from java/src/common/collect/Filter.java
rename to common/src/common/collect/Filter.java
diff --git a/java/src/common/collect/ForwardingCollection.java b/common/src/common/collect/ForwardingCollection.java
similarity index 100%
rename from java/src/common/collect/ForwardingCollection.java
rename to common/src/common/collect/ForwardingCollection.java
diff --git a/java/src/common/collect/ForwardingMap.java b/common/src/common/collect/ForwardingMap.java
similarity index 100%
rename from java/src/common/collect/ForwardingMap.java
rename to common/src/common/collect/ForwardingMap.java
diff --git a/java/src/common/collect/ForwardingMapEntry.java b/common/src/common/collect/ForwardingMapEntry.java
similarity index 100%
rename from java/src/common/collect/ForwardingMapEntry.java
rename to common/src/common/collect/ForwardingMapEntry.java
diff --git a/java/src/common/collect/ForwardingObject.java b/common/src/common/collect/ForwardingObject.java
similarity index 100%
rename from java/src/common/collect/ForwardingObject.java
rename to common/src/common/collect/ForwardingObject.java
diff --git a/java/src/common/collect/ForwardingSet.java b/common/src/common/collect/ForwardingSet.java
similarity index 100%
rename from java/src/common/collect/ForwardingSet.java
rename to common/src/common/collect/ForwardingSet.java
diff --git a/java/src/common/collect/HashBiMap.java b/common/src/common/collect/HashBiMap.java
similarity index 100%
rename from java/src/common/collect/HashBiMap.java
rename to common/src/common/collect/HashBiMap.java
diff --git a/java/src/common/collect/Hashing.java b/common/src/common/collect/Hashing.java
similarity index 100%
rename from java/src/common/collect/Hashing.java
rename to common/src/common/collect/Hashing.java
diff --git a/java/src/common/collect/ImmutableAsList.java b/common/src/common/collect/ImmutableAsList.java
similarity index 100%
rename from java/src/common/collect/ImmutableAsList.java
rename to common/src/common/collect/ImmutableAsList.java
diff --git a/java/src/common/collect/ImmutableCollection.java b/common/src/common/collect/ImmutableCollection.java
similarity index 100%
rename from java/src/common/collect/ImmutableCollection.java
rename to common/src/common/collect/ImmutableCollection.java
diff --git a/java/src/common/collect/ImmutableEntry.java b/common/src/common/collect/ImmutableEntry.java
similarity index 100%
rename from java/src/common/collect/ImmutableEntry.java
rename to common/src/common/collect/ImmutableEntry.java
diff --git a/java/src/common/collect/ImmutableEnumMap.java b/common/src/common/collect/ImmutableEnumMap.java
similarity index 100%
rename from java/src/common/collect/ImmutableEnumMap.java
rename to common/src/common/collect/ImmutableEnumMap.java
diff --git a/java/src/common/collect/ImmutableEnumSet.java b/common/src/common/collect/ImmutableEnumSet.java
similarity index 100%
rename from java/src/common/collect/ImmutableEnumSet.java
rename to common/src/common/collect/ImmutableEnumSet.java
diff --git a/java/src/common/collect/ImmutableList.java b/common/src/common/collect/ImmutableList.java
similarity index 100%
rename from java/src/common/collect/ImmutableList.java
rename to common/src/common/collect/ImmutableList.java
diff --git a/java/src/common/collect/ImmutableMap.java b/common/src/common/collect/ImmutableMap.java
similarity index 100%
rename from java/src/common/collect/ImmutableMap.java
rename to common/src/common/collect/ImmutableMap.java
diff --git a/java/src/common/collect/ImmutableMapEntry.java b/common/src/common/collect/ImmutableMapEntry.java
similarity index 100%
rename from java/src/common/collect/ImmutableMapEntry.java
rename to common/src/common/collect/ImmutableMapEntry.java
diff --git a/java/src/common/collect/ImmutableMapEntrySet.java b/common/src/common/collect/ImmutableMapEntrySet.java
similarity index 100%
rename from java/src/common/collect/ImmutableMapEntrySet.java
rename to common/src/common/collect/ImmutableMapEntrySet.java
diff --git a/java/src/common/collect/ImmutableMapKeySet.java b/common/src/common/collect/ImmutableMapKeySet.java
similarity index 100%
rename from java/src/common/collect/ImmutableMapKeySet.java
rename to common/src/common/collect/ImmutableMapKeySet.java
diff --git a/java/src/common/collect/ImmutableMapValues.java b/common/src/common/collect/ImmutableMapValues.java
similarity index 100%
rename from java/src/common/collect/ImmutableMapValues.java
rename to common/src/common/collect/ImmutableMapValues.java
diff --git a/java/src/common/collect/ImmutableSet.java b/common/src/common/collect/ImmutableSet.java
similarity index 100%
rename from java/src/common/collect/ImmutableSet.java
rename to common/src/common/collect/ImmutableSet.java
diff --git a/java/src/common/collect/ImmutableTable.java b/common/src/common/collect/ImmutableTable.java
similarity index 100%
rename from java/src/common/collect/ImmutableTable.java
rename to common/src/common/collect/ImmutableTable.java
diff --git a/java/src/common/collect/Iterables.java b/common/src/common/collect/Iterables.java
similarity index 100%
rename from java/src/common/collect/Iterables.java
rename to common/src/common/collect/Iterables.java
diff --git a/java/src/common/collect/Iterators.java b/common/src/common/collect/Iterators.java
similarity index 100%
rename from java/src/common/collect/Iterators.java
rename to common/src/common/collect/Iterators.java
diff --git a/java/src/common/collect/Lists.java b/common/src/common/collect/Lists.java
similarity index 100%
rename from java/src/common/collect/Lists.java
rename to common/src/common/collect/Lists.java
diff --git a/java/src/common/collect/Maps.java b/common/src/common/collect/Maps.java
similarity index 100%
rename from java/src/common/collect/Maps.java
rename to common/src/common/collect/Maps.java
diff --git a/java/src/common/collect/ObjectArrays.java b/common/src/common/collect/ObjectArrays.java
similarity index 100%
rename from java/src/common/collect/ObjectArrays.java
rename to common/src/common/collect/ObjectArrays.java
diff --git a/java/src/common/collect/Preconditions.java b/common/src/common/collect/Preconditions.java
similarity index 100%
rename from java/src/common/collect/Preconditions.java
rename to common/src/common/collect/Preconditions.java
diff --git a/java/src/common/collect/RegularImmutableAsList.java b/common/src/common/collect/RegularImmutableAsList.java
similarity index 100%
rename from java/src/common/collect/RegularImmutableAsList.java
rename to common/src/common/collect/RegularImmutableAsList.java
diff --git a/java/src/common/collect/RegularImmutableList.java b/common/src/common/collect/RegularImmutableList.java
similarity index 100%
rename from java/src/common/collect/RegularImmutableList.java
rename to common/src/common/collect/RegularImmutableList.java
diff --git a/java/src/common/collect/RegularImmutableMap.java b/common/src/common/collect/RegularImmutableMap.java
similarity index 100%
rename from java/src/common/collect/RegularImmutableMap.java
rename to common/src/common/collect/RegularImmutableMap.java
diff --git a/java/src/common/collect/RegularImmutableSet.java b/common/src/common/collect/RegularImmutableSet.java
similarity index 100%
rename from java/src/common/collect/RegularImmutableSet.java
rename to common/src/common/collect/RegularImmutableSet.java
diff --git a/java/src/common/collect/RegularImmutableTable.java b/common/src/common/collect/RegularImmutableTable.java
similarity index 100%
rename from java/src/common/collect/RegularImmutableTable.java
rename to common/src/common/collect/RegularImmutableTable.java
diff --git a/java/src/common/collect/Sets.java b/common/src/common/collect/Sets.java
similarity index 100%
rename from java/src/common/collect/Sets.java
rename to common/src/common/collect/Sets.java
diff --git a/java/src/common/collect/SparseImmutableTable.java b/common/src/common/collect/SparseImmutableTable.java
similarity index 100%
rename from java/src/common/collect/SparseImmutableTable.java
rename to common/src/common/collect/SparseImmutableTable.java
diff --git a/java/src/common/collect/StandardTable.java b/common/src/common/collect/StandardTable.java
similarity index 100%
rename from java/src/common/collect/StandardTable.java
rename to common/src/common/collect/StandardTable.java
diff --git a/java/src/common/collect/Table.java b/common/src/common/collect/Table.java
similarity index 100%
rename from java/src/common/collect/Table.java
rename to common/src/common/collect/Table.java
diff --git a/java/src/common/collect/TransformedIterator.java b/common/src/common/collect/TransformedIterator.java
similarity index 100%
rename from java/src/common/collect/TransformedIterator.java
rename to common/src/common/collect/TransformedIterator.java
diff --git a/java/src/common/collect/UnmodifiableIterator.java b/common/src/common/collect/UnmodifiableIterator.java
similarity index 100%
rename from java/src/common/collect/UnmodifiableIterator.java
rename to common/src/common/collect/UnmodifiableIterator.java
diff --git a/java/src/common/collect/UnmodifiableListIterator.java b/common/src/common/collect/UnmodifiableListIterator.java
similarity index 100%
rename from java/src/common/collect/UnmodifiableListIterator.java
rename to common/src/common/collect/UnmodifiableListIterator.java
diff --git a/java/src/common/color/Colorizer.java b/common/src/common/color/Colorizer.java
similarity index 100%
rename from java/src/common/color/Colorizer.java
rename to common/src/common/color/Colorizer.java
diff --git a/java/src/common/color/DyeColor.java b/common/src/common/color/DyeColor.java
similarity index 100%
rename from java/src/common/color/DyeColor.java
rename to common/src/common/color/DyeColor.java
diff --git a/java/src/common/color/TextColor.java b/common/src/common/color/TextColor.java
similarity index 100%
rename from java/src/common/color/TextColor.java
rename to common/src/common/color/TextColor.java
diff --git a/java/src/common/dimension/Area.java b/common/src/common/dimension/Area.java
similarity index 100%
rename from java/src/common/dimension/Area.java
rename to common/src/common/dimension/Area.java
diff --git a/java/src/common/dimension/DimType.java b/common/src/common/dimension/DimType.java
similarity index 100%
rename from java/src/common/dimension/DimType.java
rename to common/src/common/dimension/DimType.java
diff --git a/java/src/common/dimension/Dimension.java b/common/src/common/dimension/Dimension.java
similarity index 100%
rename from java/src/common/dimension/Dimension.java
rename to common/src/common/dimension/Dimension.java
diff --git a/java/src/common/dimension/Domain.java b/common/src/common/dimension/Domain.java
similarity index 100%
rename from java/src/common/dimension/Domain.java
rename to common/src/common/dimension/Domain.java
diff --git a/java/src/common/dimension/Galaxy.java b/common/src/common/dimension/Galaxy.java
similarity index 100%
rename from java/src/common/dimension/Galaxy.java
rename to common/src/common/dimension/Galaxy.java
diff --git a/java/src/common/dimension/Moon.java b/common/src/common/dimension/Moon.java
similarity index 100%
rename from java/src/common/dimension/Moon.java
rename to common/src/common/dimension/Moon.java
diff --git a/java/src/common/dimension/Nameable.java b/common/src/common/dimension/Nameable.java
similarity index 100%
rename from java/src/common/dimension/Nameable.java
rename to common/src/common/dimension/Nameable.java
diff --git a/java/src/common/dimension/Planet.java b/common/src/common/dimension/Planet.java
similarity index 100%
rename from java/src/common/dimension/Planet.java
rename to common/src/common/dimension/Planet.java
diff --git a/java/src/common/dimension/Sector.java b/common/src/common/dimension/Sector.java
similarity index 100%
rename from java/src/common/dimension/Sector.java
rename to common/src/common/dimension/Sector.java
diff --git a/java/src/common/dimension/Semi.java b/common/src/common/dimension/Semi.java
similarity index 100%
rename from java/src/common/dimension/Semi.java
rename to common/src/common/dimension/Semi.java
diff --git a/java/src/common/dimension/Space.java b/common/src/common/dimension/Space.java
similarity index 100%
rename from java/src/common/dimension/Space.java
rename to common/src/common/dimension/Space.java
diff --git a/java/src/common/dimension/Star.java b/common/src/common/dimension/Star.java
similarity index 100%
rename from java/src/common/dimension/Star.java
rename to common/src/common/dimension/Star.java
diff --git a/java/src/common/dispenser/BehaviorDefaultDispenseItem.java b/common/src/common/dispenser/BehaviorDefaultDispenseItem.java
similarity index 100%
rename from java/src/common/dispenser/BehaviorDefaultDispenseItem.java
rename to common/src/common/dispenser/BehaviorDefaultDispenseItem.java
diff --git a/java/src/common/dispenser/BehaviorProjectileDispense.java b/common/src/common/dispenser/BehaviorProjectileDispense.java
similarity index 100%
rename from java/src/common/dispenser/BehaviorProjectileDispense.java
rename to common/src/common/dispenser/BehaviorProjectileDispense.java
diff --git a/java/src/common/dispenser/IBehaviorDispenseItem.java b/common/src/common/dispenser/IBehaviorDispenseItem.java
similarity index 100%
rename from java/src/common/dispenser/IBehaviorDispenseItem.java
rename to common/src/common/dispenser/IBehaviorDispenseItem.java
diff --git a/java/src/common/dispenser/IBlockSource.java b/common/src/common/dispenser/IBlockSource.java
similarity index 100%
rename from java/src/common/dispenser/IBlockSource.java
rename to common/src/common/dispenser/IBlockSource.java
diff --git a/java/src/common/dispenser/ILocatableSource.java b/common/src/common/dispenser/ILocatableSource.java
similarity index 100%
rename from java/src/common/dispenser/ILocatableSource.java
rename to common/src/common/dispenser/ILocatableSource.java
diff --git a/java/src/common/dispenser/ILocation.java b/common/src/common/dispenser/ILocation.java
similarity index 100%
rename from java/src/common/dispenser/ILocation.java
rename to common/src/common/dispenser/ILocation.java
diff --git a/java/src/common/dispenser/IPosition.java b/common/src/common/dispenser/IPosition.java
similarity index 100%
rename from java/src/common/dispenser/IPosition.java
rename to common/src/common/dispenser/IPosition.java
diff --git a/java/src/common/dispenser/PositionImpl.java b/common/src/common/dispenser/PositionImpl.java
similarity index 100%
rename from java/src/common/dispenser/PositionImpl.java
rename to common/src/common/dispenser/PositionImpl.java
diff --git a/java/src/common/enchantment/Enchantment.java b/common/src/common/enchantment/Enchantment.java
similarity index 100%
rename from java/src/common/enchantment/Enchantment.java
rename to common/src/common/enchantment/Enchantment.java
diff --git a/java/src/common/enchantment/EnchantmentArrowDamage.java b/common/src/common/enchantment/EnchantmentArrowDamage.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentArrowDamage.java
rename to common/src/common/enchantment/EnchantmentArrowDamage.java
diff --git a/java/src/common/enchantment/EnchantmentArrowFire.java b/common/src/common/enchantment/EnchantmentArrowFire.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentArrowFire.java
rename to common/src/common/enchantment/EnchantmentArrowFire.java
diff --git a/java/src/common/enchantment/EnchantmentArrowInfinite.java b/common/src/common/enchantment/EnchantmentArrowInfinite.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentArrowInfinite.java
rename to common/src/common/enchantment/EnchantmentArrowInfinite.java
diff --git a/java/src/common/enchantment/EnchantmentArrowKnockback.java b/common/src/common/enchantment/EnchantmentArrowKnockback.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentArrowKnockback.java
rename to common/src/common/enchantment/EnchantmentArrowKnockback.java
diff --git a/java/src/common/enchantment/EnchantmentDamage.java b/common/src/common/enchantment/EnchantmentDamage.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentDamage.java
rename to common/src/common/enchantment/EnchantmentDamage.java
diff --git a/java/src/common/enchantment/EnchantmentDigging.java b/common/src/common/enchantment/EnchantmentDigging.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentDigging.java
rename to common/src/common/enchantment/EnchantmentDigging.java
diff --git a/java/src/common/enchantment/EnchantmentDraining.java b/common/src/common/enchantment/EnchantmentDraining.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentDraining.java
rename to common/src/common/enchantment/EnchantmentDraining.java
diff --git a/java/src/common/enchantment/EnchantmentDurability.java b/common/src/common/enchantment/EnchantmentDurability.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentDurability.java
rename to common/src/common/enchantment/EnchantmentDurability.java
diff --git a/java/src/common/enchantment/EnchantmentFireAspect.java b/common/src/common/enchantment/EnchantmentFireAspect.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentFireAspect.java
rename to common/src/common/enchantment/EnchantmentFireAspect.java
diff --git a/java/src/common/enchantment/EnchantmentFishingSpeed.java b/common/src/common/enchantment/EnchantmentFishingSpeed.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentFishingSpeed.java
rename to common/src/common/enchantment/EnchantmentFishingSpeed.java
diff --git a/java/src/common/enchantment/EnchantmentHelper.java b/common/src/common/enchantment/EnchantmentHelper.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentHelper.java
rename to common/src/common/enchantment/EnchantmentHelper.java
diff --git a/java/src/common/enchantment/EnchantmentKnockback.java b/common/src/common/enchantment/EnchantmentKnockback.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentKnockback.java
rename to common/src/common/enchantment/EnchantmentKnockback.java
diff --git a/java/src/common/enchantment/EnchantmentLootBonus.java b/common/src/common/enchantment/EnchantmentLootBonus.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentLootBonus.java
rename to common/src/common/enchantment/EnchantmentLootBonus.java
diff --git a/java/src/common/enchantment/EnchantmentProtection.java b/common/src/common/enchantment/EnchantmentProtection.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentProtection.java
rename to common/src/common/enchantment/EnchantmentProtection.java
diff --git a/java/src/common/enchantment/EnchantmentThorns.java b/common/src/common/enchantment/EnchantmentThorns.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentThorns.java
rename to common/src/common/enchantment/EnchantmentThorns.java
diff --git a/java/src/common/enchantment/EnchantmentUntouching.java b/common/src/common/enchantment/EnchantmentUntouching.java
similarity index 100%
rename from java/src/common/enchantment/EnchantmentUntouching.java
rename to common/src/common/enchantment/EnchantmentUntouching.java
diff --git a/java/src/common/enchantment/EnumEnchantmentType.java b/common/src/common/enchantment/EnumEnchantmentType.java
similarity index 100%
rename from java/src/common/enchantment/EnumEnchantmentType.java
rename to common/src/common/enchantment/EnumEnchantmentType.java
diff --git a/java/src/common/enchantment/RngEnchantment.java b/common/src/common/enchantment/RngEnchantment.java
similarity index 100%
rename from java/src/common/enchantment/RngEnchantment.java
rename to common/src/common/enchantment/RngEnchantment.java
diff --git a/java/src/common/entity/DamageSource.java b/common/src/common/entity/DamageSource.java
similarity index 100%
rename from java/src/common/entity/DamageSource.java
rename to common/src/common/entity/DamageSource.java
diff --git a/java/src/common/entity/DataWatcher.java b/common/src/common/entity/DataWatcher.java
similarity index 100%
rename from java/src/common/entity/DataWatcher.java
rename to common/src/common/entity/DataWatcher.java
diff --git a/java/src/common/entity/Entity.java b/common/src/common/entity/Entity.java
similarity index 100%
rename from java/src/common/entity/Entity.java
rename to common/src/common/entity/Entity.java
diff --git a/java/src/common/entity/EntityDamageSource.java b/common/src/common/entity/EntityDamageSource.java
similarity index 100%
rename from java/src/common/entity/EntityDamageSource.java
rename to common/src/common/entity/EntityDamageSource.java
diff --git a/java/src/common/entity/EntityDamageSourceIndirect.java b/common/src/common/entity/EntityDamageSourceIndirect.java
similarity index 100%
rename from java/src/common/entity/EntityDamageSourceIndirect.java
rename to common/src/common/entity/EntityDamageSourceIndirect.java
diff --git a/java/src/common/entity/EntityTrackerEntry.java b/common/src/common/entity/EntityTrackerEntry.java
similarity index 100%
rename from java/src/common/entity/EntityTrackerEntry.java
rename to common/src/common/entity/EntityTrackerEntry.java
diff --git a/java/src/common/entity/EntityType.java b/common/src/common/entity/EntityType.java
similarity index 100%
rename from java/src/common/entity/EntityType.java
rename to common/src/common/entity/EntityType.java
diff --git a/java/src/common/entity/animal/EntityBat.java b/common/src/common/entity/animal/EntityBat.java
similarity index 100%
rename from java/src/common/entity/animal/EntityBat.java
rename to common/src/common/entity/animal/EntityBat.java
diff --git a/java/src/common/entity/animal/EntityChicken.java b/common/src/common/entity/animal/EntityChicken.java
similarity index 100%
rename from java/src/common/entity/animal/EntityChicken.java
rename to common/src/common/entity/animal/EntityChicken.java
diff --git a/java/src/common/entity/animal/EntityCow.java b/common/src/common/entity/animal/EntityCow.java
similarity index 100%
rename from java/src/common/entity/animal/EntityCow.java
rename to common/src/common/entity/animal/EntityCow.java
diff --git a/java/src/common/entity/animal/EntityDragon.java b/common/src/common/entity/animal/EntityDragon.java
similarity index 100%
rename from java/src/common/entity/animal/EntityDragon.java
rename to common/src/common/entity/animal/EntityDragon.java
diff --git a/java/src/common/entity/animal/EntityDragonPart.java b/common/src/common/entity/animal/EntityDragonPart.java
similarity index 100%
rename from java/src/common/entity/animal/EntityDragonPart.java
rename to common/src/common/entity/animal/EntityDragonPart.java
diff --git a/java/src/common/entity/animal/EntityHorse.java b/common/src/common/entity/animal/EntityHorse.java
similarity index 100%
rename from java/src/common/entity/animal/EntityHorse.java
rename to common/src/common/entity/animal/EntityHorse.java
diff --git a/java/src/common/entity/animal/EntityMooshroom.java b/common/src/common/entity/animal/EntityMooshroom.java
similarity index 100%
rename from java/src/common/entity/animal/EntityMooshroom.java
rename to common/src/common/entity/animal/EntityMooshroom.java
diff --git a/java/src/common/entity/animal/EntityMouse.java b/common/src/common/entity/animal/EntityMouse.java
similarity index 100%
rename from java/src/common/entity/animal/EntityMouse.java
rename to common/src/common/entity/animal/EntityMouse.java
diff --git a/java/src/common/entity/animal/EntityOcelot.java b/common/src/common/entity/animal/EntityOcelot.java
similarity index 100%
rename from java/src/common/entity/animal/EntityOcelot.java
rename to common/src/common/entity/animal/EntityOcelot.java
diff --git a/java/src/common/entity/animal/EntityPig.java b/common/src/common/entity/animal/EntityPig.java
similarity index 100%
rename from java/src/common/entity/animal/EntityPig.java
rename to common/src/common/entity/animal/EntityPig.java
diff --git a/java/src/common/entity/animal/EntityRabbit.java b/common/src/common/entity/animal/EntityRabbit.java
similarity index 100%
rename from java/src/common/entity/animal/EntityRabbit.java
rename to common/src/common/entity/animal/EntityRabbit.java
diff --git a/java/src/common/entity/animal/EntitySheep.java b/common/src/common/entity/animal/EntitySheep.java
similarity index 100%
rename from java/src/common/entity/animal/EntitySheep.java
rename to common/src/common/entity/animal/EntitySheep.java
diff --git a/java/src/common/entity/animal/EntitySquid.java b/common/src/common/entity/animal/EntitySquid.java
similarity index 100%
rename from java/src/common/entity/animal/EntitySquid.java
rename to common/src/common/entity/animal/EntitySquid.java
diff --git a/java/src/common/entity/animal/EntityWolf.java b/common/src/common/entity/animal/EntityWolf.java
similarity index 100%
rename from java/src/common/entity/animal/EntityWolf.java
rename to common/src/common/entity/animal/EntityWolf.java
diff --git a/java/src/common/entity/attributes/Attribute.java b/common/src/common/entity/attributes/Attribute.java
similarity index 100%
rename from java/src/common/entity/attributes/Attribute.java
rename to common/src/common/entity/attributes/Attribute.java
diff --git a/java/src/common/entity/attributes/AttributeInstance.java b/common/src/common/entity/attributes/AttributeInstance.java
similarity index 100%
rename from java/src/common/entity/attributes/AttributeInstance.java
rename to common/src/common/entity/attributes/AttributeInstance.java
diff --git a/java/src/common/entity/attributes/AttributeMap.java b/common/src/common/entity/attributes/AttributeMap.java
similarity index 100%
rename from java/src/common/entity/attributes/AttributeMap.java
rename to common/src/common/entity/attributes/AttributeMap.java
diff --git a/java/src/common/entity/attributes/AttributeModifier.java b/common/src/common/entity/attributes/AttributeModifier.java
similarity index 100%
rename from java/src/common/entity/attributes/AttributeModifier.java
rename to common/src/common/entity/attributes/AttributeModifier.java
diff --git a/java/src/common/entity/attributes/Attributes.java b/common/src/common/entity/attributes/Attributes.java
similarity index 100%
rename from java/src/common/entity/attributes/Attributes.java
rename to common/src/common/entity/attributes/Attributes.java
diff --git a/java/src/common/entity/attributes/LowerStringMap.java b/common/src/common/entity/attributes/LowerStringMap.java
similarity index 100%
rename from java/src/common/entity/attributes/LowerStringMap.java
rename to common/src/common/entity/attributes/LowerStringMap.java
diff --git a/java/src/common/entity/effect/EntityLightning.java b/common/src/common/entity/effect/EntityLightning.java
similarity index 100%
rename from java/src/common/entity/effect/EntityLightning.java
rename to common/src/common/entity/effect/EntityLightning.java
diff --git a/java/src/common/entity/item/EntityBoat.java b/common/src/common/entity/item/EntityBoat.java
similarity index 100%
rename from java/src/common/entity/item/EntityBoat.java
rename to common/src/common/entity/item/EntityBoat.java
diff --git a/java/src/common/entity/item/EntityCart.java b/common/src/common/entity/item/EntityCart.java
similarity index 100%
rename from java/src/common/entity/item/EntityCart.java
rename to common/src/common/entity/item/EntityCart.java
diff --git a/java/src/common/entity/item/EntityCartContainer.java b/common/src/common/entity/item/EntityCartContainer.java
similarity index 100%
rename from java/src/common/entity/item/EntityCartContainer.java
rename to common/src/common/entity/item/EntityCartContainer.java
diff --git a/java/src/common/entity/item/EntityChestCart.java b/common/src/common/entity/item/EntityChestCart.java
similarity index 100%
rename from java/src/common/entity/item/EntityChestCart.java
rename to common/src/common/entity/item/EntityChestCart.java
diff --git a/java/src/common/entity/item/EntityCrystal.java b/common/src/common/entity/item/EntityCrystal.java
similarity index 100%
rename from java/src/common/entity/item/EntityCrystal.java
rename to common/src/common/entity/item/EntityCrystal.java
diff --git a/java/src/common/entity/item/EntityExplosion.java b/common/src/common/entity/item/EntityExplosion.java
similarity index 100%
rename from java/src/common/entity/item/EntityExplosion.java
rename to common/src/common/entity/item/EntityExplosion.java
diff --git a/java/src/common/entity/item/EntityFalling.java b/common/src/common/entity/item/EntityFalling.java
similarity index 100%
rename from java/src/common/entity/item/EntityFalling.java
rename to common/src/common/entity/item/EntityFalling.java
diff --git a/java/src/common/entity/item/EntityFireworks.java b/common/src/common/entity/item/EntityFireworks.java
similarity index 100%
rename from java/src/common/entity/item/EntityFireworks.java
rename to common/src/common/entity/item/EntityFireworks.java
diff --git a/java/src/common/entity/item/EntityHopperCart.java b/common/src/common/entity/item/EntityHopperCart.java
similarity index 100%
rename from java/src/common/entity/item/EntityHopperCart.java
rename to common/src/common/entity/item/EntityHopperCart.java
diff --git a/java/src/common/entity/item/EntityItem.java b/common/src/common/entity/item/EntityItem.java
similarity index 100%
rename from java/src/common/entity/item/EntityItem.java
rename to common/src/common/entity/item/EntityItem.java
diff --git a/java/src/common/entity/item/EntityLeashKnot.java b/common/src/common/entity/item/EntityLeashKnot.java
similarity index 100%
rename from java/src/common/entity/item/EntityLeashKnot.java
rename to common/src/common/entity/item/EntityLeashKnot.java
diff --git a/java/src/common/entity/item/EntityMinecart.java b/common/src/common/entity/item/EntityMinecart.java
similarity index 100%
rename from java/src/common/entity/item/EntityMinecart.java
rename to common/src/common/entity/item/EntityMinecart.java
diff --git a/java/src/common/entity/item/EntityNuke.java b/common/src/common/entity/item/EntityNuke.java
similarity index 100%
rename from java/src/common/entity/item/EntityNuke.java
rename to common/src/common/entity/item/EntityNuke.java
diff --git a/java/src/common/entity/item/EntityOrb.java b/common/src/common/entity/item/EntityOrb.java
similarity index 100%
rename from java/src/common/entity/item/EntityOrb.java
rename to common/src/common/entity/item/EntityOrb.java
diff --git a/java/src/common/entity/item/EntityTnt.java b/common/src/common/entity/item/EntityTnt.java
similarity index 100%
rename from java/src/common/entity/item/EntityTnt.java
rename to common/src/common/entity/item/EntityTnt.java
diff --git a/java/src/common/entity/item/EntityTntCart.java b/common/src/common/entity/item/EntityTntCart.java
similarity index 100%
rename from java/src/common/entity/item/EntityTntCart.java
rename to common/src/common/entity/item/EntityTntCart.java
diff --git a/java/src/common/entity/item/EntityXp.java b/common/src/common/entity/item/EntityXp.java
similarity index 100%
rename from java/src/common/entity/item/EntityXp.java
rename to common/src/common/entity/item/EntityXp.java
diff --git a/java/src/common/entity/item/EntityXpBottle.java b/common/src/common/entity/item/EntityXpBottle.java
similarity index 100%
rename from java/src/common/entity/item/EntityXpBottle.java
rename to common/src/common/entity/item/EntityXpBottle.java
diff --git a/java/src/common/entity/npc/Alignment.java b/common/src/common/entity/npc/Alignment.java
similarity index 100%
rename from java/src/common/entity/npc/Alignment.java
rename to common/src/common/entity/npc/Alignment.java
diff --git a/java/src/common/entity/npc/CharacterInfo.java b/common/src/common/entity/npc/CharacterInfo.java
similarity index 100%
rename from java/src/common/entity/npc/CharacterInfo.java
rename to common/src/common/entity/npc/CharacterInfo.java
diff --git a/java/src/common/entity/npc/ClassInfo.java b/common/src/common/entity/npc/ClassInfo.java
similarity index 100%
rename from java/src/common/entity/npc/ClassInfo.java
rename to common/src/common/entity/npc/ClassInfo.java
diff --git a/java/src/common/entity/npc/Energy.java b/common/src/common/entity/npc/Energy.java
similarity index 100%
rename from java/src/common/entity/npc/Energy.java
rename to common/src/common/entity/npc/Energy.java
diff --git a/java/src/common/entity/npc/EntityArachnoid.java b/common/src/common/entity/npc/EntityArachnoid.java
similarity index 100%
rename from java/src/common/entity/npc/EntityArachnoid.java
rename to common/src/common/entity/npc/EntityArachnoid.java
diff --git a/java/src/common/entity/npc/EntityBloodElf.java b/common/src/common/entity/npc/EntityBloodElf.java
similarity index 100%
rename from java/src/common/entity/npc/EntityBloodElf.java
rename to common/src/common/entity/npc/EntityBloodElf.java
diff --git a/java/src/common/entity/npc/EntityChaosMarine.java b/common/src/common/entity/npc/EntityChaosMarine.java
similarity index 100%
rename from java/src/common/entity/npc/EntityChaosMarine.java
rename to common/src/common/entity/npc/EntityChaosMarine.java
diff --git a/java/src/common/entity/npc/EntityCpu.java b/common/src/common/entity/npc/EntityCpu.java
similarity index 100%
rename from java/src/common/entity/npc/EntityCpu.java
rename to common/src/common/entity/npc/EntityCpu.java
diff --git a/java/src/common/entity/npc/EntityCultivator.java b/common/src/common/entity/npc/EntityCultivator.java
similarity index 100%
rename from java/src/common/entity/npc/EntityCultivator.java
rename to common/src/common/entity/npc/EntityCultivator.java
diff --git a/java/src/common/entity/npc/EntityDarkMage.java b/common/src/common/entity/npc/EntityDarkMage.java
similarity index 100%
rename from java/src/common/entity/npc/EntityDarkMage.java
rename to common/src/common/entity/npc/EntityDarkMage.java
diff --git a/java/src/common/entity/npc/EntityDwarf.java b/common/src/common/entity/npc/EntityDwarf.java
similarity index 100%
rename from java/src/common/entity/npc/EntityDwarf.java
rename to common/src/common/entity/npc/EntityDwarf.java
diff --git a/java/src/common/entity/npc/EntityElf.java b/common/src/common/entity/npc/EntityElf.java
similarity index 100%
rename from java/src/common/entity/npc/EntityElf.java
rename to common/src/common/entity/npc/EntityElf.java
diff --git a/java/src/common/entity/npc/EntityFireDemon.java b/common/src/common/entity/npc/EntityFireDemon.java
similarity index 100%
rename from java/src/common/entity/npc/EntityFireDemon.java
rename to common/src/common/entity/npc/EntityFireDemon.java
diff --git a/java/src/common/entity/npc/EntityFlyingNPC.java b/common/src/common/entity/npc/EntityFlyingNPC.java
similarity index 100%
rename from java/src/common/entity/npc/EntityFlyingNPC.java
rename to common/src/common/entity/npc/EntityFlyingNPC.java
diff --git a/java/src/common/entity/npc/EntityGargoyle.java b/common/src/common/entity/npc/EntityGargoyle.java
similarity index 100%
rename from java/src/common/entity/npc/EntityGargoyle.java
rename to common/src/common/entity/npc/EntityGargoyle.java
diff --git a/java/src/common/entity/npc/EntityGoblin.java b/common/src/common/entity/npc/EntityGoblin.java
similarity index 100%
rename from java/src/common/entity/npc/EntityGoblin.java
rename to common/src/common/entity/npc/EntityGoblin.java
diff --git a/java/src/common/entity/npc/EntityHaunter.java b/common/src/common/entity/npc/EntityHaunter.java
similarity index 100%
rename from java/src/common/entity/npc/EntityHaunter.java
rename to common/src/common/entity/npc/EntityHaunter.java
diff --git a/java/src/common/entity/npc/EntityHoveringNPC.java b/common/src/common/entity/npc/EntityHoveringNPC.java
similarity index 100%
rename from java/src/common/entity/npc/EntityHoveringNPC.java
rename to common/src/common/entity/npc/EntityHoveringNPC.java
diff --git a/java/src/common/entity/npc/EntityHuman.java b/common/src/common/entity/npc/EntityHuman.java
similarity index 100%
rename from java/src/common/entity/npc/EntityHuman.java
rename to common/src/common/entity/npc/EntityHuman.java
diff --git a/java/src/common/entity/npc/EntityMage.java b/common/src/common/entity/npc/EntityMage.java
similarity index 100%
rename from java/src/common/entity/npc/EntityMage.java
rename to common/src/common/entity/npc/EntityMage.java
diff --git a/java/src/common/entity/npc/EntityMagma.java b/common/src/common/entity/npc/EntityMagma.java
similarity index 100%
rename from java/src/common/entity/npc/EntityMagma.java
rename to common/src/common/entity/npc/EntityMagma.java
diff --git a/java/src/common/entity/npc/EntityMetalhead.java b/common/src/common/entity/npc/EntityMetalhead.java
similarity index 100%
rename from java/src/common/entity/npc/EntityMetalhead.java
rename to common/src/common/entity/npc/EntityMetalhead.java
diff --git a/java/src/common/entity/npc/EntityMobNPC.java b/common/src/common/entity/npc/EntityMobNPC.java
similarity index 100%
rename from java/src/common/entity/npc/EntityMobNPC.java
rename to common/src/common/entity/npc/EntityMobNPC.java
diff --git a/java/src/common/entity/npc/EntityNPC.java b/common/src/common/entity/npc/EntityNPC.java
similarity index 100%
rename from java/src/common/entity/npc/EntityNPC.java
rename to common/src/common/entity/npc/EntityNPC.java
diff --git a/java/src/common/entity/npc/EntityOrc.java b/common/src/common/entity/npc/EntityOrc.java
similarity index 100%
rename from java/src/common/entity/npc/EntityOrc.java
rename to common/src/common/entity/npc/EntityOrc.java
diff --git a/java/src/common/entity/npc/EntityPrimarch.java b/common/src/common/entity/npc/EntityPrimarch.java
similarity index 100%
rename from java/src/common/entity/npc/EntityPrimarch.java
rename to common/src/common/entity/npc/EntityPrimarch.java
diff --git a/java/src/common/entity/npc/EntitySlime.java b/common/src/common/entity/npc/EntitySlime.java
similarity index 100%
rename from java/src/common/entity/npc/EntitySlime.java
rename to common/src/common/entity/npc/EntitySlime.java
diff --git a/java/src/common/entity/npc/EntitySpaceMarine.java b/common/src/common/entity/npc/EntitySpaceMarine.java
similarity index 100%
rename from java/src/common/entity/npc/EntitySpaceMarine.java
rename to common/src/common/entity/npc/EntitySpaceMarine.java
diff --git a/java/src/common/entity/npc/EntitySpirit.java b/common/src/common/entity/npc/EntitySpirit.java
similarity index 100%
rename from java/src/common/entity/npc/EntitySpirit.java
rename to common/src/common/entity/npc/EntitySpirit.java
diff --git a/java/src/common/entity/npc/EntityTiefling.java b/common/src/common/entity/npc/EntityTiefling.java
similarity index 100%
rename from java/src/common/entity/npc/EntityTiefling.java
rename to common/src/common/entity/npc/EntityTiefling.java
diff --git a/java/src/common/entity/npc/EntityUndead.java b/common/src/common/entity/npc/EntityUndead.java
similarity index 100%
rename from java/src/common/entity/npc/EntityUndead.java
rename to common/src/common/entity/npc/EntityUndead.java
diff --git a/java/src/common/entity/npc/EntityVampire.java b/common/src/common/entity/npc/EntityVampire.java
similarity index 100%
rename from java/src/common/entity/npc/EntityVampire.java
rename to common/src/common/entity/npc/EntityVampire.java
diff --git a/java/src/common/entity/npc/EntityWoodElf.java b/common/src/common/entity/npc/EntityWoodElf.java
similarity index 100%
rename from java/src/common/entity/npc/EntityWoodElf.java
rename to common/src/common/entity/npc/EntityWoodElf.java
diff --git a/java/src/common/entity/npc/EntityZombie.java b/common/src/common/entity/npc/EntityZombie.java
similarity index 100%
rename from java/src/common/entity/npc/EntityZombie.java
rename to common/src/common/entity/npc/EntityZombie.java
diff --git a/java/src/common/entity/npc/NpcInfo.java b/common/src/common/entity/npc/NpcInfo.java
similarity index 100%
rename from java/src/common/entity/npc/NpcInfo.java
rename to common/src/common/entity/npc/NpcInfo.java
diff --git a/java/src/common/entity/npc/PlayerCharacter.java b/common/src/common/entity/npc/PlayerCharacter.java
similarity index 100%
rename from java/src/common/entity/npc/PlayerCharacter.java
rename to common/src/common/entity/npc/PlayerCharacter.java
diff --git a/java/src/common/entity/npc/SpeciesInfo.java b/common/src/common/entity/npc/SpeciesInfo.java
similarity index 100%
rename from java/src/common/entity/npc/SpeciesInfo.java
rename to common/src/common/entity/npc/SpeciesInfo.java
diff --git a/java/src/common/entity/projectile/EntityArrow.java b/common/src/common/entity/projectile/EntityArrow.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityArrow.java
rename to common/src/common/entity/projectile/EntityArrow.java
diff --git a/java/src/common/entity/projectile/EntityBox.java b/common/src/common/entity/projectile/EntityBox.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityBox.java
rename to common/src/common/entity/projectile/EntityBox.java
diff --git a/java/src/common/entity/projectile/EntityBullet.java b/common/src/common/entity/projectile/EntityBullet.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityBullet.java
rename to common/src/common/entity/projectile/EntityBullet.java
diff --git a/java/src/common/entity/projectile/EntityDie.java b/common/src/common/entity/projectile/EntityDie.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityDie.java
rename to common/src/common/entity/projectile/EntityDie.java
diff --git a/java/src/common/entity/projectile/EntityDynamite.java b/common/src/common/entity/projectile/EntityDynamite.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityDynamite.java
rename to common/src/common/entity/projectile/EntityDynamite.java
diff --git a/java/src/common/entity/projectile/EntityEgg.java b/common/src/common/entity/projectile/EntityEgg.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityEgg.java
rename to common/src/common/entity/projectile/EntityEgg.java
diff --git a/java/src/common/entity/projectile/EntityFireCharge.java b/common/src/common/entity/projectile/EntityFireCharge.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityFireCharge.java
rename to common/src/common/entity/projectile/EntityFireCharge.java
diff --git a/java/src/common/entity/projectile/EntityFireball.java b/common/src/common/entity/projectile/EntityFireball.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityFireball.java
rename to common/src/common/entity/projectile/EntityFireball.java
diff --git a/java/src/common/entity/projectile/EntityHook.java b/common/src/common/entity/projectile/EntityHook.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityHook.java
rename to common/src/common/entity/projectile/EntityHook.java
diff --git a/java/src/common/entity/projectile/EntityPotion.java b/common/src/common/entity/projectile/EntityPotion.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityPotion.java
rename to common/src/common/entity/projectile/EntityPotion.java
diff --git a/java/src/common/entity/projectile/EntityProjectile.java b/common/src/common/entity/projectile/EntityProjectile.java
similarity index 100%
rename from java/src/common/entity/projectile/EntityProjectile.java
rename to common/src/common/entity/projectile/EntityProjectile.java
diff --git a/java/src/common/entity/projectile/EntitySnowball.java b/common/src/common/entity/projectile/EntitySnowball.java
similarity index 100%
rename from java/src/common/entity/projectile/EntitySnowball.java
rename to common/src/common/entity/projectile/EntitySnowball.java
diff --git a/java/src/common/entity/projectile/RngFishable.java b/common/src/common/entity/projectile/RngFishable.java
similarity index 100%
rename from java/src/common/entity/projectile/RngFishable.java
rename to common/src/common/entity/projectile/RngFishable.java
diff --git a/java/src/common/entity/types/CombatEntry.java b/common/src/common/entity/types/CombatEntry.java
similarity index 100%
rename from java/src/common/entity/types/CombatEntry.java
rename to common/src/common/entity/types/CombatEntry.java
diff --git a/java/src/common/entity/types/EntityAnimal.java b/common/src/common/entity/types/EntityAnimal.java
similarity index 100%
rename from java/src/common/entity/types/EntityAnimal.java
rename to common/src/common/entity/types/EntityAnimal.java
diff --git a/java/src/common/entity/types/EntityBodyHelper.java b/common/src/common/entity/types/EntityBodyHelper.java
similarity index 100%
rename from java/src/common/entity/types/EntityBodyHelper.java
rename to common/src/common/entity/types/EntityBodyHelper.java
diff --git a/java/src/common/entity/types/EntityLiving.java b/common/src/common/entity/types/EntityLiving.java
similarity index 100%
rename from java/src/common/entity/types/EntityLiving.java
rename to common/src/common/entity/types/EntityLiving.java
diff --git a/java/src/common/entity/types/EntityTameable.java b/common/src/common/entity/types/EntityTameable.java
similarity index 100%
rename from java/src/common/entity/types/EntityTameable.java
rename to common/src/common/entity/types/EntityTameable.java
diff --git a/java/src/common/entity/types/EntityThrowable.java b/common/src/common/entity/types/EntityThrowable.java
similarity index 100%
rename from java/src/common/entity/types/EntityThrowable.java
rename to common/src/common/entity/types/EntityThrowable.java
diff --git a/java/src/common/entity/types/EntityWaterMob.java b/common/src/common/entity/types/EntityWaterMob.java
similarity index 100%
rename from java/src/common/entity/types/EntityWaterMob.java
rename to common/src/common/entity/types/EntityWaterMob.java
diff --git a/java/src/common/entity/types/EntityWeatherEffect.java b/common/src/common/entity/types/EntityWeatherEffect.java
similarity index 100%
rename from java/src/common/entity/types/EntityWeatherEffect.java
rename to common/src/common/entity/types/EntityWeatherEffect.java
diff --git a/java/src/common/entity/types/IEntityFX.java b/common/src/common/entity/types/IEntityFX.java
similarity index 100%
rename from java/src/common/entity/types/IEntityFX.java
rename to common/src/common/entity/types/IEntityFX.java
diff --git a/java/src/common/entity/types/IEntityMultiPart.java b/common/src/common/entity/types/IEntityMultiPart.java
similarity index 100%
rename from java/src/common/entity/types/IEntityMultiPart.java
rename to common/src/common/entity/types/IEntityMultiPart.java
diff --git a/java/src/common/entity/types/IEntityOwnable.java b/common/src/common/entity/types/IEntityOwnable.java
similarity index 100%
rename from java/src/common/entity/types/IEntityOwnable.java
rename to common/src/common/entity/types/IEntityOwnable.java
diff --git a/java/src/common/entity/types/IObjectData.java b/common/src/common/entity/types/IObjectData.java
similarity index 100%
rename from java/src/common/entity/types/IObjectData.java
rename to common/src/common/entity/types/IObjectData.java
diff --git a/java/src/common/entity/types/IProjectile.java b/common/src/common/entity/types/IProjectile.java
similarity index 100%
rename from java/src/common/entity/types/IProjectile.java
rename to common/src/common/entity/types/IProjectile.java
diff --git a/java/src/common/future/AbstractFuture.java b/common/src/common/future/AbstractFuture.java
similarity index 100%
rename from java/src/common/future/AbstractFuture.java
rename to common/src/common/future/AbstractFuture.java
diff --git a/java/src/common/future/ExecutionError.java b/common/src/common/future/ExecutionError.java
similarity index 100%
rename from java/src/common/future/ExecutionError.java
rename to common/src/common/future/ExecutionError.java
diff --git a/java/src/common/future/ExecutionList.java b/common/src/common/future/ExecutionList.java
similarity index 100%
rename from java/src/common/future/ExecutionList.java
rename to common/src/common/future/ExecutionList.java
diff --git a/java/src/common/future/FutureCallback.java b/common/src/common/future/FutureCallback.java
similarity index 100%
rename from java/src/common/future/FutureCallback.java
rename to common/src/common/future/FutureCallback.java
diff --git a/java/src/common/future/Futures.java b/common/src/common/future/Futures.java
similarity index 100%
rename from java/src/common/future/Futures.java
rename to common/src/common/future/Futures.java
diff --git a/java/src/common/future/ListenableFuture.java b/common/src/common/future/ListenableFuture.java
similarity index 100%
rename from java/src/common/future/ListenableFuture.java
rename to common/src/common/future/ListenableFuture.java
diff --git a/java/src/common/future/ListenableFutureTask.java b/common/src/common/future/ListenableFutureTask.java
similarity index 100%
rename from java/src/common/future/ListenableFutureTask.java
rename to common/src/common/future/ListenableFutureTask.java
diff --git a/java/src/common/future/MoreExecutors.java b/common/src/common/future/MoreExecutors.java
similarity index 100%
rename from java/src/common/future/MoreExecutors.java
rename to common/src/common/future/MoreExecutors.java
diff --git a/java/src/common/future/ThreadFactoryBuilder.java b/common/src/common/future/ThreadFactoryBuilder.java
similarity index 100%
rename from java/src/common/future/ThreadFactoryBuilder.java
rename to common/src/common/future/ThreadFactoryBuilder.java
diff --git a/java/src/common/future/UncheckedExecutionException.java b/common/src/common/future/UncheckedExecutionException.java
similarity index 100%
rename from java/src/common/future/UncheckedExecutionException.java
rename to common/src/common/future/UncheckedExecutionException.java
diff --git a/java/src/common/init/BlockRegistry.java b/common/src/common/init/BlockRegistry.java
similarity index 100%
rename from java/src/common/init/BlockRegistry.java
rename to common/src/common/init/BlockRegistry.java
diff --git a/java/src/common/init/Blocks.java b/common/src/common/init/Blocks.java
similarity index 100%
rename from java/src/common/init/Blocks.java
rename to common/src/common/init/Blocks.java
diff --git a/java/src/common/init/Config.java b/common/src/common/init/Config.java
similarity index 100%
rename from java/src/common/init/Config.java
rename to common/src/common/init/Config.java
diff --git a/java/src/common/init/CraftingRegistry.java b/common/src/common/init/CraftingRegistry.java
similarity index 100%
rename from java/src/common/init/CraftingRegistry.java
rename to common/src/common/init/CraftingRegistry.java
diff --git a/java/src/common/init/DecoType.java b/common/src/common/init/DecoType.java
similarity index 100%
rename from java/src/common/init/DecoType.java
rename to common/src/common/init/DecoType.java
diff --git a/java/src/common/init/DispenserRegistry.java b/common/src/common/init/DispenserRegistry.java
similarity index 100%
rename from java/src/common/init/DispenserRegistry.java
rename to common/src/common/init/DispenserRegistry.java
diff --git a/java/src/common/init/EntityEggInfo.java b/common/src/common/init/EntityEggInfo.java
similarity index 100%
rename from java/src/common/init/EntityEggInfo.java
rename to common/src/common/init/EntityEggInfo.java
diff --git a/java/src/common/init/EntityRegistry.java b/common/src/common/init/EntityRegistry.java
similarity index 100%
rename from java/src/common/init/EntityRegistry.java
rename to common/src/common/init/EntityRegistry.java
diff --git a/java/src/common/init/FlammabilityRegistry.java b/common/src/common/init/FlammabilityRegistry.java
similarity index 100%
rename from java/src/common/init/FlammabilityRegistry.java
rename to common/src/common/init/FlammabilityRegistry.java
diff --git a/java/src/common/init/FluidRegistry.java b/common/src/common/init/FluidRegistry.java
similarity index 100%
rename from java/src/common/init/FluidRegistry.java
rename to common/src/common/init/FluidRegistry.java
diff --git a/java/src/common/init/IObjectIntIterable.java b/common/src/common/init/IObjectIntIterable.java
similarity index 100%
rename from java/src/common/init/IObjectIntIterable.java
rename to common/src/common/init/IObjectIntIterable.java
diff --git a/java/src/common/init/IRegistry.java b/common/src/common/init/IRegistry.java
similarity index 100%
rename from java/src/common/init/IRegistry.java
rename to common/src/common/init/IRegistry.java
diff --git a/java/src/common/init/ItemRegistry.java b/common/src/common/init/ItemRegistry.java
similarity index 100%
rename from java/src/common/init/ItemRegistry.java
rename to common/src/common/init/ItemRegistry.java
diff --git a/java/src/common/init/Items.java b/common/src/common/init/Items.java
similarity index 100%
rename from java/src/common/init/Items.java
rename to common/src/common/init/Items.java
diff --git a/java/src/common/init/MetalType.java b/common/src/common/init/MetalType.java
similarity index 100%
rename from java/src/common/init/MetalType.java
rename to common/src/common/init/MetalType.java
diff --git a/java/src/common/init/NameRegistry.java b/common/src/common/init/NameRegistry.java
similarity index 100%
rename from java/src/common/init/NameRegistry.java
rename to common/src/common/init/NameRegistry.java
diff --git a/java/src/common/init/ObjectIntIdentityMap.java b/common/src/common/init/ObjectIntIdentityMap.java
similarity index 100%
rename from java/src/common/init/ObjectIntIdentityMap.java
rename to common/src/common/init/ObjectIntIdentityMap.java
diff --git a/java/src/common/init/OreType.java b/common/src/common/init/OreType.java
similarity index 100%
rename from java/src/common/init/OreType.java
rename to common/src/common/init/OreType.java
diff --git a/java/src/common/init/Registry.java b/common/src/common/init/Registry.java
similarity index 100%
rename from java/src/common/init/Registry.java
rename to common/src/common/init/Registry.java
diff --git a/java/src/common/init/RegistryDefaulted.java b/common/src/common/init/RegistryDefaulted.java
similarity index 100%
rename from java/src/common/init/RegistryDefaulted.java
rename to common/src/common/init/RegistryDefaulted.java
diff --git a/java/src/common/init/RegistryNamespaced.java b/common/src/common/init/RegistryNamespaced.java
similarity index 100%
rename from java/src/common/init/RegistryNamespaced.java
rename to common/src/common/init/RegistryNamespaced.java
diff --git a/java/src/common/init/RegistryNamespacedDefaultedByKey.java b/common/src/common/init/RegistryNamespacedDefaultedByKey.java
similarity index 100%
rename from java/src/common/init/RegistryNamespacedDefaultedByKey.java
rename to common/src/common/init/RegistryNamespacedDefaultedByKey.java
diff --git a/java/src/common/init/RegistrySimple.java b/common/src/common/init/RegistrySimple.java
similarity index 100%
rename from java/src/common/init/RegistrySimple.java
rename to common/src/common/init/RegistrySimple.java
diff --git a/java/src/common/init/ReorderRegistry.java b/common/src/common/init/ReorderRegistry.java
similarity index 100%
rename from java/src/common/init/ReorderRegistry.java
rename to common/src/common/init/ReorderRegistry.java
diff --git a/java/src/common/init/RotationRegistry.java b/common/src/common/init/RotationRegistry.java
similarity index 100%
rename from java/src/common/init/RotationRegistry.java
rename to common/src/common/init/RotationRegistry.java
diff --git a/java/src/common/init/SmeltingRegistry.java b/common/src/common/init/SmeltingRegistry.java
similarity index 100%
rename from java/src/common/init/SmeltingRegistry.java
rename to common/src/common/init/SmeltingRegistry.java
diff --git a/java/src/common/init/SoundEvent.java b/common/src/common/init/SoundEvent.java
similarity index 100%
rename from java/src/common/init/SoundEvent.java
rename to common/src/common/init/SoundEvent.java
diff --git a/java/src/common/init/SpeciesRegistry.java b/common/src/common/init/SpeciesRegistry.java
similarity index 100%
rename from java/src/common/init/SpeciesRegistry.java
rename to common/src/common/init/SpeciesRegistry.java
diff --git a/java/src/common/init/TileRegistry.java b/common/src/common/init/TileRegistry.java
similarity index 100%
rename from java/src/common/init/TileRegistry.java
rename to common/src/common/init/TileRegistry.java
diff --git a/java/src/common/init/ToolMaterial.java b/common/src/common/init/ToolMaterial.java
similarity index 100%
rename from java/src/common/init/ToolMaterial.java
rename to common/src/common/init/ToolMaterial.java
diff --git a/java/src/common/init/ToolType.java b/common/src/common/init/ToolType.java
similarity index 100%
rename from java/src/common/init/ToolType.java
rename to common/src/common/init/ToolType.java
diff --git a/java/src/common/init/TradeRegistry.java b/common/src/common/init/TradeRegistry.java
similarity index 100%
rename from java/src/common/init/TradeRegistry.java
rename to common/src/common/init/TradeRegistry.java
diff --git a/java/src/common/init/UniverseRegistry.java b/common/src/common/init/UniverseRegistry.java
similarity index 100%
rename from java/src/common/init/UniverseRegistry.java
rename to common/src/common/init/UniverseRegistry.java
diff --git a/java/src/common/init/WoodType.java b/common/src/common/init/WoodType.java
similarity index 100%
rename from java/src/common/init/WoodType.java
rename to common/src/common/init/WoodType.java
diff --git a/java/src/common/inventory/AnimalChest.java b/common/src/common/inventory/AnimalChest.java
similarity index 100%
rename from java/src/common/inventory/AnimalChest.java
rename to common/src/common/inventory/AnimalChest.java
diff --git a/java/src/common/inventory/Container.java b/common/src/common/inventory/Container.java
similarity index 100%
rename from java/src/common/inventory/Container.java
rename to common/src/common/inventory/Container.java
diff --git a/java/src/common/inventory/ContainerBrewingStand.java b/common/src/common/inventory/ContainerBrewingStand.java
similarity index 100%
rename from java/src/common/inventory/ContainerBrewingStand.java
rename to common/src/common/inventory/ContainerBrewingStand.java
diff --git a/java/src/common/inventory/ContainerChest.java b/common/src/common/inventory/ContainerChest.java
similarity index 100%
rename from java/src/common/inventory/ContainerChest.java
rename to common/src/common/inventory/ContainerChest.java
diff --git a/java/src/common/inventory/ContainerDispenser.java b/common/src/common/inventory/ContainerDispenser.java
similarity index 100%
rename from java/src/common/inventory/ContainerDispenser.java
rename to common/src/common/inventory/ContainerDispenser.java
diff --git a/java/src/common/inventory/ContainerEnchantment.java b/common/src/common/inventory/ContainerEnchantment.java
similarity index 100%
rename from java/src/common/inventory/ContainerEnchantment.java
rename to common/src/common/inventory/ContainerEnchantment.java
diff --git a/java/src/common/inventory/ContainerFurnace.java b/common/src/common/inventory/ContainerFurnace.java
similarity index 100%
rename from java/src/common/inventory/ContainerFurnace.java
rename to common/src/common/inventory/ContainerFurnace.java
diff --git a/java/src/common/inventory/ContainerHopper.java b/common/src/common/inventory/ContainerHopper.java
similarity index 100%
rename from java/src/common/inventory/ContainerHopper.java
rename to common/src/common/inventory/ContainerHopper.java
diff --git a/java/src/common/inventory/ContainerHorseInventory.java b/common/src/common/inventory/ContainerHorseInventory.java
similarity index 100%
rename from java/src/common/inventory/ContainerHorseInventory.java
rename to common/src/common/inventory/ContainerHorseInventory.java
diff --git a/java/src/common/inventory/ContainerLocalMenu.java b/common/src/common/inventory/ContainerLocalMenu.java
similarity index 100%
rename from java/src/common/inventory/ContainerLocalMenu.java
rename to common/src/common/inventory/ContainerLocalMenu.java
diff --git a/java/src/common/inventory/ContainerMachine.java b/common/src/common/inventory/ContainerMachine.java
similarity index 100%
rename from java/src/common/inventory/ContainerMachine.java
rename to common/src/common/inventory/ContainerMachine.java
diff --git a/java/src/common/inventory/ContainerMerchant.java b/common/src/common/inventory/ContainerMerchant.java
similarity index 100%
rename from java/src/common/inventory/ContainerMerchant.java
rename to common/src/common/inventory/ContainerMerchant.java
diff --git a/java/src/common/inventory/ContainerPlayer.java b/common/src/common/inventory/ContainerPlayer.java
similarity index 100%
rename from java/src/common/inventory/ContainerPlayer.java
rename to common/src/common/inventory/ContainerPlayer.java
diff --git a/java/src/common/inventory/ContainerRepair.java b/common/src/common/inventory/ContainerRepair.java
similarity index 100%
rename from java/src/common/inventory/ContainerRepair.java
rename to common/src/common/inventory/ContainerRepair.java
diff --git a/java/src/common/inventory/ContainerWorkbench.java b/common/src/common/inventory/ContainerWorkbench.java
similarity index 100%
rename from java/src/common/inventory/ContainerWorkbench.java
rename to common/src/common/inventory/ContainerWorkbench.java
diff --git a/java/src/common/inventory/ICrafting.java b/common/src/common/inventory/ICrafting.java
similarity index 100%
rename from java/src/common/inventory/ICrafting.java
rename to common/src/common/inventory/ICrafting.java
diff --git a/java/src/common/inventory/IInvBasic.java b/common/src/common/inventory/IInvBasic.java
similarity index 100%
rename from java/src/common/inventory/IInvBasic.java
rename to common/src/common/inventory/IInvBasic.java
diff --git a/java/src/common/inventory/IInventory.java b/common/src/common/inventory/IInventory.java
similarity index 100%
rename from java/src/common/inventory/IInventory.java
rename to common/src/common/inventory/IInventory.java
diff --git a/java/src/common/inventory/ISidedInventory.java b/common/src/common/inventory/ISidedInventory.java
similarity index 100%
rename from java/src/common/inventory/ISidedInventory.java
rename to common/src/common/inventory/ISidedInventory.java
diff --git a/java/src/common/inventory/InventoryBasic.java b/common/src/common/inventory/InventoryBasic.java
similarity index 100%
rename from java/src/common/inventory/InventoryBasic.java
rename to common/src/common/inventory/InventoryBasic.java
diff --git a/java/src/common/inventory/InventoryCraftResult.java b/common/src/common/inventory/InventoryCraftResult.java
similarity index 100%
rename from java/src/common/inventory/InventoryCraftResult.java
rename to common/src/common/inventory/InventoryCraftResult.java
diff --git a/java/src/common/inventory/InventoryCrafting.java b/common/src/common/inventory/InventoryCrafting.java
similarity index 100%
rename from java/src/common/inventory/InventoryCrafting.java
rename to common/src/common/inventory/InventoryCrafting.java
diff --git a/java/src/common/inventory/InventoryHelper.java b/common/src/common/inventory/InventoryHelper.java
similarity index 100%
rename from java/src/common/inventory/InventoryHelper.java
rename to common/src/common/inventory/InventoryHelper.java
diff --git a/java/src/common/inventory/InventoryLargeChest.java b/common/src/common/inventory/InventoryLargeChest.java
similarity index 100%
rename from java/src/common/inventory/InventoryLargeChest.java
rename to common/src/common/inventory/InventoryLargeChest.java
diff --git a/java/src/common/inventory/InventoryMerchant.java b/common/src/common/inventory/InventoryMerchant.java
similarity index 100%
rename from java/src/common/inventory/InventoryMerchant.java
rename to common/src/common/inventory/InventoryMerchant.java
diff --git a/java/src/common/inventory/InventoryPlayer.java b/common/src/common/inventory/InventoryPlayer.java
similarity index 100%
rename from java/src/common/inventory/InventoryPlayer.java
rename to common/src/common/inventory/InventoryPlayer.java
diff --git a/java/src/common/inventory/InventoryWarpChest.java b/common/src/common/inventory/InventoryWarpChest.java
similarity index 100%
rename from java/src/common/inventory/InventoryWarpChest.java
rename to common/src/common/inventory/InventoryWarpChest.java
diff --git a/java/src/common/inventory/Slot.java b/common/src/common/inventory/Slot.java
similarity index 100%
rename from java/src/common/inventory/Slot.java
rename to common/src/common/inventory/Slot.java
diff --git a/java/src/common/inventory/SlotCrafting.java b/common/src/common/inventory/SlotCrafting.java
similarity index 100%
rename from java/src/common/inventory/SlotCrafting.java
rename to common/src/common/inventory/SlotCrafting.java
diff --git a/java/src/common/inventory/SlotFurnaceFuel.java b/common/src/common/inventory/SlotFurnaceFuel.java
similarity index 100%
rename from java/src/common/inventory/SlotFurnaceFuel.java
rename to common/src/common/inventory/SlotFurnaceFuel.java
diff --git a/java/src/common/inventory/SlotFurnaceOutput.java b/common/src/common/inventory/SlotFurnaceOutput.java
similarity index 100%
rename from java/src/common/inventory/SlotFurnaceOutput.java
rename to common/src/common/inventory/SlotFurnaceOutput.java
diff --git a/java/src/common/inventory/SlotMerchantResult.java b/common/src/common/inventory/SlotMerchantResult.java
similarity index 100%
rename from java/src/common/inventory/SlotMerchantResult.java
rename to common/src/common/inventory/SlotMerchantResult.java
diff --git a/java/src/common/item/CheatTab.java b/common/src/common/item/CheatTab.java
similarity index 100%
rename from java/src/common/item/CheatTab.java
rename to common/src/common/item/CheatTab.java
diff --git a/java/src/common/item/Item.java b/common/src/common/item/Item.java
similarity index 100%
rename from java/src/common/item/Item.java
rename to common/src/common/item/Item.java
diff --git a/java/src/common/item/ItemAction.java b/common/src/common/item/ItemAction.java
similarity index 100%
rename from java/src/common/item/ItemAction.java
rename to common/src/common/item/ItemAction.java
diff --git a/java/src/common/item/ItemAmmo.java b/common/src/common/item/ItemAmmo.java
similarity index 100%
rename from java/src/common/item/ItemAmmo.java
rename to common/src/common/item/ItemAmmo.java
diff --git a/java/src/common/item/ItemAnvilBlock.java b/common/src/common/item/ItemAnvilBlock.java
similarity index 100%
rename from java/src/common/item/ItemAnvilBlock.java
rename to common/src/common/item/ItemAnvilBlock.java
diff --git a/java/src/common/item/ItemAppleGold.java b/common/src/common/item/ItemAppleGold.java
similarity index 100%
rename from java/src/common/item/ItemAppleGold.java
rename to common/src/common/item/ItemAppleGold.java
diff --git a/java/src/common/item/ItemArmor.java b/common/src/common/item/ItemArmor.java
similarity index 100%
rename from java/src/common/item/ItemArmor.java
rename to common/src/common/item/ItemArmor.java
diff --git a/java/src/common/item/ItemAxe.java b/common/src/common/item/ItemAxe.java
similarity index 100%
rename from java/src/common/item/ItemAxe.java
rename to common/src/common/item/ItemAxe.java
diff --git a/java/src/common/item/ItemBanHammer.java b/common/src/common/item/ItemBanHammer.java
similarity index 100%
rename from java/src/common/item/ItemBanHammer.java
rename to common/src/common/item/ItemBanHammer.java
diff --git a/java/src/common/item/ItemBanner.java b/common/src/common/item/ItemBanner.java
similarity index 100%
rename from java/src/common/item/ItemBanner.java
rename to common/src/common/item/ItemBanner.java
diff --git a/java/src/common/item/ItemBed.java b/common/src/common/item/ItemBed.java
similarity index 100%
rename from java/src/common/item/ItemBed.java
rename to common/src/common/item/ItemBed.java
diff --git a/java/src/common/item/ItemBlock.java b/common/src/common/item/ItemBlock.java
similarity index 100%
rename from java/src/common/item/ItemBlock.java
rename to common/src/common/item/ItemBlock.java
diff --git a/java/src/common/item/ItemBoat.java b/common/src/common/item/ItemBoat.java
similarity index 100%
rename from java/src/common/item/ItemBoat.java
rename to common/src/common/item/ItemBoat.java
diff --git a/java/src/common/item/ItemBoltgun.java b/common/src/common/item/ItemBoltgun.java
similarity index 100%
rename from java/src/common/item/ItemBoltgun.java
rename to common/src/common/item/ItemBoltgun.java
diff --git a/java/src/common/item/ItemBook.java b/common/src/common/item/ItemBook.java
similarity index 100%
rename from java/src/common/item/ItemBook.java
rename to common/src/common/item/ItemBook.java
diff --git a/java/src/common/item/ItemBow.java b/common/src/common/item/ItemBow.java
similarity index 100%
rename from java/src/common/item/ItemBow.java
rename to common/src/common/item/ItemBow.java
diff --git a/java/src/common/item/ItemBucket.java b/common/src/common/item/ItemBucket.java
similarity index 100%
rename from java/src/common/item/ItemBucket.java
rename to common/src/common/item/ItemBucket.java
diff --git a/java/src/common/item/ItemBucketMilk.java b/common/src/common/item/ItemBucketMilk.java
similarity index 100%
rename from java/src/common/item/ItemBucketMilk.java
rename to common/src/common/item/ItemBucketMilk.java
diff --git a/java/src/common/item/ItemButton.java b/common/src/common/item/ItemButton.java
similarity index 100%
rename from java/src/common/item/ItemButton.java
rename to common/src/common/item/ItemButton.java
diff --git a/java/src/common/item/ItemCamera.java b/common/src/common/item/ItemCamera.java
similarity index 100%
rename from java/src/common/item/ItemCamera.java
rename to common/src/common/item/ItemCamera.java
diff --git a/java/src/common/item/ItemCarrotOnAStick.java b/common/src/common/item/ItemCarrotOnAStick.java
similarity index 100%
rename from java/src/common/item/ItemCarrotOnAStick.java
rename to common/src/common/item/ItemCarrotOnAStick.java
diff --git a/java/src/common/item/ItemChargedOrb.java b/common/src/common/item/ItemChargedOrb.java
similarity index 100%
rename from java/src/common/item/ItemChargedOrb.java
rename to common/src/common/item/ItemChargedOrb.java
diff --git a/java/src/common/item/ItemChest.java b/common/src/common/item/ItemChest.java
similarity index 100%
rename from java/src/common/item/ItemChest.java
rename to common/src/common/item/ItemChest.java
diff --git a/java/src/common/item/ItemCloth.java b/common/src/common/item/ItemCloth.java
similarity index 100%
rename from java/src/common/item/ItemCloth.java
rename to common/src/common/item/ItemCloth.java
diff --git a/java/src/common/item/ItemCoal.java b/common/src/common/item/ItemCoal.java
similarity index 100%
rename from java/src/common/item/ItemCoal.java
rename to common/src/common/item/ItemCoal.java
diff --git a/java/src/common/item/ItemColored.java b/common/src/common/item/ItemColored.java
similarity index 100%
rename from java/src/common/item/ItemColored.java
rename to common/src/common/item/ItemColored.java
diff --git a/java/src/common/item/ItemControl.java b/common/src/common/item/ItemControl.java
similarity index 100%
rename from java/src/common/item/ItemControl.java
rename to common/src/common/item/ItemControl.java
diff --git a/java/src/common/item/ItemDie.java b/common/src/common/item/ItemDie.java
similarity index 100%
rename from java/src/common/item/ItemDie.java
rename to common/src/common/item/ItemDie.java
diff --git a/java/src/common/item/ItemDispenser.java b/common/src/common/item/ItemDispenser.java
similarity index 100%
rename from java/src/common/item/ItemDispenser.java
rename to common/src/common/item/ItemDispenser.java
diff --git a/java/src/common/item/ItemDoor.java b/common/src/common/item/ItemDoor.java
similarity index 100%
rename from java/src/common/item/ItemDoor.java
rename to common/src/common/item/ItemDoor.java
diff --git a/java/src/common/item/ItemDoublePlant.java b/common/src/common/item/ItemDoublePlant.java
similarity index 100%
rename from java/src/common/item/ItemDoublePlant.java
rename to common/src/common/item/ItemDoublePlant.java
diff --git a/java/src/common/item/ItemDye.java b/common/src/common/item/ItemDye.java
similarity index 100%
rename from java/src/common/item/ItemDye.java
rename to common/src/common/item/ItemDye.java
diff --git a/java/src/common/item/ItemDynamite.java b/common/src/common/item/ItemDynamite.java
similarity index 100%
rename from java/src/common/item/ItemDynamite.java
rename to common/src/common/item/ItemDynamite.java
diff --git a/java/src/common/item/ItemEditWand.java b/common/src/common/item/ItemEditWand.java
similarity index 100%
rename from java/src/common/item/ItemEditWand.java
rename to common/src/common/item/ItemEditWand.java
diff --git a/java/src/common/item/ItemEffect.java b/common/src/common/item/ItemEffect.java
similarity index 100%
rename from java/src/common/item/ItemEffect.java
rename to common/src/common/item/ItemEffect.java
diff --git a/java/src/common/item/ItemEgg.java b/common/src/common/item/ItemEgg.java
similarity index 100%
rename from java/src/common/item/ItemEgg.java
rename to common/src/common/item/ItemEgg.java
diff --git a/java/src/common/item/ItemEnchantedBook.java b/common/src/common/item/ItemEnchantedBook.java
similarity index 100%
rename from java/src/common/item/ItemEnchantedBook.java
rename to common/src/common/item/ItemEnchantedBook.java
diff --git a/java/src/common/item/ItemExpBottle.java b/common/src/common/item/ItemExpBottle.java
similarity index 100%
rename from java/src/common/item/ItemExpBottle.java
rename to common/src/common/item/ItemExpBottle.java
diff --git a/java/src/common/item/ItemExterminator.java b/common/src/common/item/ItemExterminator.java
similarity index 100%
rename from java/src/common/item/ItemExterminator.java
rename to common/src/common/item/ItemExterminator.java
diff --git a/java/src/common/item/ItemFence.java b/common/src/common/item/ItemFence.java
similarity index 100%
rename from java/src/common/item/ItemFence.java
rename to common/src/common/item/ItemFence.java
diff --git a/java/src/common/item/ItemFireball.java b/common/src/common/item/ItemFireball.java
similarity index 100%
rename from java/src/common/item/ItemFireball.java
rename to common/src/common/item/ItemFireball.java
diff --git a/java/src/common/item/ItemFirework.java b/common/src/common/item/ItemFirework.java
similarity index 100%
rename from java/src/common/item/ItemFirework.java
rename to common/src/common/item/ItemFirework.java
diff --git a/java/src/common/item/ItemFireworkCharge.java b/common/src/common/item/ItemFireworkCharge.java
similarity index 100%
rename from java/src/common/item/ItemFireworkCharge.java
rename to common/src/common/item/ItemFireworkCharge.java
diff --git a/java/src/common/item/ItemFishFood.java b/common/src/common/item/ItemFishFood.java
similarity index 100%
rename from java/src/common/item/ItemFishFood.java
rename to common/src/common/item/ItemFishFood.java
diff --git a/java/src/common/item/ItemFishingRod.java b/common/src/common/item/ItemFishingRod.java
similarity index 100%
rename from java/src/common/item/ItemFishingRod.java
rename to common/src/common/item/ItemFishingRod.java
diff --git a/java/src/common/item/ItemFlintAndSteel.java b/common/src/common/item/ItemFlintAndSteel.java
similarity index 100%
rename from java/src/common/item/ItemFlintAndSteel.java
rename to common/src/common/item/ItemFlintAndSteel.java
diff --git a/java/src/common/item/ItemFood.java b/common/src/common/item/ItemFood.java
similarity index 100%
rename from java/src/common/item/ItemFood.java
rename to common/src/common/item/ItemFood.java
diff --git a/java/src/common/item/ItemFragile.java b/common/src/common/item/ItemFragile.java
similarity index 100%
rename from java/src/common/item/ItemFragile.java
rename to common/src/common/item/ItemFragile.java
diff --git a/java/src/common/item/ItemGlassBottle.java b/common/src/common/item/ItemGlassBottle.java
similarity index 100%
rename from java/src/common/item/ItemGlassBottle.java
rename to common/src/common/item/ItemGlassBottle.java
diff --git a/java/src/common/item/ItemGunBase.java b/common/src/common/item/ItemGunBase.java
similarity index 100%
rename from java/src/common/item/ItemGunBase.java
rename to common/src/common/item/ItemGunBase.java
diff --git a/java/src/common/item/ItemHoe.java b/common/src/common/item/ItemHoe.java
similarity index 100%
rename from java/src/common/item/ItemHoe.java
rename to common/src/common/item/ItemHoe.java
diff --git a/java/src/common/item/ItemHorseArmor.java b/common/src/common/item/ItemHorseArmor.java
similarity index 100%
rename from java/src/common/item/ItemHorseArmor.java
rename to common/src/common/item/ItemHorseArmor.java
diff --git a/java/src/common/item/ItemHugeMushroom.java b/common/src/common/item/ItemHugeMushroom.java
similarity index 100%
rename from java/src/common/item/ItemHugeMushroom.java
rename to common/src/common/item/ItemHugeMushroom.java
diff --git a/java/src/common/item/ItemInfoWand.java b/common/src/common/item/ItemInfoWand.java
similarity index 100%
rename from java/src/common/item/ItemInfoWand.java
rename to common/src/common/item/ItemInfoWand.java
diff --git a/java/src/common/item/ItemKey.java b/common/src/common/item/ItemKey.java
similarity index 100%
rename from java/src/common/item/ItemKey.java
rename to common/src/common/item/ItemKey.java
diff --git a/java/src/common/item/ItemLead.java b/common/src/common/item/ItemLead.java
similarity index 100%
rename from java/src/common/item/ItemLead.java
rename to common/src/common/item/ItemLead.java
diff --git a/java/src/common/item/ItemLeaves.java b/common/src/common/item/ItemLeaves.java
similarity index 100%
rename from java/src/common/item/ItemLeaves.java
rename to common/src/common/item/ItemLeaves.java
diff --git a/java/src/common/item/ItemLightning.java b/common/src/common/item/ItemLightning.java
similarity index 100%
rename from java/src/common/item/ItemLightning.java
rename to common/src/common/item/ItemLightning.java
diff --git a/java/src/common/item/ItemLilyPad.java b/common/src/common/item/ItemLilyPad.java
similarity index 100%
rename from java/src/common/item/ItemLilyPad.java
rename to common/src/common/item/ItemLilyPad.java
diff --git a/java/src/common/item/ItemMagnet.java b/common/src/common/item/ItemMagnet.java
similarity index 100%
rename from java/src/common/item/ItemMagnet.java
rename to common/src/common/item/ItemMagnet.java
diff --git a/java/src/common/item/ItemMagnetic.java b/common/src/common/item/ItemMagnetic.java
similarity index 100%
rename from java/src/common/item/ItemMagnetic.java
rename to common/src/common/item/ItemMagnetic.java
diff --git a/java/src/common/item/ItemMetal.java b/common/src/common/item/ItemMetal.java
similarity index 100%
rename from java/src/common/item/ItemMetal.java
rename to common/src/common/item/ItemMetal.java
diff --git a/java/src/common/item/ItemMetalBlock.java b/common/src/common/item/ItemMetalBlock.java
similarity index 100%
rename from java/src/common/item/ItemMetalBlock.java
rename to common/src/common/item/ItemMetalBlock.java
diff --git a/java/src/common/item/ItemMinecart.java b/common/src/common/item/ItemMinecart.java
similarity index 100%
rename from java/src/common/item/ItemMinecart.java
rename to common/src/common/item/ItemMinecart.java
diff --git a/java/src/common/item/ItemMonsterPlacer.java b/common/src/common/item/ItemMonsterPlacer.java
similarity index 100%
rename from java/src/common/item/ItemMonsterPlacer.java
rename to common/src/common/item/ItemMonsterPlacer.java
diff --git a/java/src/common/item/ItemMultiTexture.java b/common/src/common/item/ItemMultiTexture.java
similarity index 100%
rename from java/src/common/item/ItemMultiTexture.java
rename to common/src/common/item/ItemMultiTexture.java
diff --git a/java/src/common/item/ItemNameTag.java b/common/src/common/item/ItemNameTag.java
similarity index 100%
rename from java/src/common/item/ItemNameTag.java
rename to common/src/common/item/ItemNameTag.java
diff --git a/java/src/common/item/ItemNpcSpawner.java b/common/src/common/item/ItemNpcSpawner.java
similarity index 100%
rename from java/src/common/item/ItemNpcSpawner.java
rename to common/src/common/item/ItemNpcSpawner.java
diff --git a/java/src/common/item/ItemNugget.java b/common/src/common/item/ItemNugget.java
similarity index 100%
rename from java/src/common/item/ItemNugget.java
rename to common/src/common/item/ItemNugget.java
diff --git a/java/src/common/item/ItemPickaxe.java b/common/src/common/item/ItemPickaxe.java
similarity index 100%
rename from java/src/common/item/ItemPickaxe.java
rename to common/src/common/item/ItemPickaxe.java
diff --git a/java/src/common/item/ItemPiston.java b/common/src/common/item/ItemPiston.java
similarity index 100%
rename from java/src/common/item/ItemPiston.java
rename to common/src/common/item/ItemPiston.java
diff --git a/java/src/common/item/ItemPotion.java b/common/src/common/item/ItemPotion.java
similarity index 100%
rename from java/src/common/item/ItemPotion.java
rename to common/src/common/item/ItemPotion.java
diff --git a/java/src/common/item/ItemPressurePlate.java b/common/src/common/item/ItemPressurePlate.java
similarity index 100%
rename from java/src/common/item/ItemPressurePlate.java
rename to common/src/common/item/ItemPressurePlate.java
diff --git a/java/src/common/item/ItemRecord.java b/common/src/common/item/ItemRecord.java
similarity index 100%
rename from java/src/common/item/ItemRecord.java
rename to common/src/common/item/ItemRecord.java
diff --git a/java/src/common/item/ItemRedstone.java b/common/src/common/item/ItemRedstone.java
similarity index 100%
rename from java/src/common/item/ItemRedstone.java
rename to common/src/common/item/ItemRedstone.java
diff --git a/java/src/common/item/ItemReed.java b/common/src/common/item/ItemReed.java
similarity index 100%
rename from java/src/common/item/ItemReed.java
rename to common/src/common/item/ItemReed.java
diff --git a/java/src/common/item/ItemRod.java b/common/src/common/item/ItemRod.java
similarity index 100%
rename from java/src/common/item/ItemRod.java
rename to common/src/common/item/ItemRod.java
diff --git a/java/src/common/item/ItemSaddle.java b/common/src/common/item/ItemSaddle.java
similarity index 100%
rename from java/src/common/item/ItemSaddle.java
rename to common/src/common/item/ItemSaddle.java
diff --git a/java/src/common/item/ItemSeedFood.java b/common/src/common/item/ItemSeedFood.java
similarity index 100%
rename from java/src/common/item/ItemSeedFood.java
rename to common/src/common/item/ItemSeedFood.java
diff --git a/java/src/common/item/ItemSeeds.java b/common/src/common/item/ItemSeeds.java
similarity index 100%
rename from java/src/common/item/ItemSeeds.java
rename to common/src/common/item/ItemSeeds.java
diff --git a/java/src/common/item/ItemShears.java b/common/src/common/item/ItemShears.java
similarity index 100%
rename from java/src/common/item/ItemShears.java
rename to common/src/common/item/ItemShears.java
diff --git a/java/src/common/item/ItemSign.java b/common/src/common/item/ItemSign.java
similarity index 100%
rename from java/src/common/item/ItemSign.java
rename to common/src/common/item/ItemSign.java
diff --git a/java/src/common/item/ItemSkull.java b/common/src/common/item/ItemSkull.java
similarity index 100%
rename from java/src/common/item/ItemSkull.java
rename to common/src/common/item/ItemSkull.java
diff --git a/java/src/common/item/ItemSlab.java b/common/src/common/item/ItemSlab.java
similarity index 100%
rename from java/src/common/item/ItemSlab.java
rename to common/src/common/item/ItemSlab.java
diff --git a/java/src/common/item/ItemSmall.java b/common/src/common/item/ItemSmall.java
similarity index 100%
rename from java/src/common/item/ItemSmall.java
rename to common/src/common/item/ItemSmall.java
diff --git a/java/src/common/item/ItemSnow.java b/common/src/common/item/ItemSnow.java
similarity index 100%
rename from java/src/common/item/ItemSnow.java
rename to common/src/common/item/ItemSnow.java
diff --git a/java/src/common/item/ItemSnowball.java b/common/src/common/item/ItemSnowball.java
similarity index 100%
rename from java/src/common/item/ItemSnowball.java
rename to common/src/common/item/ItemSnowball.java
diff --git a/java/src/common/item/ItemSoup.java b/common/src/common/item/ItemSoup.java
similarity index 100%
rename from java/src/common/item/ItemSoup.java
rename to common/src/common/item/ItemSoup.java
diff --git a/java/src/common/item/ItemSpaceNavigator.java b/common/src/common/item/ItemSpaceNavigator.java
similarity index 100%
rename from java/src/common/item/ItemSpaceNavigator.java
rename to common/src/common/item/ItemSpaceNavigator.java
diff --git a/java/src/common/item/ItemSpade.java b/common/src/common/item/ItemSpade.java
similarity index 100%
rename from java/src/common/item/ItemSpade.java
rename to common/src/common/item/ItemSpade.java
diff --git a/java/src/common/item/ItemStack.java b/common/src/common/item/ItemStack.java
similarity index 100%
rename from java/src/common/item/ItemStack.java
rename to common/src/common/item/ItemStack.java
diff --git a/java/src/common/item/ItemStick.java b/common/src/common/item/ItemStick.java
similarity index 100%
rename from java/src/common/item/ItemStick.java
rename to common/src/common/item/ItemStick.java
diff --git a/java/src/common/item/ItemSword.java b/common/src/common/item/ItemSword.java
similarity index 100%
rename from java/src/common/item/ItemSword.java
rename to common/src/common/item/ItemSword.java
diff --git a/java/src/common/item/ItemTNT.java b/common/src/common/item/ItemTNT.java
similarity index 100%
rename from java/src/common/item/ItemTNT.java
rename to common/src/common/item/ItemTNT.java
diff --git a/java/src/common/item/ItemTiny.java b/common/src/common/item/ItemTiny.java
similarity index 100%
rename from java/src/common/item/ItemTiny.java
rename to common/src/common/item/ItemTiny.java
diff --git a/java/src/common/item/ItemTool.java b/common/src/common/item/ItemTool.java
similarity index 100%
rename from java/src/common/item/ItemTool.java
rename to common/src/common/item/ItemTool.java
diff --git a/java/src/common/item/ItemWall.java b/common/src/common/item/ItemWall.java
similarity index 100%
rename from java/src/common/item/ItemWall.java
rename to common/src/common/item/ItemWall.java
diff --git a/java/src/common/item/ItemWand.java b/common/src/common/item/ItemWand.java
similarity index 100%
rename from java/src/common/item/ItemWand.java
rename to common/src/common/item/ItemWand.java
diff --git a/java/src/common/item/ItemWeatherToken.java b/common/src/common/item/ItemWeatherToken.java
similarity index 100%
rename from java/src/common/item/ItemWeatherToken.java
rename to common/src/common/item/ItemWeatherToken.java
diff --git a/java/src/common/item/RngLoot.java b/common/src/common/item/RngLoot.java
similarity index 100%
rename from java/src/common/item/RngLoot.java
rename to common/src/common/item/RngLoot.java
diff --git a/java/src/common/log/Log.java b/common/src/common/log/Log.java
similarity index 100%
rename from java/src/common/log/Log.java
rename to common/src/common/log/Log.java
diff --git a/java/src/common/log/LogLevel.java b/common/src/common/log/LogLevel.java
similarity index 100%
rename from java/src/common/log/LogLevel.java
rename to common/src/common/log/LogLevel.java
diff --git a/java/src/common/log/Message.java b/common/src/common/log/Message.java
similarity index 100%
rename from java/src/common/log/Message.java
rename to common/src/common/log/Message.java
diff --git a/java/src/common/log/NettyLogger.java b/common/src/common/log/NettyLogger.java
similarity index 100%
rename from java/src/common/log/NettyLogger.java
rename to common/src/common/log/NettyLogger.java
diff --git a/java/src/common/material/Material.java b/common/src/common/material/Material.java
similarity index 100%
rename from java/src/common/material/Material.java
rename to common/src/common/material/Material.java
diff --git a/java/src/common/material/MaterialColdFluid.java b/common/src/common/material/MaterialColdFluid.java
similarity index 100%
rename from java/src/common/material/MaterialColdFluid.java
rename to common/src/common/material/MaterialColdFluid.java
diff --git a/java/src/common/material/MaterialHotFluid.java b/common/src/common/material/MaterialHotFluid.java
similarity index 100%
rename from java/src/common/material/MaterialHotFluid.java
rename to common/src/common/material/MaterialHotFluid.java
diff --git a/java/src/common/material/MaterialLogic.java b/common/src/common/material/MaterialLogic.java
similarity index 100%
rename from java/src/common/material/MaterialLogic.java
rename to common/src/common/material/MaterialLogic.java
diff --git a/java/src/common/material/MaterialPortal.java b/common/src/common/material/MaterialPortal.java
similarity index 100%
rename from java/src/common/material/MaterialPortal.java
rename to common/src/common/material/MaterialPortal.java
diff --git a/java/src/common/material/MaterialTransparent.java b/common/src/common/material/MaterialTransparent.java
similarity index 100%
rename from java/src/common/material/MaterialTransparent.java
rename to common/src/common/material/MaterialTransparent.java
diff --git a/java/src/common/model/BlockLayer.java b/common/src/common/model/BlockLayer.java
similarity index 100%
rename from java/src/common/model/BlockLayer.java
rename to common/src/common/model/BlockLayer.java
diff --git a/java/src/common/model/ItemMeshDefinition.java b/common/src/common/model/ItemMeshDefinition.java
similarity index 100%
rename from java/src/common/model/ItemMeshDefinition.java
rename to common/src/common/model/ItemMeshDefinition.java
diff --git a/java/src/common/model/Model.java b/common/src/common/model/Model.java
similarity index 100%
rename from java/src/common/model/Model.java
rename to common/src/common/model/Model.java
diff --git a/java/src/common/model/ModelProvider.java b/common/src/common/model/ModelProvider.java
similarity index 100%
rename from java/src/common/model/ModelProvider.java
rename to common/src/common/model/ModelProvider.java
diff --git a/java/src/common/model/ModelRotation.java b/common/src/common/model/ModelRotation.java
similarity index 100%
rename from java/src/common/model/ModelRotation.java
rename to common/src/common/model/ModelRotation.java
diff --git a/java/src/common/model/ParticleType.java b/common/src/common/model/ParticleType.java
similarity index 100%
rename from java/src/common/model/ParticleType.java
rename to common/src/common/model/ParticleType.java
diff --git a/java/src/common/model/Transform.java b/common/src/common/model/Transform.java
similarity index 100%
rename from java/src/common/model/Transform.java
rename to common/src/common/model/Transform.java
diff --git a/java/src/common/model/Transforms.java b/common/src/common/model/Transforms.java
similarity index 100%
rename from java/src/common/model/Transforms.java
rename to common/src/common/model/Transforms.java
diff --git a/java/src/common/nbt/NBTBase.java b/common/src/common/nbt/NBTBase.java
similarity index 100%
rename from java/src/common/nbt/NBTBase.java
rename to common/src/common/nbt/NBTBase.java
diff --git a/java/src/common/nbt/NBTException.java b/common/src/common/nbt/NBTException.java
similarity index 100%
rename from java/src/common/nbt/NBTException.java
rename to common/src/common/nbt/NBTException.java
diff --git a/java/src/common/nbt/NBTLoader.java b/common/src/common/nbt/NBTLoader.java
similarity index 100%
rename from java/src/common/nbt/NBTLoader.java
rename to common/src/common/nbt/NBTLoader.java
diff --git a/java/src/common/nbt/NBTParser.java b/common/src/common/nbt/NBTParser.java
similarity index 100%
rename from java/src/common/nbt/NBTParser.java
rename to common/src/common/nbt/NBTParser.java
diff --git a/java/src/common/nbt/NBTSizeTracker.java b/common/src/common/nbt/NBTSizeTracker.java
similarity index 100%
rename from java/src/common/nbt/NBTSizeTracker.java
rename to common/src/common/nbt/NBTSizeTracker.java
diff --git a/java/src/common/nbt/NBTTagByte.java b/common/src/common/nbt/NBTTagByte.java
similarity index 100%
rename from java/src/common/nbt/NBTTagByte.java
rename to common/src/common/nbt/NBTTagByte.java
diff --git a/java/src/common/nbt/NBTTagByteArray.java b/common/src/common/nbt/NBTTagByteArray.java
similarity index 100%
rename from java/src/common/nbt/NBTTagByteArray.java
rename to common/src/common/nbt/NBTTagByteArray.java
diff --git a/java/src/common/nbt/NBTTagCompound.java b/common/src/common/nbt/NBTTagCompound.java
similarity index 100%
rename from java/src/common/nbt/NBTTagCompound.java
rename to common/src/common/nbt/NBTTagCompound.java
diff --git a/java/src/common/nbt/NBTTagDouble.java b/common/src/common/nbt/NBTTagDouble.java
similarity index 100%
rename from java/src/common/nbt/NBTTagDouble.java
rename to common/src/common/nbt/NBTTagDouble.java
diff --git a/java/src/common/nbt/NBTTagEnd.java b/common/src/common/nbt/NBTTagEnd.java
similarity index 100%
rename from java/src/common/nbt/NBTTagEnd.java
rename to common/src/common/nbt/NBTTagEnd.java
diff --git a/java/src/common/nbt/NBTTagFloat.java b/common/src/common/nbt/NBTTagFloat.java
similarity index 100%
rename from java/src/common/nbt/NBTTagFloat.java
rename to common/src/common/nbt/NBTTagFloat.java
diff --git a/java/src/common/nbt/NBTTagInt.java b/common/src/common/nbt/NBTTagInt.java
similarity index 100%
rename from java/src/common/nbt/NBTTagInt.java
rename to common/src/common/nbt/NBTTagInt.java
diff --git a/java/src/common/nbt/NBTTagIntArray.java b/common/src/common/nbt/NBTTagIntArray.java
similarity index 100%
rename from java/src/common/nbt/NBTTagIntArray.java
rename to common/src/common/nbt/NBTTagIntArray.java
diff --git a/java/src/common/nbt/NBTTagList.java b/common/src/common/nbt/NBTTagList.java
similarity index 100%
rename from java/src/common/nbt/NBTTagList.java
rename to common/src/common/nbt/NBTTagList.java
diff --git a/java/src/common/nbt/NBTTagLong.java b/common/src/common/nbt/NBTTagLong.java
similarity index 100%
rename from java/src/common/nbt/NBTTagLong.java
rename to common/src/common/nbt/NBTTagLong.java
diff --git a/java/src/common/nbt/NBTTagShort.java b/common/src/common/nbt/NBTTagShort.java
similarity index 100%
rename from java/src/common/nbt/NBTTagShort.java
rename to common/src/common/nbt/NBTTagShort.java
diff --git a/java/src/common/nbt/NBTTagString.java b/common/src/common/nbt/NBTTagString.java
similarity index 100%
rename from java/src/common/nbt/NBTTagString.java
rename to common/src/common/nbt/NBTTagString.java
diff --git a/java/src/common/nbt/NBTUtil.java b/common/src/common/nbt/NBTUtil.java
similarity index 100%
rename from java/src/common/nbt/NBTUtil.java
rename to common/src/common/nbt/NBTUtil.java
diff --git a/java/src/common/network/IClientLoginHandler.java b/common/src/common/network/IClientLoginHandler.java
similarity index 100%
rename from java/src/common/network/IClientLoginHandler.java
rename to common/src/common/network/IClientLoginHandler.java
diff --git a/java/src/common/network/IClientPlayer.java b/common/src/common/network/IClientPlayer.java
similarity index 100%
rename from java/src/common/network/IClientPlayer.java
rename to common/src/common/network/IClientPlayer.java
diff --git a/java/src/common/network/IHandshakeHandler.java b/common/src/common/network/IHandshakeHandler.java
similarity index 100%
rename from java/src/common/network/IHandshakeHandler.java
rename to common/src/common/network/IHandshakeHandler.java
diff --git a/java/src/common/network/ILoginHandler.java b/common/src/common/network/ILoginHandler.java
similarity index 100%
rename from java/src/common/network/ILoginHandler.java
rename to common/src/common/network/ILoginHandler.java
diff --git a/java/src/common/network/IPlayer.java b/common/src/common/network/IPlayer.java
similarity index 100%
rename from java/src/common/network/IPlayer.java
rename to common/src/common/network/IPlayer.java
diff --git a/java/src/common/network/IThreadListener.java b/common/src/common/network/IThreadListener.java
similarity index 100%
rename from java/src/common/network/IThreadListener.java
rename to common/src/common/network/IThreadListener.java
diff --git a/java/src/common/network/NetConnection.java b/common/src/common/network/NetConnection.java
similarity index 100%
rename from java/src/common/network/NetConnection.java
rename to common/src/common/network/NetConnection.java
diff --git a/java/src/common/network/NetHandler.java b/common/src/common/network/NetHandler.java
similarity index 100%
rename from java/src/common/network/NetHandler.java
rename to common/src/common/network/NetHandler.java
diff --git a/java/src/common/network/NettyCompressionDecoder.java b/common/src/common/network/NettyCompressionDecoder.java
similarity index 100%
rename from java/src/common/network/NettyCompressionDecoder.java
rename to common/src/common/network/NettyCompressionDecoder.java
diff --git a/java/src/common/network/NettyCompressionEncoder.java b/common/src/common/network/NettyCompressionEncoder.java
similarity index 100%
rename from java/src/common/network/NettyCompressionEncoder.java
rename to common/src/common/network/NettyCompressionEncoder.java
diff --git a/java/src/common/network/Packet.java b/common/src/common/network/Packet.java
similarity index 100%
rename from java/src/common/network/Packet.java
rename to common/src/common/network/Packet.java
diff --git a/java/src/common/network/PacketBuffer.java b/common/src/common/network/PacketBuffer.java
similarity index 100%
rename from java/src/common/network/PacketBuffer.java
rename to common/src/common/network/PacketBuffer.java
diff --git a/java/src/common/network/PacketDecoder.java b/common/src/common/network/PacketDecoder.java
similarity index 100%
rename from java/src/common/network/PacketDecoder.java
rename to common/src/common/network/PacketDecoder.java
diff --git a/java/src/common/network/PacketEncoder.java b/common/src/common/network/PacketEncoder.java
similarity index 100%
rename from java/src/common/network/PacketEncoder.java
rename to common/src/common/network/PacketEncoder.java
diff --git a/java/src/common/network/PacketPrepender.java b/common/src/common/network/PacketPrepender.java
similarity index 100%
rename from java/src/common/network/PacketPrepender.java
rename to common/src/common/network/PacketPrepender.java
diff --git a/java/src/common/network/PacketRegistry.java b/common/src/common/network/PacketRegistry.java
similarity index 100%
rename from java/src/common/network/PacketRegistry.java
rename to common/src/common/network/PacketRegistry.java
diff --git a/java/src/common/network/PacketSplitter.java b/common/src/common/network/PacketSplitter.java
similarity index 100%
rename from java/src/common/network/PacketSplitter.java
rename to common/src/common/network/PacketSplitter.java
diff --git a/java/src/common/packet/APacketEmpty.java b/common/src/common/packet/APacketEmpty.java
similarity index 100%
rename from java/src/common/packet/APacketEmpty.java
rename to common/src/common/packet/APacketEmpty.java
diff --git a/java/src/common/packet/APacketVarInt.java b/common/src/common/packet/APacketVarInt.java
similarity index 100%
rename from java/src/common/packet/APacketVarInt.java
rename to common/src/common/packet/APacketVarInt.java
diff --git a/java/src/common/packet/CPacketAction.java b/common/src/common/packet/CPacketAction.java
similarity index 100%
rename from java/src/common/packet/CPacketAction.java
rename to common/src/common/packet/CPacketAction.java
diff --git a/java/src/common/packet/CPacketBook.java b/common/src/common/packet/CPacketBook.java
similarity index 100%
rename from java/src/common/packet/CPacketBook.java
rename to common/src/common/packet/CPacketBook.java
diff --git a/java/src/common/packet/CPacketBreak.java b/common/src/common/packet/CPacketBreak.java
similarity index 100%
rename from java/src/common/packet/CPacketBreak.java
rename to common/src/common/packet/CPacketBreak.java
diff --git a/java/src/common/packet/CPacketCheat.java b/common/src/common/packet/CPacketCheat.java
similarity index 100%
rename from java/src/common/packet/CPacketCheat.java
rename to common/src/common/packet/CPacketCheat.java
diff --git a/java/src/common/packet/CPacketClick.java b/common/src/common/packet/CPacketClick.java
similarity index 100%
rename from java/src/common/packet/CPacketClick.java
rename to common/src/common/packet/CPacketClick.java
diff --git a/java/src/common/packet/CPacketComplete.java b/common/src/common/packet/CPacketComplete.java
similarity index 100%
rename from java/src/common/packet/CPacketComplete.java
rename to common/src/common/packet/CPacketComplete.java
diff --git a/java/src/common/packet/CPacketInput.java b/common/src/common/packet/CPacketInput.java
similarity index 100%
rename from java/src/common/packet/CPacketInput.java
rename to common/src/common/packet/CPacketInput.java
diff --git a/java/src/common/packet/CPacketKeepAlive.java b/common/src/common/packet/CPacketKeepAlive.java
similarity index 100%
rename from java/src/common/packet/CPacketKeepAlive.java
rename to common/src/common/packet/CPacketKeepAlive.java
diff --git a/java/src/common/packet/CPacketMessage.java b/common/src/common/packet/CPacketMessage.java
similarity index 100%
rename from java/src/common/packet/CPacketMessage.java
rename to common/src/common/packet/CPacketMessage.java
diff --git a/java/src/common/packet/CPacketPlace.java b/common/src/common/packet/CPacketPlace.java
similarity index 100%
rename from java/src/common/packet/CPacketPlace.java
rename to common/src/common/packet/CPacketPlace.java
diff --git a/java/src/common/packet/CPacketPlayer.java b/common/src/common/packet/CPacketPlayer.java
similarity index 100%
rename from java/src/common/packet/CPacketPlayer.java
rename to common/src/common/packet/CPacketPlayer.java
diff --git a/java/src/common/packet/CPacketSign.java b/common/src/common/packet/CPacketSign.java
similarity index 100%
rename from java/src/common/packet/CPacketSign.java
rename to common/src/common/packet/CPacketSign.java
diff --git a/java/src/common/packet/CPacketSkin.java b/common/src/common/packet/CPacketSkin.java
similarity index 100%
rename from java/src/common/packet/CPacketSkin.java
rename to common/src/common/packet/CPacketSkin.java
diff --git a/java/src/common/packet/HPacketHandshake.java b/common/src/common/packet/HPacketHandshake.java
similarity index 100%
rename from java/src/common/packet/HPacketHandshake.java
rename to common/src/common/packet/HPacketHandshake.java
diff --git a/java/src/common/packet/LPacketPasswordResponse.java b/common/src/common/packet/LPacketPasswordResponse.java
similarity index 100%
rename from java/src/common/packet/LPacketPasswordResponse.java
rename to common/src/common/packet/LPacketPasswordResponse.java
diff --git a/java/src/common/packet/RPacketDisconnect.java b/common/src/common/packet/RPacketDisconnect.java
similarity index 100%
rename from java/src/common/packet/RPacketDisconnect.java
rename to common/src/common/packet/RPacketDisconnect.java
diff --git a/java/src/common/packet/RPacketEnableCompression.java b/common/src/common/packet/RPacketEnableCompression.java
similarity index 100%
rename from java/src/common/packet/RPacketEnableCompression.java
rename to common/src/common/packet/RPacketEnableCompression.java
diff --git a/java/src/common/packet/RPacketLoginSuccess.java b/common/src/common/packet/RPacketLoginSuccess.java
similarity index 100%
rename from java/src/common/packet/RPacketLoginSuccess.java
rename to common/src/common/packet/RPacketLoginSuccess.java
diff --git a/java/src/common/packet/S14PacketEntity.java b/common/src/common/packet/S14PacketEntity.java
similarity index 100%
rename from java/src/common/packet/S14PacketEntity.java
rename to common/src/common/packet/S14PacketEntity.java
diff --git a/java/src/common/packet/S18PacketEntityTeleport.java b/common/src/common/packet/S18PacketEntityTeleport.java
similarity index 100%
rename from java/src/common/packet/S18PacketEntityTeleport.java
rename to common/src/common/packet/S18PacketEntityTeleport.java
diff --git a/java/src/common/packet/S19PacketEntityHeadLook.java b/common/src/common/packet/S19PacketEntityHeadLook.java
similarity index 100%
rename from java/src/common/packet/S19PacketEntityHeadLook.java
rename to common/src/common/packet/S19PacketEntityHeadLook.java
diff --git a/java/src/common/packet/S1APacketEntityStatus.java b/common/src/common/packet/S1APacketEntityStatus.java
similarity index 100%
rename from java/src/common/packet/S1APacketEntityStatus.java
rename to common/src/common/packet/S1APacketEntityStatus.java
diff --git a/java/src/common/packet/S1BPacketEntityAttach.java b/common/src/common/packet/S1BPacketEntityAttach.java
similarity index 100%
rename from java/src/common/packet/S1BPacketEntityAttach.java
rename to common/src/common/packet/S1BPacketEntityAttach.java
diff --git a/java/src/common/packet/S1CPacketEntityMetadata.java b/common/src/common/packet/S1CPacketEntityMetadata.java
similarity index 100%
rename from java/src/common/packet/S1CPacketEntityMetadata.java
rename to common/src/common/packet/S1CPacketEntityMetadata.java
diff --git a/java/src/common/packet/S1DPacketEntityEffect.java b/common/src/common/packet/S1DPacketEntityEffect.java
similarity index 100%
rename from java/src/common/packet/S1DPacketEntityEffect.java
rename to common/src/common/packet/S1DPacketEntityEffect.java
diff --git a/java/src/common/packet/S1EPacketRemoveEntityEffect.java b/common/src/common/packet/S1EPacketRemoveEntityEffect.java
similarity index 100%
rename from java/src/common/packet/S1EPacketRemoveEntityEffect.java
rename to common/src/common/packet/S1EPacketRemoveEntityEffect.java
diff --git a/java/src/common/packet/S20PacketEntityProperties.java b/common/src/common/packet/S20PacketEntityProperties.java
similarity index 100%
rename from java/src/common/packet/S20PacketEntityProperties.java
rename to common/src/common/packet/S20PacketEntityProperties.java
diff --git a/java/src/common/packet/S27PacketExplosion.java b/common/src/common/packet/S27PacketExplosion.java
similarity index 100%
rename from java/src/common/packet/S27PacketExplosion.java
rename to common/src/common/packet/S27PacketExplosion.java
diff --git a/java/src/common/packet/S28PacketEffect.java b/common/src/common/packet/S28PacketEffect.java
similarity index 100%
rename from java/src/common/packet/S28PacketEffect.java
rename to common/src/common/packet/S28PacketEffect.java
diff --git a/java/src/common/packet/S29PacketSoundEffect.java b/common/src/common/packet/S29PacketSoundEffect.java
similarity index 100%
rename from java/src/common/packet/S29PacketSoundEffect.java
rename to common/src/common/packet/S29PacketSoundEffect.java
diff --git a/java/src/common/packet/S2APacketParticles.java b/common/src/common/packet/S2APacketParticles.java
similarity index 100%
rename from java/src/common/packet/S2APacketParticles.java
rename to common/src/common/packet/S2APacketParticles.java
diff --git a/java/src/common/packet/S2BPacketChangeGameState.java b/common/src/common/packet/S2BPacketChangeGameState.java
similarity index 100%
rename from java/src/common/packet/S2BPacketChangeGameState.java
rename to common/src/common/packet/S2BPacketChangeGameState.java
diff --git a/java/src/common/packet/S2CPacketSpawnGlobalEntity.java b/common/src/common/packet/S2CPacketSpawnGlobalEntity.java
similarity index 100%
rename from java/src/common/packet/S2CPacketSpawnGlobalEntity.java
rename to common/src/common/packet/S2CPacketSpawnGlobalEntity.java
diff --git a/java/src/common/packet/S2DPacketOpenWindow.java b/common/src/common/packet/S2DPacketOpenWindow.java
similarity index 100%
rename from java/src/common/packet/S2DPacketOpenWindow.java
rename to common/src/common/packet/S2DPacketOpenWindow.java
diff --git a/java/src/common/packet/S2EPacketCloseWindow.java b/common/src/common/packet/S2EPacketCloseWindow.java
similarity index 100%
rename from java/src/common/packet/S2EPacketCloseWindow.java
rename to common/src/common/packet/S2EPacketCloseWindow.java
diff --git a/java/src/common/packet/S2FPacketSetSlot.java b/common/src/common/packet/S2FPacketSetSlot.java
similarity index 100%
rename from java/src/common/packet/S2FPacketSetSlot.java
rename to common/src/common/packet/S2FPacketSetSlot.java
diff --git a/java/src/common/packet/S30PacketWindowItems.java b/common/src/common/packet/S30PacketWindowItems.java
similarity index 100%
rename from java/src/common/packet/S30PacketWindowItems.java
rename to common/src/common/packet/S30PacketWindowItems.java
diff --git a/java/src/common/packet/S31PacketWindowProperty.java b/common/src/common/packet/S31PacketWindowProperty.java
similarity index 100%
rename from java/src/common/packet/S31PacketWindowProperty.java
rename to common/src/common/packet/S31PacketWindowProperty.java
diff --git a/java/src/common/packet/S32PacketConfirmTransaction.java b/common/src/common/packet/S32PacketConfirmTransaction.java
similarity index 100%
rename from java/src/common/packet/S32PacketConfirmTransaction.java
rename to common/src/common/packet/S32PacketConfirmTransaction.java
diff --git a/java/src/common/packet/S33PacketUpdateSign.java b/common/src/common/packet/S33PacketUpdateSign.java
similarity index 100%
rename from java/src/common/packet/S33PacketUpdateSign.java
rename to common/src/common/packet/S33PacketUpdateSign.java
diff --git a/java/src/common/packet/S35PacketUpdateTileEntity.java b/common/src/common/packet/S35PacketUpdateTileEntity.java
similarity index 100%
rename from java/src/common/packet/S35PacketUpdateTileEntity.java
rename to common/src/common/packet/S35PacketUpdateTileEntity.java
diff --git a/java/src/common/packet/S36PacketSignEditorOpen.java b/common/src/common/packet/S36PacketSignEditorOpen.java
similarity index 100%
rename from java/src/common/packet/S36PacketSignEditorOpen.java
rename to common/src/common/packet/S36PacketSignEditorOpen.java
diff --git a/java/src/common/packet/S38PacketPlayerListItem.java b/common/src/common/packet/S38PacketPlayerListItem.java
similarity index 100%
rename from java/src/common/packet/S38PacketPlayerListItem.java
rename to common/src/common/packet/S38PacketPlayerListItem.java
diff --git a/java/src/common/packet/S39PacketPlayerAbilities.java b/common/src/common/packet/S39PacketPlayerAbilities.java
similarity index 100%
rename from java/src/common/packet/S39PacketPlayerAbilities.java
rename to common/src/common/packet/S39PacketPlayerAbilities.java
diff --git a/java/src/common/packet/S3APacketTabComplete.java b/common/src/common/packet/S3APacketTabComplete.java
similarity index 100%
rename from java/src/common/packet/S3APacketTabComplete.java
rename to common/src/common/packet/S3APacketTabComplete.java
diff --git a/java/src/common/packet/S43PacketUpdateEntityNBT.java b/common/src/common/packet/S43PacketUpdateEntityNBT.java
similarity index 100%
rename from java/src/common/packet/S43PacketUpdateEntityNBT.java
rename to common/src/common/packet/S43PacketUpdateEntityNBT.java
diff --git a/java/src/common/packet/SPacketAnimation.java b/common/src/common/packet/SPacketAnimation.java
similarity index 100%
rename from java/src/common/packet/SPacketAnimation.java
rename to common/src/common/packet/SPacketAnimation.java
diff --git a/java/src/common/packet/SPacketBiomes.java b/common/src/common/packet/SPacketBiomes.java
similarity index 100%
rename from java/src/common/packet/SPacketBiomes.java
rename to common/src/common/packet/SPacketBiomes.java
diff --git a/java/src/common/packet/SPacketBlockAction.java b/common/src/common/packet/SPacketBlockAction.java
similarity index 100%
rename from java/src/common/packet/SPacketBlockAction.java
rename to common/src/common/packet/SPacketBlockAction.java
diff --git a/java/src/common/packet/SPacketBlockBreakAnim.java b/common/src/common/packet/SPacketBlockBreakAnim.java
similarity index 100%
rename from java/src/common/packet/SPacketBlockBreakAnim.java
rename to common/src/common/packet/SPacketBlockBreakAnim.java
diff --git a/java/src/common/packet/SPacketBlockChange.java b/common/src/common/packet/SPacketBlockChange.java
similarity index 100%
rename from java/src/common/packet/SPacketBlockChange.java
rename to common/src/common/packet/SPacketBlockChange.java
diff --git a/java/src/common/packet/SPacketCamera.java b/common/src/common/packet/SPacketCamera.java
similarity index 100%
rename from java/src/common/packet/SPacketCamera.java
rename to common/src/common/packet/SPacketCamera.java
diff --git a/java/src/common/packet/SPacketCharacterList.java b/common/src/common/packet/SPacketCharacterList.java
similarity index 100%
rename from java/src/common/packet/SPacketCharacterList.java
rename to common/src/common/packet/SPacketCharacterList.java
diff --git a/java/src/common/packet/SPacketChunkData.java b/common/src/common/packet/SPacketChunkData.java
similarity index 100%
rename from java/src/common/packet/SPacketChunkData.java
rename to common/src/common/packet/SPacketChunkData.java
diff --git a/java/src/common/packet/SPacketCollectItem.java b/common/src/common/packet/SPacketCollectItem.java
similarity index 100%
rename from java/src/common/packet/SPacketCollectItem.java
rename to common/src/common/packet/SPacketCollectItem.java
diff --git a/java/src/common/packet/SPacketDestroyEntities.java b/common/src/common/packet/SPacketDestroyEntities.java
similarity index 100%
rename from java/src/common/packet/SPacketDestroyEntities.java
rename to common/src/common/packet/SPacketDestroyEntities.java
diff --git a/java/src/common/packet/SPacketDimensionName.java b/common/src/common/packet/SPacketDimensionName.java
similarity index 100%
rename from java/src/common/packet/SPacketDimensionName.java
rename to common/src/common/packet/SPacketDimensionName.java
diff --git a/java/src/common/packet/SPacketDisconnect.java b/common/src/common/packet/SPacketDisconnect.java
similarity index 100%
rename from java/src/common/packet/SPacketDisconnect.java
rename to common/src/common/packet/SPacketDisconnect.java
diff --git a/java/src/common/packet/SPacketEntityEquipment.java b/common/src/common/packet/SPacketEntityEquipment.java
similarity index 100%
rename from java/src/common/packet/SPacketEntityEquipment.java
rename to common/src/common/packet/SPacketEntityEquipment.java
diff --git a/java/src/common/packet/SPacketEntityVelocity.java b/common/src/common/packet/SPacketEntityVelocity.java
similarity index 100%
rename from java/src/common/packet/SPacketEntityVelocity.java
rename to common/src/common/packet/SPacketEntityVelocity.java
diff --git a/java/src/common/packet/SPacketHeldItemChange.java b/common/src/common/packet/SPacketHeldItemChange.java
similarity index 100%
rename from java/src/common/packet/SPacketHeldItemChange.java
rename to common/src/common/packet/SPacketHeldItemChange.java
diff --git a/java/src/common/packet/SPacketJoinGame.java b/common/src/common/packet/SPacketJoinGame.java
similarity index 100%
rename from java/src/common/packet/SPacketJoinGame.java
rename to common/src/common/packet/SPacketJoinGame.java
diff --git a/java/src/common/packet/SPacketKeepAlive.java b/common/src/common/packet/SPacketKeepAlive.java
similarity index 100%
rename from java/src/common/packet/SPacketKeepAlive.java
rename to common/src/common/packet/SPacketKeepAlive.java
diff --git a/java/src/common/packet/SPacketLoading.java b/common/src/common/packet/SPacketLoading.java
similarity index 100%
rename from java/src/common/packet/SPacketLoading.java
rename to common/src/common/packet/SPacketLoading.java
diff --git a/java/src/common/packet/SPacketMapChunkBulk.java b/common/src/common/packet/SPacketMapChunkBulk.java
similarity index 100%
rename from java/src/common/packet/SPacketMapChunkBulk.java
rename to common/src/common/packet/SPacketMapChunkBulk.java
diff --git a/java/src/common/packet/SPacketMessage.java b/common/src/common/packet/SPacketMessage.java
similarity index 100%
rename from java/src/common/packet/SPacketMessage.java
rename to common/src/common/packet/SPacketMessage.java
diff --git a/java/src/common/packet/SPacketMultiBlockChange.java b/common/src/common/packet/SPacketMultiBlockChange.java
similarity index 100%
rename from java/src/common/packet/SPacketMultiBlockChange.java
rename to common/src/common/packet/SPacketMultiBlockChange.java
diff --git a/java/src/common/packet/SPacketPlayerPosLook.java b/common/src/common/packet/SPacketPlayerPosLook.java
similarity index 100%
rename from java/src/common/packet/SPacketPlayerPosLook.java
rename to common/src/common/packet/SPacketPlayerPosLook.java
diff --git a/java/src/common/packet/SPacketRespawn.java b/common/src/common/packet/SPacketRespawn.java
similarity index 100%
rename from java/src/common/packet/SPacketRespawn.java
rename to common/src/common/packet/SPacketRespawn.java
diff --git a/java/src/common/packet/SPacketServerTick.java b/common/src/common/packet/SPacketServerTick.java
similarity index 100%
rename from java/src/common/packet/SPacketServerTick.java
rename to common/src/common/packet/SPacketServerTick.java
diff --git a/java/src/common/packet/SPacketSetExperience.java b/common/src/common/packet/SPacketSetExperience.java
similarity index 100%
rename from java/src/common/packet/SPacketSetExperience.java
rename to common/src/common/packet/SPacketSetExperience.java
diff --git a/java/src/common/packet/SPacketSkin.java b/common/src/common/packet/SPacketSkin.java
similarity index 100%
rename from java/src/common/packet/SPacketSkin.java
rename to common/src/common/packet/SPacketSkin.java
diff --git a/java/src/common/packet/SPacketSpawnMob.java b/common/src/common/packet/SPacketSpawnMob.java
similarity index 100%
rename from java/src/common/packet/SPacketSpawnMob.java
rename to common/src/common/packet/SPacketSpawnMob.java
diff --git a/java/src/common/packet/SPacketSpawnObject.java b/common/src/common/packet/SPacketSpawnObject.java
similarity index 100%
rename from java/src/common/packet/SPacketSpawnObject.java
rename to common/src/common/packet/SPacketSpawnObject.java
diff --git a/java/src/common/packet/SPacketSpawnPlayer.java b/common/src/common/packet/SPacketSpawnPlayer.java
similarity index 100%
rename from java/src/common/packet/SPacketSpawnPlayer.java
rename to common/src/common/packet/SPacketSpawnPlayer.java
diff --git a/java/src/common/packet/SPacketTimeUpdate.java b/common/src/common/packet/SPacketTimeUpdate.java
similarity index 100%
rename from java/src/common/packet/SPacketTimeUpdate.java
rename to common/src/common/packet/SPacketTimeUpdate.java
diff --git a/java/src/common/packet/SPacketTrades.java b/common/src/common/packet/SPacketTrades.java
similarity index 100%
rename from java/src/common/packet/SPacketTrades.java
rename to common/src/common/packet/SPacketTrades.java
diff --git a/java/src/common/packet/SPacketUpdateHealth.java b/common/src/common/packet/SPacketUpdateHealth.java
similarity index 100%
rename from java/src/common/packet/SPacketUpdateHealth.java
rename to common/src/common/packet/SPacketUpdateHealth.java
diff --git a/java/src/common/packet/SPacketWorld.java b/common/src/common/packet/SPacketWorld.java
similarity index 100%
rename from java/src/common/packet/SPacketWorld.java
rename to common/src/common/packet/SPacketWorld.java
diff --git a/java/src/common/pathfinding/NodeProcessor.java b/common/src/common/pathfinding/NodeProcessor.java
similarity index 100%
rename from java/src/common/pathfinding/NodeProcessor.java
rename to common/src/common/pathfinding/NodeProcessor.java
diff --git a/java/src/common/pathfinding/Path.java b/common/src/common/pathfinding/Path.java
similarity index 100%
rename from java/src/common/pathfinding/Path.java
rename to common/src/common/pathfinding/Path.java
diff --git a/java/src/common/pathfinding/PathCache.java b/common/src/common/pathfinding/PathCache.java
similarity index 100%
rename from java/src/common/pathfinding/PathCache.java
rename to common/src/common/pathfinding/PathCache.java
diff --git a/java/src/common/pathfinding/PathEntity.java b/common/src/common/pathfinding/PathEntity.java
similarity index 100%
rename from java/src/common/pathfinding/PathEntity.java
rename to common/src/common/pathfinding/PathEntity.java
diff --git a/java/src/common/pathfinding/PathFinder.java b/common/src/common/pathfinding/PathFinder.java
similarity index 100%
rename from java/src/common/pathfinding/PathFinder.java
rename to common/src/common/pathfinding/PathFinder.java
diff --git a/java/src/common/pathfinding/PathNavigate.java b/common/src/common/pathfinding/PathNavigate.java
similarity index 100%
rename from java/src/common/pathfinding/PathNavigate.java
rename to common/src/common/pathfinding/PathNavigate.java
diff --git a/java/src/common/pathfinding/PathNavigateClimber.java b/common/src/common/pathfinding/PathNavigateClimber.java
similarity index 100%
rename from java/src/common/pathfinding/PathNavigateClimber.java
rename to common/src/common/pathfinding/PathNavigateClimber.java
diff --git a/java/src/common/pathfinding/PathNavigateGround.java b/common/src/common/pathfinding/PathNavigateGround.java
similarity index 100%
rename from java/src/common/pathfinding/PathNavigateGround.java
rename to common/src/common/pathfinding/PathNavigateGround.java
diff --git a/java/src/common/pathfinding/PathPoint.java b/common/src/common/pathfinding/PathPoint.java
similarity index 100%
rename from java/src/common/pathfinding/PathPoint.java
rename to common/src/common/pathfinding/PathPoint.java
diff --git a/java/src/common/pathfinding/SwimNodeProcessor.java b/common/src/common/pathfinding/SwimNodeProcessor.java
similarity index 100%
rename from java/src/common/pathfinding/SwimNodeProcessor.java
rename to common/src/common/pathfinding/SwimNodeProcessor.java
diff --git a/java/src/common/pathfinding/WalkNodeProcessor.java b/common/src/common/pathfinding/WalkNodeProcessor.java
similarity index 100%
rename from java/src/common/pathfinding/WalkNodeProcessor.java
rename to common/src/common/pathfinding/WalkNodeProcessor.java
diff --git a/java/src/common/pattern/BlockStateHelper.java b/common/src/common/pattern/BlockStateHelper.java
similarity index 100%
rename from java/src/common/pattern/BlockStateHelper.java
rename to common/src/common/pattern/BlockStateHelper.java
diff --git a/java/src/common/potion/Potion.java b/common/src/common/potion/Potion.java
similarity index 100%
rename from java/src/common/potion/Potion.java
rename to common/src/common/potion/Potion.java
diff --git a/java/src/common/potion/PotionEffect.java b/common/src/common/potion/PotionEffect.java
similarity index 100%
rename from java/src/common/potion/PotionEffect.java
rename to common/src/common/potion/PotionEffect.java
diff --git a/java/src/common/potion/PotionHelper.java b/common/src/common/potion/PotionHelper.java
similarity index 100%
rename from java/src/common/potion/PotionHelper.java
rename to common/src/common/potion/PotionHelper.java
diff --git a/java/src/common/properties/IProperty.java b/common/src/common/properties/IProperty.java
similarity index 100%
rename from java/src/common/properties/IProperty.java
rename to common/src/common/properties/IProperty.java
diff --git a/java/src/common/properties/PropertyBool.java b/common/src/common/properties/PropertyBool.java
similarity index 100%
rename from java/src/common/properties/PropertyBool.java
rename to common/src/common/properties/PropertyBool.java
diff --git a/java/src/common/properties/PropertyDirection.java b/common/src/common/properties/PropertyDirection.java
similarity index 100%
rename from java/src/common/properties/PropertyDirection.java
rename to common/src/common/properties/PropertyDirection.java
diff --git a/java/src/common/properties/PropertyEnum.java b/common/src/common/properties/PropertyEnum.java
similarity index 100%
rename from java/src/common/properties/PropertyEnum.java
rename to common/src/common/properties/PropertyEnum.java
diff --git a/java/src/common/properties/PropertyHelper.java b/common/src/common/properties/PropertyHelper.java
similarity index 100%
rename from java/src/common/properties/PropertyHelper.java
rename to common/src/common/properties/PropertyHelper.java
diff --git a/java/src/common/properties/PropertyInteger.java b/common/src/common/properties/PropertyInteger.java
similarity index 100%
rename from java/src/common/properties/PropertyInteger.java
rename to common/src/common/properties/PropertyInteger.java
diff --git a/java/src/common/rng/ImprovedGen.java b/common/src/common/rng/ImprovedGen.java
similarity index 100%
rename from java/src/common/rng/ImprovedGen.java
rename to common/src/common/rng/ImprovedGen.java
diff --git a/java/src/common/rng/ImprovedGenOld.java b/common/src/common/rng/ImprovedGenOld.java
similarity index 100%
rename from java/src/common/rng/ImprovedGenOld.java
rename to common/src/common/rng/ImprovedGenOld.java
diff --git a/java/src/common/rng/NoiseGen.java b/common/src/common/rng/NoiseGen.java
similarity index 100%
rename from java/src/common/rng/NoiseGen.java
rename to common/src/common/rng/NoiseGen.java
diff --git a/java/src/common/rng/OctaveGen.java b/common/src/common/rng/OctaveGen.java
similarity index 100%
rename from java/src/common/rng/OctaveGen.java
rename to common/src/common/rng/OctaveGen.java
diff --git a/java/src/common/rng/OctaveGenOld.java b/common/src/common/rng/OctaveGenOld.java
similarity index 100%
rename from java/src/common/rng/OctaveGenOld.java
rename to common/src/common/rng/OctaveGenOld.java
diff --git a/java/src/common/rng/PerlinGen.java b/common/src/common/rng/PerlinGen.java
similarity index 100%
rename from java/src/common/rng/PerlinGen.java
rename to common/src/common/rng/PerlinGen.java
diff --git a/java/src/common/rng/PerlinGenOld.java b/common/src/common/rng/PerlinGenOld.java
similarity index 100%
rename from java/src/common/rng/PerlinGenOld.java
rename to common/src/common/rng/PerlinGenOld.java
diff --git a/java/src/common/rng/Random.java b/common/src/common/rng/Random.java
similarity index 100%
rename from java/src/common/rng/Random.java
rename to common/src/common/rng/Random.java
diff --git a/java/src/common/rng/RngItem.java b/common/src/common/rng/RngItem.java
similarity index 100%
rename from java/src/common/rng/RngItem.java
rename to common/src/common/rng/RngItem.java
diff --git a/java/src/common/rng/SimplexGen.java b/common/src/common/rng/SimplexGen.java
similarity index 100%
rename from java/src/common/rng/SimplexGen.java
rename to common/src/common/rng/SimplexGen.java
diff --git a/java/src/common/rng/SimplexGenOld.java b/common/src/common/rng/SimplexGenOld.java
similarity index 100%
rename from java/src/common/rng/SimplexGenOld.java
rename to common/src/common/rng/SimplexGenOld.java
diff --git a/java/src/common/rng/WeightedList.java b/common/src/common/rng/WeightedList.java
similarity index 100%
rename from java/src/common/rng/WeightedList.java
rename to common/src/common/rng/WeightedList.java
diff --git a/java/src/common/sound/EventType.java b/common/src/common/sound/EventType.java
similarity index 100%
rename from java/src/common/sound/EventType.java
rename to common/src/common/sound/EventType.java
diff --git a/java/src/common/sound/MovingSound.java b/common/src/common/sound/MovingSound.java
similarity index 100%
rename from java/src/common/sound/MovingSound.java
rename to common/src/common/sound/MovingSound.java
diff --git a/java/src/common/sound/MovingSoundMinecart.java b/common/src/common/sound/MovingSoundMinecart.java
similarity index 100%
rename from java/src/common/sound/MovingSoundMinecart.java
rename to common/src/common/sound/MovingSoundMinecart.java
diff --git a/java/src/common/sound/MovingSoundMinecartRiding.java b/common/src/common/sound/MovingSoundMinecartRiding.java
similarity index 100%
rename from java/src/common/sound/MovingSoundMinecartRiding.java
rename to common/src/common/sound/MovingSoundMinecartRiding.java
diff --git a/java/src/common/sound/PositionedSound.java b/common/src/common/sound/PositionedSound.java
similarity index 100%
rename from java/src/common/sound/PositionedSound.java
rename to common/src/common/sound/PositionedSound.java
diff --git a/java/src/common/sound/Sound.java b/common/src/common/sound/Sound.java
similarity index 100%
rename from java/src/common/sound/Sound.java
rename to common/src/common/sound/Sound.java
diff --git a/java/src/common/tileentity/IHopper.java b/common/src/common/tileentity/IHopper.java
similarity index 100%
rename from java/src/common/tileentity/IHopper.java
rename to common/src/common/tileentity/IHopper.java
diff --git a/java/src/common/tileentity/IInteractionObject.java b/common/src/common/tileentity/IInteractionObject.java
similarity index 100%
rename from java/src/common/tileentity/IInteractionObject.java
rename to common/src/common/tileentity/IInteractionObject.java
diff --git a/java/src/common/tileentity/ILockableContainer.java b/common/src/common/tileentity/ILockableContainer.java
similarity index 100%
rename from java/src/common/tileentity/ILockableContainer.java
rename to common/src/common/tileentity/ILockableContainer.java
diff --git a/java/src/common/tileentity/ITickable.java b/common/src/common/tileentity/ITickable.java
similarity index 100%
rename from java/src/common/tileentity/ITickable.java
rename to common/src/common/tileentity/ITickable.java
diff --git a/java/src/common/tileentity/IWorldNameable.java b/common/src/common/tileentity/IWorldNameable.java
similarity index 100%
rename from java/src/common/tileentity/IWorldNameable.java
rename to common/src/common/tileentity/IWorldNameable.java
diff --git a/java/src/common/tileentity/LocalBlockIntercommunication.java b/common/src/common/tileentity/LocalBlockIntercommunication.java
similarity index 100%
rename from java/src/common/tileentity/LocalBlockIntercommunication.java
rename to common/src/common/tileentity/LocalBlockIntercommunication.java
diff --git a/java/src/common/tileentity/LockCode.java b/common/src/common/tileentity/LockCode.java
similarity index 100%
rename from java/src/common/tileentity/LockCode.java
rename to common/src/common/tileentity/LockCode.java
diff --git a/java/src/common/tileentity/MachineResource.java b/common/src/common/tileentity/MachineResource.java
similarity index 100%
rename from java/src/common/tileentity/MachineResource.java
rename to common/src/common/tileentity/MachineResource.java
diff --git a/java/src/common/tileentity/TileEntity.java b/common/src/common/tileentity/TileEntity.java
similarity index 100%
rename from java/src/common/tileentity/TileEntity.java
rename to common/src/common/tileentity/TileEntity.java
diff --git a/java/src/common/tileentity/TileEntityBanner.java b/common/src/common/tileentity/TileEntityBanner.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityBanner.java
rename to common/src/common/tileentity/TileEntityBanner.java
diff --git a/java/src/common/tileentity/TileEntityBeacon.java b/common/src/common/tileentity/TileEntityBeacon.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityBeacon.java
rename to common/src/common/tileentity/TileEntityBeacon.java
diff --git a/java/src/common/tileentity/TileEntityBrewingStand.java b/common/src/common/tileentity/TileEntityBrewingStand.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityBrewingStand.java
rename to common/src/common/tileentity/TileEntityBrewingStand.java
diff --git a/java/src/common/tileentity/TileEntityChest.java b/common/src/common/tileentity/TileEntityChest.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityChest.java
rename to common/src/common/tileentity/TileEntityChest.java
diff --git a/java/src/common/tileentity/TileEntityComparator.java b/common/src/common/tileentity/TileEntityComparator.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityComparator.java
rename to common/src/common/tileentity/TileEntityComparator.java
diff --git a/java/src/common/tileentity/TileEntityDaylightDetector.java b/common/src/common/tileentity/TileEntityDaylightDetector.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityDaylightDetector.java
rename to common/src/common/tileentity/TileEntityDaylightDetector.java
diff --git a/java/src/common/tileentity/TileEntityDispenser.java b/common/src/common/tileentity/TileEntityDispenser.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityDispenser.java
rename to common/src/common/tileentity/TileEntityDispenser.java
diff --git a/java/src/common/tileentity/TileEntityDropper.java b/common/src/common/tileentity/TileEntityDropper.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityDropper.java
rename to common/src/common/tileentity/TileEntityDropper.java
diff --git a/java/src/common/tileentity/TileEntityEnchantmentTable.java b/common/src/common/tileentity/TileEntityEnchantmentTable.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityEnchantmentTable.java
rename to common/src/common/tileentity/TileEntityEnchantmentTable.java
diff --git a/java/src/common/tileentity/TileEntityFurnace.java b/common/src/common/tileentity/TileEntityFurnace.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityFurnace.java
rename to common/src/common/tileentity/TileEntityFurnace.java
diff --git a/java/src/common/tileentity/TileEntityHopper.java b/common/src/common/tileentity/TileEntityHopper.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityHopper.java
rename to common/src/common/tileentity/TileEntityHopper.java
diff --git a/java/src/common/tileentity/TileEntityLockable.java b/common/src/common/tileentity/TileEntityLockable.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityLockable.java
rename to common/src/common/tileentity/TileEntityLockable.java
diff --git a/java/src/common/tileentity/TileEntityMachine.java b/common/src/common/tileentity/TileEntityMachine.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityMachine.java
rename to common/src/common/tileentity/TileEntityMachine.java
diff --git a/java/src/common/tileentity/TileEntityMobSpawner.java b/common/src/common/tileentity/TileEntityMobSpawner.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityMobSpawner.java
rename to common/src/common/tileentity/TileEntityMobSpawner.java
diff --git a/java/src/common/tileentity/TileEntityNote.java b/common/src/common/tileentity/TileEntityNote.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityNote.java
rename to common/src/common/tileentity/TileEntityNote.java
diff --git a/java/src/common/tileentity/TileEntityPiston.java b/common/src/common/tileentity/TileEntityPiston.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityPiston.java
rename to common/src/common/tileentity/TileEntityPiston.java
diff --git a/java/src/common/tileentity/TileEntitySign.java b/common/src/common/tileentity/TileEntitySign.java
similarity index 100%
rename from java/src/common/tileentity/TileEntitySign.java
rename to common/src/common/tileentity/TileEntitySign.java
diff --git a/java/src/common/tileentity/TileEntitySkull.java b/common/src/common/tileentity/TileEntitySkull.java
similarity index 100%
rename from java/src/common/tileentity/TileEntitySkull.java
rename to common/src/common/tileentity/TileEntitySkull.java
diff --git a/java/src/common/tileentity/TileEntityTianReactor.java b/common/src/common/tileentity/TileEntityTianReactor.java
similarity index 100%
rename from java/src/common/tileentity/TileEntityTianReactor.java
rename to common/src/common/tileentity/TileEntityTianReactor.java
diff --git a/java/src/common/util/CharValidator.java b/common/src/common/util/CharValidator.java
similarity index 100%
rename from java/src/common/util/CharValidator.java
rename to common/src/common/util/CharValidator.java
diff --git a/java/src/common/util/DC32.java b/common/src/common/util/DC32.java
similarity index 100%
rename from java/src/common/util/DC32.java
rename to common/src/common/util/DC32.java
diff --git a/java/src/common/util/Displayable.java b/common/src/common/util/Displayable.java
similarity index 100%
rename from java/src/common/util/Displayable.java
rename to common/src/common/util/Displayable.java
diff --git a/java/src/common/util/ExtMath.java b/common/src/common/util/ExtMath.java
similarity index 100%
rename from java/src/common/util/ExtMath.java
rename to common/src/common/util/ExtMath.java
diff --git a/java/src/common/util/FileUtils.java b/common/src/common/util/FileUtils.java
similarity index 100%
rename from java/src/common/util/FileUtils.java
rename to common/src/common/util/FileUtils.java
diff --git a/java/src/common/util/Identifyable.java b/common/src/common/util/Identifyable.java
similarity index 100%
rename from java/src/common/util/Identifyable.java
rename to common/src/common/util/Identifyable.java
diff --git a/java/src/common/util/LazyLoadBase.java b/common/src/common/util/LazyLoadBase.java
similarity index 100%
rename from java/src/common/util/LazyLoadBase.java
rename to common/src/common/util/LazyLoadBase.java
diff --git a/java/src/common/util/Matrix4f.java b/common/src/common/util/Matrix4f.java
similarity index 100%
rename from java/src/common/util/Matrix4f.java
rename to common/src/common/util/Matrix4f.java
diff --git a/java/src/common/util/Predicates.java b/common/src/common/util/Predicates.java
similarity index 100%
rename from java/src/common/util/Predicates.java
rename to common/src/common/util/Predicates.java
diff --git a/java/src/common/util/Tuple.java b/common/src/common/util/Tuple.java
similarity index 100%
rename from java/src/common/util/Tuple.java
rename to common/src/common/util/Tuple.java
diff --git a/java/src/common/util/Util.java b/common/src/common/util/Util.java
similarity index 100%
rename from java/src/common/util/Util.java
rename to common/src/common/util/Util.java
diff --git a/java/src/common/util/Vector.java b/common/src/common/util/Vector.java
similarity index 100%
rename from java/src/common/util/Vector.java
rename to common/src/common/util/Vector.java
diff --git a/java/src/common/util/Vector3f.java b/common/src/common/util/Vector3f.java
similarity index 100%
rename from java/src/common/util/Vector3f.java
rename to common/src/common/util/Vector3f.java
diff --git a/java/src/common/util/Vector4f.java b/common/src/common/util/Vector4f.java
similarity index 100%
rename from java/src/common/util/Vector4f.java
rename to common/src/common/util/Vector4f.java
diff --git a/java/src/common/village/MerchantRecipe.java b/common/src/common/village/MerchantRecipe.java
similarity index 100%
rename from java/src/common/village/MerchantRecipe.java
rename to common/src/common/village/MerchantRecipe.java
diff --git a/java/src/common/village/MerchantRecipeList.java b/common/src/common/village/MerchantRecipeList.java
similarity index 100%
rename from java/src/common/village/MerchantRecipeList.java
rename to common/src/common/village/MerchantRecipeList.java
diff --git a/java/src/common/village/Village.java b/common/src/common/village/Village.java
similarity index 100%
rename from java/src/common/village/Village.java
rename to common/src/common/village/Village.java
diff --git a/java/src/common/village/VillageCollection.java b/common/src/common/village/VillageCollection.java
similarity index 100%
rename from java/src/common/village/VillageCollection.java
rename to common/src/common/village/VillageCollection.java
diff --git a/java/src/common/village/VillageDoorInfo.java b/common/src/common/village/VillageDoorInfo.java
similarity index 100%
rename from java/src/common/village/VillageDoorInfo.java
rename to common/src/common/village/VillageDoorInfo.java
diff --git a/java/src/common/world/BlockArray.java b/common/src/common/world/BlockArray.java
similarity index 100%
rename from java/src/common/world/BlockArray.java
rename to common/src/common/world/BlockArray.java
diff --git a/java/src/common/world/BlockPos.java b/common/src/common/world/BlockPos.java
similarity index 100%
rename from java/src/common/world/BlockPos.java
rename to common/src/common/world/BlockPos.java
diff --git a/java/src/common/world/BoundingBox.java b/common/src/common/world/BoundingBox.java
similarity index 100%
rename from java/src/common/world/BoundingBox.java
rename to common/src/common/world/BoundingBox.java
diff --git a/java/src/common/world/Chunk.java b/common/src/common/world/Chunk.java
similarity index 100%
rename from java/src/common/world/Chunk.java
rename to common/src/common/world/Chunk.java
diff --git a/java/src/common/world/ChunkCache.java b/common/src/common/world/ChunkCache.java
similarity index 100%
rename from java/src/common/world/ChunkCache.java
rename to common/src/common/world/ChunkCache.java
diff --git a/java/src/common/world/ChunkPos.java b/common/src/common/world/ChunkPos.java
similarity index 100%
rename from java/src/common/world/ChunkPos.java
rename to common/src/common/world/ChunkPos.java
diff --git a/java/src/common/world/ClassInheritanceMultiMap.java b/common/src/common/world/ClassInheritanceMultiMap.java
similarity index 100%
rename from java/src/common/world/ClassInheritanceMultiMap.java
rename to common/src/common/world/ClassInheritanceMultiMap.java
diff --git a/java/src/common/world/EmptyChunk.java b/common/src/common/world/EmptyChunk.java
similarity index 100%
rename from java/src/common/world/EmptyChunk.java
rename to common/src/common/world/EmptyChunk.java
diff --git a/java/src/common/world/Explosion.java b/common/src/common/world/Explosion.java
similarity index 100%
rename from java/src/common/world/Explosion.java
rename to common/src/common/world/Explosion.java
diff --git a/java/src/common/world/Facing.java b/common/src/common/world/Facing.java
similarity index 100%
rename from java/src/common/world/Facing.java
rename to common/src/common/world/Facing.java
diff --git a/java/src/common/world/HitPosition.java b/common/src/common/world/HitPosition.java
similarity index 100%
rename from java/src/common/world/HitPosition.java
rename to common/src/common/world/HitPosition.java
diff --git a/java/src/common/world/IBlockAccess.java b/common/src/common/world/IBlockAccess.java
similarity index 100%
rename from java/src/common/world/IBlockAccess.java
rename to common/src/common/world/IBlockAccess.java
diff --git a/java/src/common/world/IWorldAccess.java b/common/src/common/world/IWorldAccess.java
similarity index 100%
rename from java/src/common/world/IWorldAccess.java
rename to common/src/common/world/IWorldAccess.java
diff --git a/java/src/common/world/IntHashMap.java b/common/src/common/world/IntHashMap.java
similarity index 100%
rename from java/src/common/world/IntHashMap.java
rename to common/src/common/world/IntHashMap.java
diff --git a/java/src/common/world/LightType.java b/common/src/common/world/LightType.java
similarity index 100%
rename from java/src/common/world/LightType.java
rename to common/src/common/world/LightType.java
diff --git a/java/src/common/world/LongHashMap.java b/common/src/common/world/LongHashMap.java
similarity index 100%
rename from java/src/common/world/LongHashMap.java
rename to common/src/common/world/LongHashMap.java
diff --git a/java/src/common/world/NextTickListEntry.java b/common/src/common/world/NextTickListEntry.java
similarity index 100%
rename from java/src/common/world/NextTickListEntry.java
rename to common/src/common/world/NextTickListEntry.java
diff --git a/java/src/common/world/NibbleArray.java b/common/src/common/world/NibbleArray.java
similarity index 100%
rename from java/src/common/world/NibbleArray.java
rename to common/src/common/world/NibbleArray.java
diff --git a/java/src/common/world/PortalType.java b/common/src/common/world/PortalType.java
similarity index 100%
rename from java/src/common/world/PortalType.java
rename to common/src/common/world/PortalType.java
diff --git a/java/src/common/world/Position.java b/common/src/common/world/Position.java
similarity index 100%
rename from java/src/common/world/Position.java
rename to common/src/common/world/Position.java
diff --git a/java/src/common/world/Region.java b/common/src/common/world/Region.java
similarity index 100%
rename from java/src/common/world/Region.java
rename to common/src/common/world/Region.java
diff --git a/java/src/common/world/Spawner.java b/common/src/common/world/Spawner.java
similarity index 100%
rename from java/src/common/world/Spawner.java
rename to common/src/common/world/Spawner.java
diff --git a/java/src/common/world/State.java b/common/src/common/world/State.java
similarity index 100%
rename from java/src/common/world/State.java
rename to common/src/common/world/State.java
diff --git a/java/src/common/world/Vec3.java b/common/src/common/world/Vec3.java
similarity index 100%
rename from java/src/common/world/Vec3.java
rename to common/src/common/world/Vec3.java
diff --git a/java/src/common/world/Vec3i.java b/common/src/common/world/Vec3i.java
similarity index 100%
rename from java/src/common/world/Vec3i.java
rename to common/src/common/world/Vec3i.java
diff --git a/java/src/common/world/Weather.java b/common/src/common/world/Weather.java
similarity index 100%
rename from java/src/common/world/Weather.java
rename to common/src/common/world/Weather.java
diff --git a/java/src/common/world/World.java b/common/src/common/world/World.java
similarity index 100%
rename from java/src/common/world/World.java
rename to common/src/common/world/World.java
diff --git a/java/src/common/world/WorldClient.java b/common/src/common/world/WorldClient.java
similarity index 100%
rename from java/src/common/world/WorldClient.java
rename to common/src/common/world/WorldClient.java
diff --git a/java/src/common/world/WorldPos.java b/common/src/common/world/WorldPos.java
similarity index 100%
rename from java/src/common/world/WorldPos.java
rename to common/src/common/world/WorldPos.java
diff --git a/java/src/common/world/WorldServer.java b/common/src/common/world/WorldServer.java
similarity index 100%
rename from java/src/common/world/WorldServer.java
rename to common/src/common/world/WorldServer.java
diff --git a/java/src/common/worldgen/BiomeGenLayered.java b/common/src/common/worldgen/BiomeGenLayered.java
similarity index 100%
rename from java/src/common/worldgen/BiomeGenLayered.java
rename to common/src/common/worldgen/BiomeGenLayered.java
diff --git a/java/src/common/worldgen/BiomeGenPerlin.java b/common/src/common/worldgen/BiomeGenPerlin.java
similarity index 100%
rename from java/src/common/worldgen/BiomeGenPerlin.java
rename to common/src/common/worldgen/BiomeGenPerlin.java
diff --git a/java/src/common/worldgen/BiomeGenSingle.java b/common/src/common/worldgen/BiomeGenSingle.java
similarity index 100%
rename from java/src/common/worldgen/BiomeGenSingle.java
rename to common/src/common/worldgen/BiomeGenSingle.java
diff --git a/java/src/common/worldgen/BiomeGenerator.java b/common/src/common/worldgen/BiomeGenerator.java
similarity index 100%
rename from java/src/common/worldgen/BiomeGenerator.java
rename to common/src/common/worldgen/BiomeGenerator.java
diff --git a/java/src/common/worldgen/BlockReplacer.java b/common/src/common/worldgen/BlockReplacer.java
similarity index 100%
rename from java/src/common/worldgen/BlockReplacer.java
rename to common/src/common/worldgen/BlockReplacer.java
diff --git a/java/src/common/worldgen/ChunkGenerator.java b/common/src/common/worldgen/ChunkGenerator.java
similarity index 100%
rename from java/src/common/worldgen/ChunkGenerator.java
rename to common/src/common/worldgen/ChunkGenerator.java
diff --git a/java/src/common/worldgen/ChunkPrimer.java b/common/src/common/worldgen/ChunkPrimer.java
similarity index 100%
rename from java/src/common/worldgen/ChunkPrimer.java
rename to common/src/common/worldgen/ChunkPrimer.java
diff --git a/java/src/common/worldgen/FeatureDungeons.java b/common/src/common/worldgen/FeatureDungeons.java
similarity index 100%
rename from java/src/common/worldgen/FeatureDungeons.java
rename to common/src/common/worldgen/FeatureDungeons.java
diff --git a/java/src/common/worldgen/FeatureGenerator.java b/common/src/common/worldgen/FeatureGenerator.java
similarity index 100%
rename from java/src/common/worldgen/FeatureGenerator.java
rename to common/src/common/worldgen/FeatureGenerator.java
diff --git a/java/src/common/worldgen/FeatureLakes.java b/common/src/common/worldgen/FeatureLakes.java
similarity index 100%
rename from java/src/common/worldgen/FeatureLakes.java
rename to common/src/common/worldgen/FeatureLakes.java
diff --git a/java/src/common/worldgen/FeatureLiquids.java b/common/src/common/worldgen/FeatureLiquids.java
similarity index 100%
rename from java/src/common/worldgen/FeatureLiquids.java
rename to common/src/common/worldgen/FeatureLiquids.java
diff --git a/java/src/common/worldgen/FeatureOres.java b/common/src/common/worldgen/FeatureOres.java
similarity index 100%
rename from java/src/common/worldgen/FeatureOres.java
rename to common/src/common/worldgen/FeatureOres.java
diff --git a/java/src/common/worldgen/GeneratorCavern.java b/common/src/common/worldgen/GeneratorCavern.java
similarity index 100%
rename from java/src/common/worldgen/GeneratorCavern.java
rename to common/src/common/worldgen/GeneratorCavern.java
diff --git a/java/src/common/worldgen/GeneratorDebug.java b/common/src/common/worldgen/GeneratorDebug.java
similarity index 100%
rename from java/src/common/worldgen/GeneratorDebug.java
rename to common/src/common/worldgen/GeneratorDebug.java
diff --git a/java/src/common/worldgen/GeneratorDestroyed.java b/common/src/common/worldgen/GeneratorDestroyed.java
similarity index 100%
rename from java/src/common/worldgen/GeneratorDestroyed.java
rename to common/src/common/worldgen/GeneratorDestroyed.java
diff --git a/java/src/common/worldgen/GeneratorFlat.java b/common/src/common/worldgen/GeneratorFlat.java
similarity index 100%
rename from java/src/common/worldgen/GeneratorFlat.java
rename to common/src/common/worldgen/GeneratorFlat.java
diff --git a/java/src/common/worldgen/GeneratorIsland.java b/common/src/common/worldgen/GeneratorIsland.java
similarity index 100%
rename from java/src/common/worldgen/GeneratorIsland.java
rename to common/src/common/worldgen/GeneratorIsland.java
diff --git a/java/src/common/worldgen/GeneratorPerlin.java b/common/src/common/worldgen/GeneratorPerlin.java
similarity index 100%
rename from java/src/common/worldgen/GeneratorPerlin.java
rename to common/src/common/worldgen/GeneratorPerlin.java
diff --git a/java/src/common/worldgen/GeneratorSimple.java b/common/src/common/worldgen/GeneratorSimple.java
similarity index 100%
rename from java/src/common/worldgen/GeneratorSimple.java
rename to common/src/common/worldgen/GeneratorSimple.java
diff --git a/java/src/common/worldgen/LootConstants.java b/common/src/common/worldgen/LootConstants.java
similarity index 100%
rename from java/src/common/worldgen/LootConstants.java
rename to common/src/common/worldgen/LootConstants.java
diff --git a/java/src/common/worldgen/ReplacerAltBiome.java b/common/src/common/worldgen/ReplacerAltBiome.java
similarity index 100%
rename from java/src/common/worldgen/ReplacerAltBiome.java
rename to common/src/common/worldgen/ReplacerAltBiome.java
diff --git a/java/src/common/worldgen/ReplacerAltSurface.java b/common/src/common/worldgen/ReplacerAltSurface.java
similarity index 100%
rename from java/src/common/worldgen/ReplacerAltSurface.java
rename to common/src/common/worldgen/ReplacerAltSurface.java
diff --git a/java/src/common/worldgen/ReplacerBiome.java b/common/src/common/worldgen/ReplacerBiome.java
similarity index 100%
rename from java/src/common/worldgen/ReplacerBiome.java
rename to common/src/common/worldgen/ReplacerBiome.java
diff --git a/java/src/common/worldgen/ReplacerTopLayer.java b/common/src/common/worldgen/ReplacerTopLayer.java
similarity index 100%
rename from java/src/common/worldgen/ReplacerTopLayer.java
rename to common/src/common/worldgen/ReplacerTopLayer.java
diff --git a/java/src/common/worldgen/caves/MapGenBase.java b/common/src/common/worldgen/caves/MapGenBase.java
similarity index 100%
rename from java/src/common/worldgen/caves/MapGenBase.java
rename to common/src/common/worldgen/caves/MapGenBase.java
diff --git a/java/src/common/worldgen/caves/MapGenBigCaves.java b/common/src/common/worldgen/caves/MapGenBigCaves.java
similarity index 100%
rename from java/src/common/worldgen/caves/MapGenBigCaves.java
rename to common/src/common/worldgen/caves/MapGenBigCaves.java
diff --git a/java/src/common/worldgen/caves/MapGenCaves.java b/common/src/common/worldgen/caves/MapGenCaves.java
similarity index 100%
rename from java/src/common/worldgen/caves/MapGenCaves.java
rename to common/src/common/worldgen/caves/MapGenCaves.java
diff --git a/java/src/common/worldgen/caves/MapGenRavine.java b/common/src/common/worldgen/caves/MapGenRavine.java
similarity index 100%
rename from java/src/common/worldgen/caves/MapGenRavine.java
rename to common/src/common/worldgen/caves/MapGenRavine.java
diff --git a/java/src/common/worldgen/feature/WorldGenAbandonedChest.java b/common/src/common/worldgen/feature/WorldGenAbandonedChest.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenAbandonedChest.java
rename to common/src/common/worldgen/feature/WorldGenAbandonedChest.java
diff --git a/java/src/common/worldgen/feature/WorldGenAsteroid.java b/common/src/common/worldgen/feature/WorldGenAsteroid.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenAsteroid.java
rename to common/src/common/worldgen/feature/WorldGenAsteroid.java
diff --git a/java/src/common/worldgen/feature/WorldGenBlockBlob.java b/common/src/common/worldgen/feature/WorldGenBlockBlob.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenBlockBlob.java
rename to common/src/common/worldgen/feature/WorldGenBlockBlob.java
diff --git a/java/src/common/worldgen/feature/WorldGenClay.java b/common/src/common/worldgen/feature/WorldGenClay.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenClay.java
rename to common/src/common/worldgen/feature/WorldGenClay.java
diff --git a/java/src/common/worldgen/feature/WorldGenClayExt.java b/common/src/common/worldgen/feature/WorldGenClayExt.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenClayExt.java
rename to common/src/common/worldgen/feature/WorldGenClayExt.java
diff --git a/java/src/common/worldgen/feature/WorldGenDesertWells.java b/common/src/common/worldgen/feature/WorldGenDesertWells.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenDesertWells.java
rename to common/src/common/worldgen/feature/WorldGenDesertWells.java
diff --git a/java/src/common/worldgen/feature/WorldGenFire.java b/common/src/common/worldgen/feature/WorldGenFire.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenFire.java
rename to common/src/common/worldgen/feature/WorldGenFire.java
diff --git a/java/src/common/worldgen/feature/WorldGenGlowStone.java b/common/src/common/worldgen/feature/WorldGenGlowStone.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenGlowStone.java
rename to common/src/common/worldgen/feature/WorldGenGlowStone.java
diff --git a/java/src/common/worldgen/feature/WorldGenHellLava.java b/common/src/common/worldgen/feature/WorldGenHellLava.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenHellLava.java
rename to common/src/common/worldgen/feature/WorldGenHellLava.java
diff --git a/java/src/common/worldgen/feature/WorldGenIcePath.java b/common/src/common/worldgen/feature/WorldGenIcePath.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenIcePath.java
rename to common/src/common/worldgen/feature/WorldGenIcePath.java
diff --git a/java/src/common/worldgen/feature/WorldGenIceSpike.java b/common/src/common/worldgen/feature/WorldGenIceSpike.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenIceSpike.java
rename to common/src/common/worldgen/feature/WorldGenIceSpike.java
diff --git a/java/src/common/worldgen/feature/WorldGenSand.java b/common/src/common/worldgen/feature/WorldGenSand.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenSand.java
rename to common/src/common/worldgen/feature/WorldGenSand.java
diff --git a/java/src/common/worldgen/feature/WorldGenSpikes.java b/common/src/common/worldgen/feature/WorldGenSpikes.java
similarity index 100%
rename from java/src/common/worldgen/feature/WorldGenSpikes.java
rename to common/src/common/worldgen/feature/WorldGenSpikes.java
diff --git a/java/src/common/worldgen/foliage/FeatureDoublePlant.java b/common/src/common/worldgen/foliage/FeatureDoublePlant.java
similarity index 100%
rename from java/src/common/worldgen/foliage/FeatureDoublePlant.java
rename to common/src/common/worldgen/foliage/FeatureDoublePlant.java
diff --git a/java/src/common/worldgen/foliage/WorldGenBigMushroom.java b/common/src/common/worldgen/foliage/WorldGenBigMushroom.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenBigMushroom.java
rename to common/src/common/worldgen/foliage/WorldGenBigMushroom.java
diff --git a/java/src/common/worldgen/foliage/WorldGenCactus.java b/common/src/common/worldgen/foliage/WorldGenCactus.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenCactus.java
rename to common/src/common/worldgen/foliage/WorldGenCactus.java
diff --git a/java/src/common/worldgen/foliage/WorldGenDeadBush.java b/common/src/common/worldgen/foliage/WorldGenDeadBush.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenDeadBush.java
rename to common/src/common/worldgen/foliage/WorldGenDeadBush.java
diff --git a/java/src/common/worldgen/foliage/WorldGenFlowers.java b/common/src/common/worldgen/foliage/WorldGenFlowers.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenFlowers.java
rename to common/src/common/worldgen/foliage/WorldGenFlowers.java
diff --git a/java/src/common/worldgen/foliage/WorldGenMelon.java b/common/src/common/worldgen/foliage/WorldGenMelon.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenMelon.java
rename to common/src/common/worldgen/foliage/WorldGenMelon.java
diff --git a/java/src/common/worldgen/foliage/WorldGenMushroom.java b/common/src/common/worldgen/foliage/WorldGenMushroom.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenMushroom.java
rename to common/src/common/worldgen/foliage/WorldGenMushroom.java
diff --git a/java/src/common/worldgen/foliage/WorldGenPumpkin.java b/common/src/common/worldgen/foliage/WorldGenPumpkin.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenPumpkin.java
rename to common/src/common/worldgen/foliage/WorldGenPumpkin.java
diff --git a/java/src/common/worldgen/foliage/WorldGenReed.java b/common/src/common/worldgen/foliage/WorldGenReed.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenReed.java
rename to common/src/common/worldgen/foliage/WorldGenReed.java
diff --git a/java/src/common/worldgen/foliage/WorldGenShrub.java b/common/src/common/worldgen/foliage/WorldGenShrub.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenShrub.java
rename to common/src/common/worldgen/foliage/WorldGenShrub.java
diff --git a/java/src/common/worldgen/foliage/WorldGenTallGrass.java b/common/src/common/worldgen/foliage/WorldGenTallGrass.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenTallGrass.java
rename to common/src/common/worldgen/foliage/WorldGenTallGrass.java
diff --git a/java/src/common/worldgen/foliage/WorldGenVines.java b/common/src/common/worldgen/foliage/WorldGenVines.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenVines.java
rename to common/src/common/worldgen/foliage/WorldGenVines.java
diff --git a/java/src/common/worldgen/foliage/WorldGenWaterlily.java b/common/src/common/worldgen/foliage/WorldGenWaterlily.java
similarity index 100%
rename from java/src/common/worldgen/foliage/WorldGenWaterlily.java
rename to common/src/common/worldgen/foliage/WorldGenWaterlily.java
diff --git a/java/src/common/worldgen/layer/GenLayer.java b/common/src/common/worldgen/layer/GenLayer.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayer.java
rename to common/src/common/worldgen/layer/GenLayer.java
diff --git a/java/src/common/worldgen/layer/GenLayerAddAreas.java b/common/src/common/worldgen/layer/GenLayerAddAreas.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerAddAreas.java
rename to common/src/common/worldgen/layer/GenLayerAddAreas.java
diff --git a/java/src/common/worldgen/layer/GenLayerAddExtra.java b/common/src/common/worldgen/layer/GenLayerAddExtra.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerAddExtra.java
rename to common/src/common/worldgen/layer/GenLayerAddExtra.java
diff --git a/java/src/common/worldgen/layer/GenLayerAddSea.java b/common/src/common/worldgen/layer/GenLayerAddSea.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerAddSea.java
rename to common/src/common/worldgen/layer/GenLayerAddSea.java
diff --git a/java/src/common/worldgen/layer/GenLayerAddSnow.java b/common/src/common/worldgen/layer/GenLayerAddSnow.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerAddSnow.java
rename to common/src/common/worldgen/layer/GenLayerAddSnow.java
diff --git a/java/src/common/worldgen/layer/GenLayerBase.java b/common/src/common/worldgen/layer/GenLayerBase.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerBase.java
rename to common/src/common/worldgen/layer/GenLayerBase.java
diff --git a/java/src/common/worldgen/layer/GenLayerBiome.java b/common/src/common/worldgen/layer/GenLayerBiome.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerBiome.java
rename to common/src/common/worldgen/layer/GenLayerBiome.java
diff --git a/java/src/common/worldgen/layer/GenLayerBiomeEdge.java b/common/src/common/worldgen/layer/GenLayerBiomeEdge.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerBiomeEdge.java
rename to common/src/common/worldgen/layer/GenLayerBiomeEdge.java
diff --git a/java/src/common/worldgen/layer/GenLayerEdge.java b/common/src/common/worldgen/layer/GenLayerEdge.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerEdge.java
rename to common/src/common/worldgen/layer/GenLayerEdge.java
diff --git a/java/src/common/worldgen/layer/GenLayerFuzzyZoom.java b/common/src/common/worldgen/layer/GenLayerFuzzyZoom.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerFuzzyZoom.java
rename to common/src/common/worldgen/layer/GenLayerFuzzyZoom.java
diff --git a/java/src/common/worldgen/layer/GenLayerHills.java b/common/src/common/worldgen/layer/GenLayerHills.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerHills.java
rename to common/src/common/worldgen/layer/GenLayerHills.java
diff --git a/java/src/common/worldgen/layer/GenLayerRemoveEmpty.java b/common/src/common/worldgen/layer/GenLayerRemoveEmpty.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerRemoveEmpty.java
rename to common/src/common/worldgen/layer/GenLayerRemoveEmpty.java
diff --git a/java/src/common/worldgen/layer/GenLayerRiver.java b/common/src/common/worldgen/layer/GenLayerRiver.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerRiver.java
rename to common/src/common/worldgen/layer/GenLayerRiver.java
diff --git a/java/src/common/worldgen/layer/GenLayerRiverInit.java b/common/src/common/worldgen/layer/GenLayerRiverInit.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerRiverInit.java
rename to common/src/common/worldgen/layer/GenLayerRiverInit.java
diff --git a/java/src/common/worldgen/layer/GenLayerRiverMix.java b/common/src/common/worldgen/layer/GenLayerRiverMix.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerRiverMix.java
rename to common/src/common/worldgen/layer/GenLayerRiverMix.java
diff --git a/java/src/common/worldgen/layer/GenLayerShore.java b/common/src/common/worldgen/layer/GenLayerShore.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerShore.java
rename to common/src/common/worldgen/layer/GenLayerShore.java
diff --git a/java/src/common/worldgen/layer/GenLayerSmooth.java b/common/src/common/worldgen/layer/GenLayerSmooth.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerSmooth.java
rename to common/src/common/worldgen/layer/GenLayerSmooth.java
diff --git a/java/src/common/worldgen/layer/GenLayerVoronoiZoom.java b/common/src/common/worldgen/layer/GenLayerVoronoiZoom.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerVoronoiZoom.java
rename to common/src/common/worldgen/layer/GenLayerVoronoiZoom.java
diff --git a/java/src/common/worldgen/layer/GenLayerZoom.java b/common/src/common/worldgen/layer/GenLayerZoom.java
similarity index 100%
rename from java/src/common/worldgen/layer/GenLayerZoom.java
rename to common/src/common/worldgen/layer/GenLayerZoom.java
diff --git a/java/src/common/worldgen/layer/IntCache.java b/common/src/common/worldgen/layer/IntCache.java
similarity index 100%
rename from java/src/common/worldgen/layer/IntCache.java
rename to common/src/common/worldgen/layer/IntCache.java
diff --git a/java/src/common/worldgen/structure/MapGenBridge.java b/common/src/common/worldgen/structure/MapGenBridge.java
similarity index 100%
rename from java/src/common/worldgen/structure/MapGenBridge.java
rename to common/src/common/worldgen/structure/MapGenBridge.java
diff --git a/java/src/common/worldgen/structure/MapGenMineshaft.java b/common/src/common/worldgen/structure/MapGenMineshaft.java
similarity index 100%
rename from java/src/common/worldgen/structure/MapGenMineshaft.java
rename to common/src/common/worldgen/structure/MapGenMineshaft.java
diff --git a/java/src/common/worldgen/structure/MapGenScatteredFeature.java b/common/src/common/worldgen/structure/MapGenScatteredFeature.java
similarity index 100%
rename from java/src/common/worldgen/structure/MapGenScatteredFeature.java
rename to common/src/common/worldgen/structure/MapGenScatteredFeature.java
diff --git a/java/src/common/worldgen/structure/MapGenStronghold.java b/common/src/common/worldgen/structure/MapGenStronghold.java
similarity index 100%
rename from java/src/common/worldgen/structure/MapGenStronghold.java
rename to common/src/common/worldgen/structure/MapGenStronghold.java
diff --git a/java/src/common/worldgen/structure/MapGenStructure.java b/common/src/common/worldgen/structure/MapGenStructure.java
similarity index 100%
rename from java/src/common/worldgen/structure/MapGenStructure.java
rename to common/src/common/worldgen/structure/MapGenStructure.java
diff --git a/java/src/common/worldgen/structure/MapGenStructureIO.java b/common/src/common/worldgen/structure/MapGenStructureIO.java
similarity index 100%
rename from java/src/common/worldgen/structure/MapGenStructureIO.java
rename to common/src/common/worldgen/structure/MapGenStructureIO.java
diff --git a/java/src/common/worldgen/structure/MapGenVillage.java b/common/src/common/worldgen/structure/MapGenVillage.java
similarity index 100%
rename from java/src/common/worldgen/structure/MapGenVillage.java
rename to common/src/common/worldgen/structure/MapGenVillage.java
diff --git a/java/src/common/worldgen/structure/StructureBoundingBox.java b/common/src/common/worldgen/structure/StructureBoundingBox.java
similarity index 100%
rename from java/src/common/worldgen/structure/StructureBoundingBox.java
rename to common/src/common/worldgen/structure/StructureBoundingBox.java
diff --git a/java/src/common/worldgen/structure/StructureBridge.java b/common/src/common/worldgen/structure/StructureBridge.java
similarity index 100%
rename from java/src/common/worldgen/structure/StructureBridge.java
rename to common/src/common/worldgen/structure/StructureBridge.java
diff --git a/java/src/common/worldgen/structure/StructureComponent.java b/common/src/common/worldgen/structure/StructureComponent.java
similarity index 100%
rename from java/src/common/worldgen/structure/StructureComponent.java
rename to common/src/common/worldgen/structure/StructureComponent.java
diff --git a/java/src/common/worldgen/structure/StructureMineshaft.java b/common/src/common/worldgen/structure/StructureMineshaft.java
similarity index 100%
rename from java/src/common/worldgen/structure/StructureMineshaft.java
rename to common/src/common/worldgen/structure/StructureMineshaft.java
diff --git a/java/src/common/worldgen/structure/StructureMineshaftStart.java b/common/src/common/worldgen/structure/StructureMineshaftStart.java
similarity index 100%
rename from java/src/common/worldgen/structure/StructureMineshaftStart.java
rename to common/src/common/worldgen/structure/StructureMineshaftStart.java
diff --git a/java/src/common/worldgen/structure/StructureScattered.java b/common/src/common/worldgen/structure/StructureScattered.java
similarity index 100%
rename from java/src/common/worldgen/structure/StructureScattered.java
rename to common/src/common/worldgen/structure/StructureScattered.java
diff --git a/java/src/common/worldgen/structure/StructureStart.java b/common/src/common/worldgen/structure/StructureStart.java
similarity index 100%
rename from java/src/common/worldgen/structure/StructureStart.java
rename to common/src/common/worldgen/structure/StructureStart.java
diff --git a/java/src/common/worldgen/structure/StructureStronghold.java b/common/src/common/worldgen/structure/StructureStronghold.java
similarity index 100%
rename from java/src/common/worldgen/structure/StructureStronghold.java
rename to common/src/common/worldgen/structure/StructureStronghold.java
diff --git a/java/src/common/worldgen/structure/StructureVillage.java b/common/src/common/worldgen/structure/StructureVillage.java
similarity index 100%
rename from java/src/common/worldgen/structure/StructureVillage.java
rename to common/src/common/worldgen/structure/StructureVillage.java
diff --git a/java/src/common/worldgen/tree/WorldGenBaseTree.java b/common/src/common/worldgen/tree/WorldGenBaseTree.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenBaseTree.java
rename to common/src/common/worldgen/tree/WorldGenBaseTree.java
diff --git a/java/src/common/worldgen/tree/WorldGenBigTree.java b/common/src/common/worldgen/tree/WorldGenBigTree.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenBigTree.java
rename to common/src/common/worldgen/tree/WorldGenBigTree.java
diff --git a/java/src/common/worldgen/tree/WorldGenBirch.java b/common/src/common/worldgen/tree/WorldGenBirch.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenBirch.java
rename to common/src/common/worldgen/tree/WorldGenBirch.java
diff --git a/java/src/common/worldgen/tree/WorldGenDarkOak.java b/common/src/common/worldgen/tree/WorldGenDarkOak.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenDarkOak.java
rename to common/src/common/worldgen/tree/WorldGenDarkOak.java
diff --git a/java/src/common/worldgen/tree/WorldGenHugeTree.java b/common/src/common/worldgen/tree/WorldGenHugeTree.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenHugeTree.java
rename to common/src/common/worldgen/tree/WorldGenHugeTree.java
diff --git a/java/src/common/worldgen/tree/WorldGenJungle.java b/common/src/common/worldgen/tree/WorldGenJungle.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenJungle.java
rename to common/src/common/worldgen/tree/WorldGenJungle.java
diff --git a/java/src/common/worldgen/tree/WorldGenPine.java b/common/src/common/worldgen/tree/WorldGenPine.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenPine.java
rename to common/src/common/worldgen/tree/WorldGenPine.java
diff --git a/java/src/common/worldgen/tree/WorldGenSavanna.java b/common/src/common/worldgen/tree/WorldGenSavanna.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenSavanna.java
rename to common/src/common/worldgen/tree/WorldGenSavanna.java
diff --git a/java/src/common/worldgen/tree/WorldGenSwamp.java b/common/src/common/worldgen/tree/WorldGenSwamp.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenSwamp.java
rename to common/src/common/worldgen/tree/WorldGenSwamp.java
diff --git a/java/src/common/worldgen/tree/WorldGenTaiga1.java b/common/src/common/worldgen/tree/WorldGenTaiga1.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenTaiga1.java
rename to common/src/common/worldgen/tree/WorldGenTaiga1.java
diff --git a/java/src/common/worldgen/tree/WorldGenTaiga2.java b/common/src/common/worldgen/tree/WorldGenTaiga2.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenTaiga2.java
rename to common/src/common/worldgen/tree/WorldGenTaiga2.java
diff --git a/java/src/common/worldgen/tree/WorldGenTree.java b/common/src/common/worldgen/tree/WorldGenTree.java
similarity index 100%
rename from java/src/common/worldgen/tree/WorldGenTree.java
rename to common/src/common/worldgen/tree/WorldGenTree.java