diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/api/java/cofh/api/CoFHAPIProps.java
similarity index 100%
rename from src/main/java/cofh/api/CoFHAPIProps.java
rename to src/api/java/cofh/api/CoFHAPIProps.java
diff --git a/src/main/java/cofh/api/energy/EnergyStorage.java b/src/api/java/cofh/api/energy/EnergyStorage.java
similarity index 100%
rename from src/main/java/cofh/api/energy/EnergyStorage.java
rename to src/api/java/cofh/api/energy/EnergyStorage.java
diff --git a/src/main/java/cofh/api/energy/IEnergyConnection.java b/src/api/java/cofh/api/energy/IEnergyConnection.java
similarity index 100%
rename from src/main/java/cofh/api/energy/IEnergyConnection.java
rename to src/api/java/cofh/api/energy/IEnergyConnection.java
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/cofh/api/energy/IEnergyHandler.java b/src/api/java/cofh/api/energy/IEnergyHandler.java
similarity index 100%
rename from src/main/java/cofh/api/energy/IEnergyHandler.java
rename to src/api/java/cofh/api/energy/IEnergyHandler.java
diff --git a/src/main/java/cofh/api/energy/IEnergyProvider.java b/src/api/java/cofh/api/energy/IEnergyProvider.java
similarity index 100%
rename from src/main/java/cofh/api/energy/IEnergyProvider.java
rename to src/api/java/cofh/api/energy/IEnergyProvider.java
diff --git a/src/main/java/cofh/api/energy/IEnergyReceiver.java b/src/api/java/cofh/api/energy/IEnergyReceiver.java
similarity index 100%
rename from src/main/java/cofh/api/energy/IEnergyReceiver.java
rename to src/api/java/cofh/api/energy/IEnergyReceiver.java
diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/api/java/cofh/api/energy/IEnergyStorage.java
similarity index 100%
rename from src/main/java/cofh/api/energy/IEnergyStorage.java
rename to src/api/java/cofh/api/energy/IEnergyStorage.java
diff --git a/src/main/java/cofh/api/energy/ItemEnergyContainer.java b/src/api/java/cofh/api/energy/ItemEnergyContainer.java
similarity index 100%
rename from src/main/java/cofh/api/energy/ItemEnergyContainer.java
rename to src/api/java/cofh/api/energy/ItemEnergyContainer.java
diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/api/java/cofh/api/energy/TileEnergyHandler.java
similarity index 100%
rename from src/main/java/cofh/api/energy/TileEnergyHandler.java
rename to src/api/java/cofh/api/energy/TileEnergyHandler.java
diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/api/java/cofh/api/energy/package-info.java
similarity index 100%
rename from src/main/java/cofh/api/energy/package-info.java
rename to src/api/java/cofh/api/energy/package-info.java
diff --git a/src/main/java/cofh/api/package-info.java b/src/api/java/cofh/api/package-info.java
similarity index 100%
rename from src/main/java/cofh/api/package-info.java
rename to src/api/java/cofh/api/package-info.java
diff --git a/src/main/java/invtweaks/api/IItemTree.java b/src/api/java/invtweaks/api/IItemTree.java
similarity index 100%
rename from src/main/java/invtweaks/api/IItemTree.java
rename to src/api/java/invtweaks/api/IItemTree.java
diff --git a/src/main/java/invtweaks/api/IItemTreeCategory.java b/src/api/java/invtweaks/api/IItemTreeCategory.java
similarity index 100%
rename from src/main/java/invtweaks/api/IItemTreeCategory.java
rename to src/api/java/invtweaks/api/IItemTreeCategory.java
diff --git a/src/main/java/invtweaks/api/IItemTreeItem.java b/src/api/java/invtweaks/api/IItemTreeItem.java
similarity index 100%
rename from src/main/java/invtweaks/api/IItemTreeItem.java
rename to src/api/java/invtweaks/api/IItemTreeItem.java
diff --git a/src/main/java/invtweaks/api/IItemTreeListener.java b/src/api/java/invtweaks/api/IItemTreeListener.java
similarity index 100%
rename from src/main/java/invtweaks/api/IItemTreeListener.java
rename to src/api/java/invtweaks/api/IItemTreeListener.java
diff --git a/src/main/java/invtweaks/api/InvTweaksAPI.java b/src/api/java/invtweaks/api/InvTweaksAPI.java
similarity index 100%
rename from src/main/java/invtweaks/api/InvTweaksAPI.java
rename to src/api/java/invtweaks/api/InvTweaksAPI.java
diff --git a/src/main/java/invtweaks/api/SortingMethod.java b/src/api/java/invtweaks/api/SortingMethod.java
similarity index 100%
rename from src/main/java/invtweaks/api/SortingMethod.java
rename to src/api/java/invtweaks/api/SortingMethod.java
diff --git a/src/main/java/invtweaks/api/container/ChestContainer.java b/src/api/java/invtweaks/api/container/ChestContainer.java
similarity index 100%
rename from src/main/java/invtweaks/api/container/ChestContainer.java
rename to src/api/java/invtweaks/api/container/ChestContainer.java
diff --git a/src/main/java/invtweaks/api/container/ContainerSection.java b/src/api/java/invtweaks/api/container/ContainerSection.java
similarity index 100%
rename from src/main/java/invtweaks/api/container/ContainerSection.java
rename to src/api/java/invtweaks/api/container/ContainerSection.java
diff --git a/src/main/java/invtweaks/api/container/ContainerSectionCallback.java b/src/api/java/invtweaks/api/container/ContainerSectionCallback.java
similarity index 100%
rename from src/main/java/invtweaks/api/container/ContainerSectionCallback.java
rename to src/api/java/invtweaks/api/container/ContainerSectionCallback.java
diff --git a/src/main/java/invtweaks/api/container/IgnoreContainer.java b/src/api/java/invtweaks/api/container/IgnoreContainer.java
similarity index 100%
rename from src/main/java/invtweaks/api/container/IgnoreContainer.java
rename to src/api/java/invtweaks/api/container/IgnoreContainer.java
diff --git a/src/main/java/invtweaks/api/container/InventoryContainer.java b/src/api/java/invtweaks/api/container/InventoryContainer.java
similarity index 100%
rename from src/main/java/invtweaks/api/container/InventoryContainer.java
rename to src/api/java/invtweaks/api/container/InventoryContainer.java