diff --git a/src/main/java/cofh/api/energy/IEnergyContainerItem.java b/src/api/java/cofh/api/energy/IEnergyContainerItem.java
similarity index 100%
rename from src/main/java/cofh/api/energy/IEnergyContainerItem.java
rename to src/api/java/cofh/api/energy/IEnergyContainerItem.java
diff --git a/src/main/java/ic2/api/item/IBoxable.java b/src/api/java/ic2/api/item/IBoxable.java
similarity index 100%
rename from src/main/java/ic2/api/item/IBoxable.java
rename to src/api/java/ic2/api/item/IBoxable.java
diff --git a/src/main/java/ic2/api/item/ICustomElectricItem.java b/src/api/java/ic2/api/item/ICustomElectricItem.java
similarity index 100%
rename from src/main/java/ic2/api/item/ICustomElectricItem.java
rename to src/api/java/ic2/api/item/ICustomElectricItem.java
diff --git a/src/main/java/ic2/api/item/IElectricItem.java b/src/api/java/ic2/api/item/IElectricItem.java
similarity index 100%
rename from src/main/java/ic2/api/item/IElectricItem.java
rename to src/api/java/ic2/api/item/IElectricItem.java
diff --git a/src/main/java/ic2/api/item/IElectricItemManager.java b/src/api/java/ic2/api/item/IElectricItemManager.java
similarity index 100%
rename from src/main/java/ic2/api/item/IElectricItemManager.java
rename to src/api/java/ic2/api/item/IElectricItemManager.java
diff --git a/src/main/java/ic2/api/item/ISpecialElectricItem.java b/src/api/java/ic2/api/item/ISpecialElectricItem.java
similarity index 100%
rename from src/main/java/ic2/api/item/ISpecialElectricItem.java
rename to src/api/java/ic2/api/item/ISpecialElectricItem.java
diff --git a/src/main/java/ic2/api/item/Items.java b/src/api/java/ic2/api/item/Items.java
similarity index 100%
rename from src/main/java/ic2/api/item/Items.java
rename to src/api/java/ic2/api/item/Items.java
diff --git a/src/main/java/mcp/mobius/waila/api/IWailaBlock.java b/src/api/java/mcp/mobius/waila/api/IWailaBlock.java
similarity index 100%
rename from src/main/java/mcp/mobius/waila/api/IWailaBlock.java
rename to src/api/java/mcp/mobius/waila/api/IWailaBlock.java
diff --git a/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java b/src/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java
similarity index 100%
rename from src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java
rename to src/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java
diff --git a/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java
similarity index 100%
rename from src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java
rename to src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java
diff --git a/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java b/src/api/java/mcp/mobius/waila/api/IWailaDataProvider.java
similarity index 100%
rename from src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java
rename to src/api/java/mcp/mobius/waila/api/IWailaDataProvider.java
diff --git a/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java b/src/api/java/mcp/mobius/waila/api/IWailaRegistrar.java
similarity index 100%
rename from src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java
rename to src/api/java/mcp/mobius/waila/api/IWailaRegistrar.java
diff --git a/src/main/java/mods/battlegear2/api/IDyable.java b/src/api/java/mods/battlegear2/api/IDyable.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/IDyable.java
rename to src/api/java/mods/battlegear2/api/IDyable.java
diff --git a/src/main/java/mods/battlegear2/api/IShield.java b/src/api/java/mods/battlegear2/api/IShield.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/IShield.java
rename to src/api/java/mods/battlegear2/api/IShield.java
diff --git a/src/main/java/mods/battlegear2/api/PlayerEventChild.java b/src/api/java/mods/battlegear2/api/PlayerEventChild.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/PlayerEventChild.java
rename to src/api/java/mods/battlegear2/api/PlayerEventChild.java
diff --git a/src/main/java/mods/battlegear2/api/quiver/IArrowContainer2.java b/src/api/java/mods/battlegear2/api/quiver/IArrowContainer2.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/quiver/IArrowContainer2.java
rename to src/api/java/mods/battlegear2/api/quiver/IArrowContainer2.java
diff --git a/src/main/java/mods/battlegear2/api/quiver/QuiverArrowEvent.java b/src/api/java/mods/battlegear2/api/quiver/QuiverArrowEvent.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/quiver/QuiverArrowEvent.java
rename to src/api/java/mods/battlegear2/api/quiver/QuiverArrowEvent.java
diff --git a/src/main/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java b/src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java
rename to src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java
diff --git a/src/main/java/mods/battlegear2/api/weapons/IBackStabbable.java b/src/api/java/mods/battlegear2/api/weapons/IBackStabbable.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/weapons/IBackStabbable.java
rename to src/api/java/mods/battlegear2/api/weapons/IBackStabbable.java
diff --git a/src/main/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java
rename to src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java
diff --git a/src/main/java/mods/battlegear2/api/weapons/IExtendedReachWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IExtendedReachWeapon.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/weapons/IExtendedReachWeapon.java
rename to src/api/java/mods/battlegear2/api/weapons/IExtendedReachWeapon.java
diff --git a/src/main/java/mods/battlegear2/api/weapons/IHitTimeModifier.java b/src/api/java/mods/battlegear2/api/weapons/IHitTimeModifier.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/weapons/IHitTimeModifier.java
rename to src/api/java/mods/battlegear2/api/weapons/IHitTimeModifier.java
diff --git a/src/main/java/mods/battlegear2/api/weapons/IPenetrateWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IPenetrateWeapon.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/weapons/IPenetrateWeapon.java
rename to src/api/java/mods/battlegear2/api/weapons/IPenetrateWeapon.java
diff --git a/src/main/java/mods/battlegear2/api/weapons/IPotionEffect.java b/src/api/java/mods/battlegear2/api/weapons/IPotionEffect.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/weapons/IPotionEffect.java
rename to src/api/java/mods/battlegear2/api/weapons/IPotionEffect.java
diff --git a/src/main/java/mods/battlegear2/api/weapons/ISpecialEffect.java b/src/api/java/mods/battlegear2/api/weapons/ISpecialEffect.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/weapons/ISpecialEffect.java
rename to src/api/java/mods/battlegear2/api/weapons/ISpecialEffect.java
diff --git a/src/main/java/mods/battlegear2/api/weapons/OffhandAttackEvent.java b/src/api/java/mods/battlegear2/api/weapons/OffhandAttackEvent.java
similarity index 100%
rename from src/main/java/mods/battlegear2/api/weapons/OffhandAttackEvent.java
rename to src/api/java/mods/battlegear2/api/weapons/OffhandAttackEvent.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java b/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/FertilizerType.java b/src/api/java/powercrystals/minefactoryreloaded/api/FertilizerType.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/FertilizerType.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/FertilizerType.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/HarvestType.java b/src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/HarvestType.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java b/src/api/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java b/src/api/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/ISyringe.java b/src/api/java/powercrystals/minefactoryreloaded/api/ISyringe.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/ISyringe.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/ISyringe.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IToolHammer.java b/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammer.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IToolHammer.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IToolHammer.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java b/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/MobDrop.java b/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/MobDrop.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/RanchedItem.java b/src/api/java/powercrystals/minefactoryreloaded/api/RanchedItem.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/RanchedItem.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/RanchedItem.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/RandomMob.java b/src/api/java/powercrystals/minefactoryreloaded/api/RandomMob.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/RandomMob.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/RandomMob.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java
diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java
similarity index 100%
rename from src/main/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java
rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java