diff --git a/src/api/java/appeng/api/AEApi.java b/api/src/main/java/appeng/api/AEApi.java
similarity index 100%
rename from src/api/java/appeng/api/AEApi.java
rename to api/src/main/java/appeng/api/AEApi.java
diff --git a/src/api/java/appeng/api/AEInjectable.java b/api/src/main/java/appeng/api/AEInjectable.java
similarity index 100%
rename from src/api/java/appeng/api/AEInjectable.java
rename to api/src/main/java/appeng/api/AEInjectable.java
diff --git a/src/api/java/appeng/api/AEPlugin.java b/api/src/main/java/appeng/api/AEPlugin.java
similarity index 100%
rename from src/api/java/appeng/api/AEPlugin.java
rename to api/src/main/java/appeng/api/AEPlugin.java
diff --git a/src/api/java/appeng/api/IAppEngApi.java b/api/src/main/java/appeng/api/IAppEngApi.java
similarity index 100%
rename from src/api/java/appeng/api/IAppEngApi.java
rename to api/src/main/java/appeng/api/IAppEngApi.java
diff --git a/src/api/java/appeng/api/LICENSE b/api/src/main/java/appeng/api/LICENSE
similarity index 100%
rename from src/api/java/appeng/api/LICENSE
rename to api/src/main/java/appeng/api/LICENSE
diff --git a/src/api/java/appeng/api/config/AccessRestriction.java b/api/src/main/java/appeng/api/config/AccessRestriction.java
similarity index 100%
rename from src/api/java/appeng/api/config/AccessRestriction.java
rename to api/src/main/java/appeng/api/config/AccessRestriction.java
diff --git a/src/api/java/appeng/api/config/ActionItems.java b/api/src/main/java/appeng/api/config/ActionItems.java
similarity index 100%
rename from src/api/java/appeng/api/config/ActionItems.java
rename to api/src/main/java/appeng/api/config/ActionItems.java
diff --git a/src/api/java/appeng/api/config/Actionable.java b/api/src/main/java/appeng/api/config/Actionable.java
similarity index 100%
rename from src/api/java/appeng/api/config/Actionable.java
rename to api/src/main/java/appeng/api/config/Actionable.java
diff --git a/src/api/java/appeng/api/config/CondenserOutput.java b/api/src/main/java/appeng/api/config/CondenserOutput.java
similarity index 100%
rename from src/api/java/appeng/api/config/CondenserOutput.java
rename to api/src/main/java/appeng/api/config/CondenserOutput.java
diff --git a/src/api/java/appeng/api/config/CopyMode.java b/api/src/main/java/appeng/api/config/CopyMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/CopyMode.java
rename to api/src/main/java/appeng/api/config/CopyMode.java
diff --git a/src/api/java/appeng/api/config/FullnessMode.java b/api/src/main/java/appeng/api/config/FullnessMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/FullnessMode.java
rename to api/src/main/java/appeng/api/config/FullnessMode.java
diff --git a/src/api/java/appeng/api/config/FuzzyMode.java b/api/src/main/java/appeng/api/config/FuzzyMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/FuzzyMode.java
rename to api/src/main/java/appeng/api/config/FuzzyMode.java
diff --git a/src/api/java/appeng/api/config/IncludeExclude.java b/api/src/main/java/appeng/api/config/IncludeExclude.java
similarity index 100%
rename from src/api/java/appeng/api/config/IncludeExclude.java
rename to api/src/main/java/appeng/api/config/IncludeExclude.java
diff --git a/src/api/java/appeng/api/config/LevelEmitterMode.java b/api/src/main/java/appeng/api/config/LevelEmitterMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/LevelEmitterMode.java
rename to api/src/main/java/appeng/api/config/LevelEmitterMode.java
diff --git a/src/api/java/appeng/api/config/LevelType.java b/api/src/main/java/appeng/api/config/LevelType.java
similarity index 100%
rename from src/api/java/appeng/api/config/LevelType.java
rename to api/src/main/java/appeng/api/config/LevelType.java
diff --git a/src/api/java/appeng/api/config/ModSettings.java b/api/src/main/java/appeng/api/config/ModSettings.java
similarity index 100%
rename from src/api/java/appeng/api/config/ModSettings.java
rename to api/src/main/java/appeng/api/config/ModSettings.java
diff --git a/src/api/java/appeng/api/config/NetworkEmitterMode.java b/api/src/main/java/appeng/api/config/NetworkEmitterMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/NetworkEmitterMode.java
rename to api/src/main/java/appeng/api/config/NetworkEmitterMode.java
diff --git a/src/api/java/appeng/api/config/OperationMode.java b/api/src/main/java/appeng/api/config/OperationMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/OperationMode.java
rename to api/src/main/java/appeng/api/config/OperationMode.java
diff --git a/src/api/java/appeng/api/config/OutputMode.java b/api/src/main/java/appeng/api/config/OutputMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/OutputMode.java
rename to api/src/main/java/appeng/api/config/OutputMode.java
diff --git a/src/api/java/appeng/api/config/PowerMultiplier.java b/api/src/main/java/appeng/api/config/PowerMultiplier.java
similarity index 100%
rename from src/api/java/appeng/api/config/PowerMultiplier.java
rename to api/src/main/java/appeng/api/config/PowerMultiplier.java
diff --git a/src/api/java/appeng/api/config/PowerUnits.java b/api/src/main/java/appeng/api/config/PowerUnits.java
similarity index 100%
rename from src/api/java/appeng/api/config/PowerUnits.java
rename to api/src/main/java/appeng/api/config/PowerUnits.java
diff --git a/src/api/java/appeng/api/config/RedstoneMode.java b/api/src/main/java/appeng/api/config/RedstoneMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/RedstoneMode.java
rename to api/src/main/java/appeng/api/config/RedstoneMode.java
diff --git a/src/api/java/appeng/api/config/RelativeDirection.java b/api/src/main/java/appeng/api/config/RelativeDirection.java
similarity index 100%
rename from src/api/java/appeng/api/config/RelativeDirection.java
rename to api/src/main/java/appeng/api/config/RelativeDirection.java
diff --git a/src/api/java/appeng/api/config/SchedulingMode.java b/api/src/main/java/appeng/api/config/SchedulingMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/SchedulingMode.java
rename to api/src/main/java/appeng/api/config/SchedulingMode.java
diff --git a/src/api/java/appeng/api/config/SearchBoxMode.java b/api/src/main/java/appeng/api/config/SearchBoxMode.java
similarity index 100%
rename from src/api/java/appeng/api/config/SearchBoxMode.java
rename to api/src/main/java/appeng/api/config/SearchBoxMode.java
diff --git a/src/api/java/appeng/api/config/SecurityPermissions.java b/api/src/main/java/appeng/api/config/SecurityPermissions.java
similarity index 100%
rename from src/api/java/appeng/api/config/SecurityPermissions.java
rename to api/src/main/java/appeng/api/config/SecurityPermissions.java
diff --git a/src/api/java/appeng/api/config/Settings.java b/api/src/main/java/appeng/api/config/Settings.java
similarity index 100%
rename from src/api/java/appeng/api/config/Settings.java
rename to api/src/main/java/appeng/api/config/Settings.java
diff --git a/src/api/java/appeng/api/config/SortDir.java b/api/src/main/java/appeng/api/config/SortDir.java
similarity index 100%
rename from src/api/java/appeng/api/config/SortDir.java
rename to api/src/main/java/appeng/api/config/SortDir.java
diff --git a/src/api/java/appeng/api/config/SortOrder.java b/api/src/main/java/appeng/api/config/SortOrder.java
similarity index 100%
rename from src/api/java/appeng/api/config/SortOrder.java
rename to api/src/main/java/appeng/api/config/SortOrder.java
diff --git a/src/api/java/appeng/api/config/StorageFilter.java b/api/src/main/java/appeng/api/config/StorageFilter.java
similarity index 100%
rename from src/api/java/appeng/api/config/StorageFilter.java
rename to api/src/main/java/appeng/api/config/StorageFilter.java
diff --git a/src/api/java/appeng/api/config/TerminalStyle.java b/api/src/main/java/appeng/api/config/TerminalStyle.java
similarity index 100%
rename from src/api/java/appeng/api/config/TerminalStyle.java
rename to api/src/main/java/appeng/api/config/TerminalStyle.java
diff --git a/src/api/java/appeng/api/config/TunnelType.java b/api/src/main/java/appeng/api/config/TunnelType.java
similarity index 100%
rename from src/api/java/appeng/api/config/TunnelType.java
rename to api/src/main/java/appeng/api/config/TunnelType.java
diff --git a/src/api/java/appeng/api/config/Upgrades.java b/api/src/main/java/appeng/api/config/Upgrades.java
similarity index 100%
rename from src/api/java/appeng/api/config/Upgrades.java
rename to api/src/main/java/appeng/api/config/Upgrades.java
diff --git a/src/api/java/appeng/api/config/ViewItems.java b/api/src/main/java/appeng/api/config/ViewItems.java
similarity index 100%
rename from src/api/java/appeng/api/config/ViewItems.java
rename to api/src/main/java/appeng/api/config/ViewItems.java
diff --git a/src/api/java/appeng/api/config/YesNo.java b/api/src/main/java/appeng/api/config/YesNo.java
similarity index 100%
rename from src/api/java/appeng/api/config/YesNo.java
rename to api/src/main/java/appeng/api/config/YesNo.java
diff --git a/src/api/java/appeng/api/definitions/IBlockDefinition.java b/api/src/main/java/appeng/api/definitions/IBlockDefinition.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/IBlockDefinition.java
rename to api/src/main/java/appeng/api/definitions/IBlockDefinition.java
diff --git a/src/api/java/appeng/api/definitions/IBlocks.java b/api/src/main/java/appeng/api/definitions/IBlocks.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/IBlocks.java
rename to api/src/main/java/appeng/api/definitions/IBlocks.java
diff --git a/src/api/java/appeng/api/definitions/IComparableDefinition.java b/api/src/main/java/appeng/api/definitions/IComparableDefinition.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/IComparableDefinition.java
rename to api/src/main/java/appeng/api/definitions/IComparableDefinition.java
diff --git a/src/api/java/appeng/api/definitions/IDefinitions.java b/api/src/main/java/appeng/api/definitions/IDefinitions.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/IDefinitions.java
rename to api/src/main/java/appeng/api/definitions/IDefinitions.java
diff --git a/src/api/java/appeng/api/definitions/IItemDefinition.java b/api/src/main/java/appeng/api/definitions/IItemDefinition.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/IItemDefinition.java
rename to api/src/main/java/appeng/api/definitions/IItemDefinition.java
diff --git a/src/api/java/appeng/api/definitions/IItems.java b/api/src/main/java/appeng/api/definitions/IItems.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/IItems.java
rename to api/src/main/java/appeng/api/definitions/IItems.java
diff --git a/src/api/java/appeng/api/definitions/IMaterials.java b/api/src/main/java/appeng/api/definitions/IMaterials.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/IMaterials.java
rename to api/src/main/java/appeng/api/definitions/IMaterials.java
diff --git a/src/api/java/appeng/api/definitions/IParts.java b/api/src/main/java/appeng/api/definitions/IParts.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/IParts.java
rename to api/src/main/java/appeng/api/definitions/IParts.java
diff --git a/src/api/java/appeng/api/definitions/ITileDefinition.java b/api/src/main/java/appeng/api/definitions/ITileDefinition.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/ITileDefinition.java
rename to api/src/main/java/appeng/api/definitions/ITileDefinition.java
diff --git a/src/api/java/appeng/api/definitions/IdHelper.java b/api/src/main/java/appeng/api/definitions/IdHelper.java
similarity index 100%
rename from src/api/java/appeng/api/definitions/IdHelper.java
rename to api/src/main/java/appeng/api/definitions/IdHelper.java
diff --git a/src/api/java/appeng/api/events/LocatableEventAnnounce.java b/api/src/main/java/appeng/api/events/LocatableEventAnnounce.java
similarity index 100%
rename from src/api/java/appeng/api/events/LocatableEventAnnounce.java
rename to api/src/main/java/appeng/api/events/LocatableEventAnnounce.java
diff --git a/src/api/java/appeng/api/exceptions/AppEngException.java b/api/src/main/java/appeng/api/exceptions/AppEngException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/AppEngException.java
rename to api/src/main/java/appeng/api/exceptions/AppEngException.java
diff --git a/src/api/java/appeng/api/exceptions/CoreInaccessibleException.java b/api/src/main/java/appeng/api/exceptions/CoreInaccessibleException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/CoreInaccessibleException.java
rename to api/src/main/java/appeng/api/exceptions/CoreInaccessibleException.java
diff --git a/src/api/java/appeng/api/exceptions/ExistingConnectionException.java b/api/src/main/java/appeng/api/exceptions/ExistingConnectionException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/ExistingConnectionException.java
rename to api/src/main/java/appeng/api/exceptions/ExistingConnectionException.java
diff --git a/src/api/java/appeng/api/exceptions/FailedConnectionException.java b/api/src/main/java/appeng/api/exceptions/FailedConnectionException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/FailedConnectionException.java
rename to api/src/main/java/appeng/api/exceptions/FailedConnectionException.java
diff --git a/src/api/java/appeng/api/exceptions/MissingDefinitionException.java b/api/src/main/java/appeng/api/exceptions/MissingDefinitionException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/MissingDefinitionException.java
rename to api/src/main/java/appeng/api/exceptions/MissingDefinitionException.java
diff --git a/src/api/java/appeng/api/exceptions/MissingIngredientException.java b/api/src/main/java/appeng/api/exceptions/MissingIngredientException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/MissingIngredientException.java
rename to api/src/main/java/appeng/api/exceptions/MissingIngredientException.java
diff --git a/src/api/java/appeng/api/exceptions/ModNotInstalledException.java b/api/src/main/java/appeng/api/exceptions/ModNotInstalledException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/ModNotInstalledException.java
rename to api/src/main/java/appeng/api/exceptions/ModNotInstalledException.java
diff --git a/src/api/java/appeng/api/exceptions/NullNodeConnectionException.java b/api/src/main/java/appeng/api/exceptions/NullNodeConnectionException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/NullNodeConnectionException.java
rename to api/src/main/java/appeng/api/exceptions/NullNodeConnectionException.java
diff --git a/src/api/java/appeng/api/exceptions/RecipeException.java b/api/src/main/java/appeng/api/exceptions/RecipeException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/RecipeException.java
rename to api/src/main/java/appeng/api/exceptions/RecipeException.java
diff --git a/src/api/java/appeng/api/exceptions/RegistrationException.java b/api/src/main/java/appeng/api/exceptions/RegistrationException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/RegistrationException.java
rename to api/src/main/java/appeng/api/exceptions/RegistrationException.java
diff --git a/src/api/java/appeng/api/exceptions/SecurityConnectionException.java b/api/src/main/java/appeng/api/exceptions/SecurityConnectionException.java
similarity index 100%
rename from src/api/java/appeng/api/exceptions/SecurityConnectionException.java
rename to api/src/main/java/appeng/api/exceptions/SecurityConnectionException.java
diff --git a/src/api/java/appeng/api/features/AEFeature.java b/api/src/main/java/appeng/api/features/AEFeature.java
similarity index 100%
rename from src/api/java/appeng/api/features/AEFeature.java
rename to api/src/main/java/appeng/api/features/AEFeature.java
diff --git a/src/api/java/appeng/api/features/IChargerRegistry.java b/api/src/main/java/appeng/api/features/IChargerRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/features/IChargerRegistry.java
rename to api/src/main/java/appeng/api/features/IChargerRegistry.java
diff --git a/src/api/java/appeng/api/features/IItemComparison.java b/api/src/main/java/appeng/api/features/IItemComparison.java
similarity index 100%
rename from src/api/java/appeng/api/features/IItemComparison.java
rename to api/src/main/java/appeng/api/features/IItemComparison.java
diff --git a/src/api/java/appeng/api/features/IItemComparisonProvider.java b/api/src/main/java/appeng/api/features/IItemComparisonProvider.java
similarity index 100%
rename from src/api/java/appeng/api/features/IItemComparisonProvider.java
rename to api/src/main/java/appeng/api/features/IItemComparisonProvider.java
diff --git a/src/api/java/appeng/api/features/ILocatable.java b/api/src/main/java/appeng/api/features/ILocatable.java
similarity index 100%
rename from src/api/java/appeng/api/features/ILocatable.java
rename to api/src/main/java/appeng/api/features/ILocatable.java
diff --git a/src/api/java/appeng/api/features/ILocatableRegistry.java b/api/src/main/java/appeng/api/features/ILocatableRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/features/ILocatableRegistry.java
rename to api/src/main/java/appeng/api/features/ILocatableRegistry.java
diff --git a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java b/api/src/main/java/appeng/api/features/IMatterCannonAmmoRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java
rename to api/src/main/java/appeng/api/features/IMatterCannonAmmoRegistry.java
diff --git a/src/api/java/appeng/api/features/INetworkEncodable.java b/api/src/main/java/appeng/api/features/INetworkEncodable.java
similarity index 100%
rename from src/api/java/appeng/api/features/INetworkEncodable.java
rename to api/src/main/java/appeng/api/features/INetworkEncodable.java
diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/api/src/main/java/appeng/api/features/IP2PTunnelRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/features/IP2PTunnelRegistry.java
rename to api/src/main/java/appeng/api/features/IP2PTunnelRegistry.java
diff --git a/src/api/java/appeng/api/features/IPlayerRegistry.java b/api/src/main/java/appeng/api/features/IPlayerRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/features/IPlayerRegistry.java
rename to api/src/main/java/appeng/api/features/IPlayerRegistry.java
diff --git a/src/api/java/appeng/api/features/IRegistryContainer.java b/api/src/main/java/appeng/api/features/IRegistryContainer.java
similarity index 100%
rename from src/api/java/appeng/api/features/IRegistryContainer.java
rename to api/src/main/java/appeng/api/features/IRegistryContainer.java
diff --git a/src/api/java/appeng/api/features/IWirelessTermHandler.java b/api/src/main/java/appeng/api/features/IWirelessTermHandler.java
similarity index 100%
rename from src/api/java/appeng/api/features/IWirelessTermHandler.java
rename to api/src/main/java/appeng/api/features/IWirelessTermHandler.java
diff --git a/src/api/java/appeng/api/features/IWirelessTermRegistry.java b/api/src/main/java/appeng/api/features/IWirelessTermRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/features/IWirelessTermRegistry.java
rename to api/src/main/java/appeng/api/features/IWirelessTermRegistry.java
diff --git a/src/api/java/appeng/api/features/IWorldGen.java b/api/src/main/java/appeng/api/features/IWorldGen.java
similarity index 100%
rename from src/api/java/appeng/api/features/IWorldGen.java
rename to api/src/main/java/appeng/api/features/IWorldGen.java
diff --git a/src/api/java/appeng/api/features/InscriberProcessType.java b/api/src/main/java/appeng/api/features/InscriberProcessType.java
similarity index 100%
rename from src/api/java/appeng/api/features/InscriberProcessType.java
rename to api/src/main/java/appeng/api/features/InscriberProcessType.java
diff --git a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java b/api/src/main/java/appeng/api/implementations/ICraftingPatternItem.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/ICraftingPatternItem.java
rename to api/src/main/java/appeng/api/implementations/ICraftingPatternItem.java
diff --git a/src/api/java/appeng/api/implementations/IPowerChannelState.java b/api/src/main/java/appeng/api/implementations/IPowerChannelState.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/IPowerChannelState.java
rename to api/src/main/java/appeng/api/implementations/IPowerChannelState.java
diff --git a/src/api/java/appeng/api/implementations/IUpgradeableHost.java b/api/src/main/java/appeng/api/implementations/IUpgradeableHost.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/IUpgradeableHost.java
rename to api/src/main/java/appeng/api/implementations/IUpgradeableHost.java
diff --git a/src/api/java/appeng/api/implementations/TransitionResult.java b/api/src/main/java/appeng/api/implementations/TransitionResult.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/TransitionResult.java
rename to api/src/main/java/appeng/api/implementations/TransitionResult.java
diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java b/api/src/main/java/appeng/api/implementations/guiobjects/IGuiItem.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java
rename to api/src/main/java/appeng/api/implementations/guiobjects/IGuiItem.java
diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java b/api/src/main/java/appeng/api/implementations/guiobjects/IGuiItemObject.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java
rename to api/src/main/java/appeng/api/implementations/guiobjects/IGuiItemObject.java
diff --git a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java b/api/src/main/java/appeng/api/implementations/guiobjects/INetworkTool.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java
rename to api/src/main/java/appeng/api/implementations/guiobjects/INetworkTool.java
diff --git a/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java b/api/src/main/java/appeng/api/implementations/guiobjects/IPortableCell.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java
rename to api/src/main/java/appeng/api/implementations/guiobjects/IPortableCell.java
diff --git a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java b/api/src/main/java/appeng/api/implementations/items/IAEItemPowerStorage.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java
rename to api/src/main/java/appeng/api/implementations/items/IAEItemPowerStorage.java
diff --git a/src/api/java/appeng/api/implementations/items/IAEWrench.java b/api/src/main/java/appeng/api/implementations/items/IAEWrench.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/IAEWrench.java
rename to api/src/main/java/appeng/api/implementations/items/IAEWrench.java
diff --git a/src/api/java/appeng/api/implementations/items/IBiometricCard.java b/api/src/main/java/appeng/api/implementations/items/IBiometricCard.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/IBiometricCard.java
rename to api/src/main/java/appeng/api/implementations/items/IBiometricCard.java
diff --git a/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java b/api/src/main/java/appeng/api/implementations/items/IGrowableCrystal.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/IGrowableCrystal.java
rename to api/src/main/java/appeng/api/implementations/items/IGrowableCrystal.java
diff --git a/src/api/java/appeng/api/implementations/items/IItemGroup.java b/api/src/main/java/appeng/api/implementations/items/IItemGroup.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/IItemGroup.java
rename to api/src/main/java/appeng/api/implementations/items/IItemGroup.java
diff --git a/src/api/java/appeng/api/implementations/items/IMemoryCard.java b/api/src/main/java/appeng/api/implementations/items/IMemoryCard.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/IMemoryCard.java
rename to api/src/main/java/appeng/api/implementations/items/IMemoryCard.java
diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/api/src/main/java/appeng/api/implementations/items/ISpatialStorageCell.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java
rename to api/src/main/java/appeng/api/implementations/items/ISpatialStorageCell.java
diff --git a/src/api/java/appeng/api/implementations/items/IStorageCell.java b/api/src/main/java/appeng/api/implementations/items/IStorageCell.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/IStorageCell.java
rename to api/src/main/java/appeng/api/implementations/items/IStorageCell.java
diff --git a/src/api/java/appeng/api/implementations/items/IStorageComponent.java b/api/src/main/java/appeng/api/implementations/items/IStorageComponent.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/IStorageComponent.java
rename to api/src/main/java/appeng/api/implementations/items/IStorageComponent.java
diff --git a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java b/api/src/main/java/appeng/api/implementations/items/IUpgradeModule.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/IUpgradeModule.java
rename to api/src/main/java/appeng/api/implementations/items/IUpgradeModule.java
diff --git a/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java b/api/src/main/java/appeng/api/implementations/items/MemoryCardMessages.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/items/MemoryCardMessages.java
rename to api/src/main/java/appeng/api/implementations/items/MemoryCardMessages.java
diff --git a/src/api/java/appeng/api/implementations/parts/ICablePart.java b/api/src/main/java/appeng/api/implementations/parts/ICablePart.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/parts/ICablePart.java
rename to api/src/main/java/appeng/api/implementations/parts/ICablePart.java
diff --git a/src/api/java/appeng/api/implementations/parts/IMonitorPart.java b/api/src/main/java/appeng/api/implementations/parts/IMonitorPart.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/parts/IMonitorPart.java
rename to api/src/main/java/appeng/api/implementations/parts/IMonitorPart.java
diff --git a/src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java b/api/src/main/java/appeng/api/implementations/parts/IStorageMonitorPart.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java
rename to api/src/main/java/appeng/api/implementations/parts/IStorageMonitorPart.java
diff --git a/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java b/api/src/main/java/appeng/api/implementations/tiles/IChestOrDrive.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java
rename to api/src/main/java/appeng/api/implementations/tiles/IChestOrDrive.java
diff --git a/src/api/java/appeng/api/implementations/tiles/IColorableTile.java b/api/src/main/java/appeng/api/implementations/tiles/IColorableTile.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/tiles/IColorableTile.java
rename to api/src/main/java/appeng/api/implementations/tiles/IColorableTile.java
diff --git a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java b/api/src/main/java/appeng/api/implementations/tiles/ICraftingMachine.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java
rename to api/src/main/java/appeng/api/implementations/tiles/ICraftingMachine.java
diff --git a/src/api/java/appeng/api/implementations/tiles/ICrankable.java b/api/src/main/java/appeng/api/implementations/tiles/ICrankable.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/tiles/ICrankable.java
rename to api/src/main/java/appeng/api/implementations/tiles/ICrankable.java
diff --git a/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java b/api/src/main/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java
rename to api/src/main/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java
diff --git a/src/api/java/appeng/api/implementations/tiles/IMEChest.java b/api/src/main/java/appeng/api/implementations/tiles/IMEChest.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/tiles/IMEChest.java
rename to api/src/main/java/appeng/api/implementations/tiles/IMEChest.java
diff --git a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java b/api/src/main/java/appeng/api/implementations/tiles/ISegmentedInventory.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java
rename to api/src/main/java/appeng/api/implementations/tiles/ISegmentedInventory.java
diff --git a/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java b/api/src/main/java/appeng/api/implementations/tiles/IViewCellStorage.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java
rename to api/src/main/java/appeng/api/implementations/tiles/IViewCellStorage.java
diff --git a/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java b/api/src/main/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java
similarity index 100%
rename from src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java
rename to api/src/main/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java
diff --git a/src/api/java/appeng/api/movable/IMovableHandler.java b/api/src/main/java/appeng/api/movable/IMovableHandler.java
similarity index 100%
rename from src/api/java/appeng/api/movable/IMovableHandler.java
rename to api/src/main/java/appeng/api/movable/IMovableHandler.java
diff --git a/src/api/java/appeng/api/movable/IMovableRegistry.java b/api/src/main/java/appeng/api/movable/IMovableRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/movable/IMovableRegistry.java
rename to api/src/main/java/appeng/api/movable/IMovableRegistry.java
diff --git a/src/api/java/appeng/api/movable/IMovableTile.java b/api/src/main/java/appeng/api/movable/IMovableTile.java
similarity index 100%
rename from src/api/java/appeng/api/movable/IMovableTile.java
rename to api/src/main/java/appeng/api/movable/IMovableTile.java
diff --git a/src/api/java/appeng/api/networking/GridFlags.java b/api/src/main/java/appeng/api/networking/GridFlags.java
similarity index 100%
rename from src/api/java/appeng/api/networking/GridFlags.java
rename to api/src/main/java/appeng/api/networking/GridFlags.java
diff --git a/src/api/java/appeng/api/networking/GridNotification.java b/api/src/main/java/appeng/api/networking/GridNotification.java
similarity index 100%
rename from src/api/java/appeng/api/networking/GridNotification.java
rename to api/src/main/java/appeng/api/networking/GridNotification.java
diff --git a/src/api/java/appeng/api/networking/IGrid.java b/api/src/main/java/appeng/api/networking/IGrid.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGrid.java
rename to api/src/main/java/appeng/api/networking/IGrid.java
diff --git a/src/api/java/appeng/api/networking/IGridBlock.java b/api/src/main/java/appeng/api/networking/IGridBlock.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridBlock.java
rename to api/src/main/java/appeng/api/networking/IGridBlock.java
diff --git a/src/api/java/appeng/api/networking/IGridCache.java b/api/src/main/java/appeng/api/networking/IGridCache.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridCache.java
rename to api/src/main/java/appeng/api/networking/IGridCache.java
diff --git a/src/api/java/appeng/api/networking/IGridCacheRegistry.java b/api/src/main/java/appeng/api/networking/IGridCacheRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridCacheRegistry.java
rename to api/src/main/java/appeng/api/networking/IGridCacheRegistry.java
diff --git a/src/api/java/appeng/api/networking/IGridConnection.java b/api/src/main/java/appeng/api/networking/IGridConnection.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridConnection.java
rename to api/src/main/java/appeng/api/networking/IGridConnection.java
diff --git a/src/api/java/appeng/api/networking/IGridConnectionVisitor.java b/api/src/main/java/appeng/api/networking/IGridConnectionVisitor.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridConnectionVisitor.java
rename to api/src/main/java/appeng/api/networking/IGridConnectionVisitor.java
diff --git a/src/api/java/appeng/api/networking/IGridHelper.java b/api/src/main/java/appeng/api/networking/IGridHelper.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridHelper.java
rename to api/src/main/java/appeng/api/networking/IGridHelper.java
diff --git a/src/api/java/appeng/api/networking/IGridHost.java b/api/src/main/java/appeng/api/networking/IGridHost.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridHost.java
rename to api/src/main/java/appeng/api/networking/IGridHost.java
diff --git a/src/api/java/appeng/api/networking/IGridMultiblock.java b/api/src/main/java/appeng/api/networking/IGridMultiblock.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridMultiblock.java
rename to api/src/main/java/appeng/api/networking/IGridMultiblock.java
diff --git a/src/api/java/appeng/api/networking/IGridNode.java b/api/src/main/java/appeng/api/networking/IGridNode.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridNode.java
rename to api/src/main/java/appeng/api/networking/IGridNode.java
diff --git a/src/api/java/appeng/api/networking/IGridStorage.java b/api/src/main/java/appeng/api/networking/IGridStorage.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridStorage.java
rename to api/src/main/java/appeng/api/networking/IGridStorage.java
diff --git a/src/api/java/appeng/api/networking/IGridVisitor.java b/api/src/main/java/appeng/api/networking/IGridVisitor.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridVisitor.java
rename to api/src/main/java/appeng/api/networking/IGridVisitor.java
diff --git a/src/api/java/appeng/api/networking/IMachineSet.java b/api/src/main/java/appeng/api/networking/IMachineSet.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IMachineSet.java
rename to api/src/main/java/appeng/api/networking/IMachineSet.java
diff --git a/src/api/java/appeng/api/networking/crafting/CraftingItemList.java b/api/src/main/java/appeng/api/networking/crafting/CraftingItemList.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/CraftingItemList.java
rename to api/src/main/java/appeng/api/networking/crafting/CraftingItemList.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingCPU.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingCPU.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingCPU.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingCallback.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingCallback.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingCallback.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingGrid.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingGrid.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingGrid.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingJob.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingJob.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingJob.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingJob.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingLink.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingLink.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingLink.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingLink.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingMedium.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingMedium.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingMedium.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingPatternDetails.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingPatternDetails.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingProvider.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingProvider.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingProvider.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingProviderHelper.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingProviderHelper.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingRequester.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingRequester.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingRequester.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingWatcher.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingWatcher.java
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingWatcherHost.java
similarity index 100%
rename from src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java
rename to api/src/main/java/appeng/api/networking/crafting/ICraftingWatcherHost.java
diff --git a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java b/api/src/main/java/appeng/api/networking/energy/IAEPowerStorage.java
similarity index 100%
rename from src/api/java/appeng/api/networking/energy/IAEPowerStorage.java
rename to api/src/main/java/appeng/api/networking/energy/IAEPowerStorage.java
diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java b/api/src/main/java/appeng/api/networking/energy/IEnergyGrid.java
similarity index 100%
rename from src/api/java/appeng/api/networking/energy/IEnergyGrid.java
rename to api/src/main/java/appeng/api/networking/energy/IEnergyGrid.java
diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java b/api/src/main/java/appeng/api/networking/energy/IEnergyGridProvider.java
similarity index 100%
rename from src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java
rename to api/src/main/java/appeng/api/networking/energy/IEnergyGridProvider.java
diff --git a/src/api/java/appeng/api/networking/energy/IEnergySource.java b/api/src/main/java/appeng/api/networking/energy/IEnergySource.java
similarity index 100%
rename from src/api/java/appeng/api/networking/energy/IEnergySource.java
rename to api/src/main/java/appeng/api/networking/energy/IEnergySource.java
diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java b/api/src/main/java/appeng/api/networking/energy/IEnergyWatcher.java
similarity index 100%
rename from src/api/java/appeng/api/networking/energy/IEnergyWatcher.java
rename to api/src/main/java/appeng/api/networking/energy/IEnergyWatcher.java
diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java b/api/src/main/java/appeng/api/networking/energy/IEnergyWatcherHost.java
similarity index 100%
rename from src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java
rename to api/src/main/java/appeng/api/networking/energy/IEnergyWatcherHost.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java b/api/src/main/java/appeng/api/networking/events/MENetworkBootingStatusChange.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkBootingStatusChange.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java b/api/src/main/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java b/api/src/main/java/appeng/api/networking/events/MENetworkChannelChanged.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkChannelChanged.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java b/api/src/main/java/appeng/api/networking/events/MENetworkChannelsChanged.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkChannelsChanged.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java b/api/src/main/java/appeng/api/networking/events/MENetworkControllerChange.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkControllerChange.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkControllerChange.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java b/api/src/main/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java b/api/src/main/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkEvent.java b/api/src/main/java/appeng/api/networking/events/MENetworkEvent.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkEvent.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkEvent.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java b/api/src/main/java/appeng/api/networking/events/MENetworkEventSubscribe.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkEventSubscribe.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java b/api/src/main/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java b/api/src/main/java/appeng/api/networking/events/MENetworkPowerIdleChange.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkPowerIdleChange.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java b/api/src/main/java/appeng/api/networking/events/MENetworkPowerStatusChange.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkPowerStatusChange.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java b/api/src/main/java/appeng/api/networking/events/MENetworkPowerStorage.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkPowerStorage.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java b/api/src/main/java/appeng/api/networking/events/MENetworkSecurityChange.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkSecurityChange.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java b/api/src/main/java/appeng/api/networking/events/MENetworkSpatialEvent.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkSpatialEvent.java
diff --git a/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java b/api/src/main/java/appeng/api/networking/events/MENetworkStorageEvent.java
similarity index 100%
rename from src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java
rename to api/src/main/java/appeng/api/networking/events/MENetworkStorageEvent.java
diff --git a/src/api/java/appeng/api/networking/pathing/ControllerState.java b/api/src/main/java/appeng/api/networking/pathing/ControllerState.java
similarity index 100%
rename from src/api/java/appeng/api/networking/pathing/ControllerState.java
rename to api/src/main/java/appeng/api/networking/pathing/ControllerState.java
diff --git a/src/api/java/appeng/api/networking/pathing/IPathingGrid.java b/api/src/main/java/appeng/api/networking/pathing/IPathingGrid.java
similarity index 100%
rename from src/api/java/appeng/api/networking/pathing/IPathingGrid.java
rename to api/src/main/java/appeng/api/networking/pathing/IPathingGrid.java
diff --git a/src/api/java/appeng/api/networking/security/IActionHost.java b/api/src/main/java/appeng/api/networking/security/IActionHost.java
similarity index 100%
rename from src/api/java/appeng/api/networking/security/IActionHost.java
rename to api/src/main/java/appeng/api/networking/security/IActionHost.java
diff --git a/src/api/java/appeng/api/networking/security/IActionSource.java b/api/src/main/java/appeng/api/networking/security/IActionSource.java
similarity index 100%
rename from src/api/java/appeng/api/networking/security/IActionSource.java
rename to api/src/main/java/appeng/api/networking/security/IActionSource.java
diff --git a/src/api/java/appeng/api/networking/security/ISecurityGrid.java b/api/src/main/java/appeng/api/networking/security/ISecurityGrid.java
similarity index 100%
rename from src/api/java/appeng/api/networking/security/ISecurityGrid.java
rename to api/src/main/java/appeng/api/networking/security/ISecurityGrid.java
diff --git a/src/api/java/appeng/api/networking/security/ISecurityProvider.java b/api/src/main/java/appeng/api/networking/security/ISecurityProvider.java
similarity index 100%
rename from src/api/java/appeng/api/networking/security/ISecurityProvider.java
rename to api/src/main/java/appeng/api/networking/security/ISecurityProvider.java
diff --git a/src/api/java/appeng/api/networking/security/ISecurityRegistry.java b/api/src/main/java/appeng/api/networking/security/ISecurityRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/networking/security/ISecurityRegistry.java
rename to api/src/main/java/appeng/api/networking/security/ISecurityRegistry.java
diff --git a/src/api/java/appeng/api/networking/spatial/ISpatialCache.java b/api/src/main/java/appeng/api/networking/spatial/ISpatialCache.java
similarity index 100%
rename from src/api/java/appeng/api/networking/spatial/ISpatialCache.java
rename to api/src/main/java/appeng/api/networking/spatial/ISpatialCache.java
diff --git a/src/api/java/appeng/api/networking/storage/IBaseMonitor.java b/api/src/main/java/appeng/api/networking/storage/IBaseMonitor.java
similarity index 100%
rename from src/api/java/appeng/api/networking/storage/IBaseMonitor.java
rename to api/src/main/java/appeng/api/networking/storage/IBaseMonitor.java
diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcher.java b/api/src/main/java/appeng/api/networking/storage/IStackWatcher.java
similarity index 100%
rename from src/api/java/appeng/api/networking/storage/IStackWatcher.java
rename to api/src/main/java/appeng/api/networking/storage/IStackWatcher.java
diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java b/api/src/main/java/appeng/api/networking/storage/IStackWatcherHost.java
similarity index 100%
rename from src/api/java/appeng/api/networking/storage/IStackWatcherHost.java
rename to api/src/main/java/appeng/api/networking/storage/IStackWatcherHost.java
diff --git a/src/api/java/appeng/api/networking/storage/IStorageGrid.java b/api/src/main/java/appeng/api/networking/storage/IStorageGrid.java
similarity index 100%
rename from src/api/java/appeng/api/networking/storage/IStorageGrid.java
rename to api/src/main/java/appeng/api/networking/storage/IStorageGrid.java
diff --git a/src/api/java/appeng/api/networking/ticking/IGridTickable.java b/api/src/main/java/appeng/api/networking/ticking/IGridTickable.java
similarity index 100%
rename from src/api/java/appeng/api/networking/ticking/IGridTickable.java
rename to api/src/main/java/appeng/api/networking/ticking/IGridTickable.java
diff --git a/src/api/java/appeng/api/networking/ticking/ITickManager.java b/api/src/main/java/appeng/api/networking/ticking/ITickManager.java
similarity index 100%
rename from src/api/java/appeng/api/networking/ticking/ITickManager.java
rename to api/src/main/java/appeng/api/networking/ticking/ITickManager.java
diff --git a/src/api/java/appeng/api/networking/ticking/TickRateModulation.java b/api/src/main/java/appeng/api/networking/ticking/TickRateModulation.java
similarity index 100%
rename from src/api/java/appeng/api/networking/ticking/TickRateModulation.java
rename to api/src/main/java/appeng/api/networking/ticking/TickRateModulation.java
diff --git a/src/api/java/appeng/api/networking/ticking/TickingRequest.java b/api/src/main/java/appeng/api/networking/ticking/TickingRequest.java
similarity index 100%
rename from src/api/java/appeng/api/networking/ticking/TickingRequest.java
rename to api/src/main/java/appeng/api/networking/ticking/TickingRequest.java
diff --git a/src/api/java/appeng/api/package-info.java b/api/src/main/java/appeng/api/package-info.java
similarity index 100%
rename from src/api/java/appeng/api/package-info.java
rename to api/src/main/java/appeng/api/package-info.java
diff --git a/src/api/java/appeng/api/parts/BusSupport.java b/api/src/main/java/appeng/api/parts/BusSupport.java
similarity index 100%
rename from src/api/java/appeng/api/parts/BusSupport.java
rename to api/src/main/java/appeng/api/parts/BusSupport.java
diff --git a/src/api/java/appeng/api/parts/CableRenderMode.java b/api/src/main/java/appeng/api/parts/CableRenderMode.java
similarity index 100%
rename from src/api/java/appeng/api/parts/CableRenderMode.java
rename to api/src/main/java/appeng/api/parts/CableRenderMode.java
diff --git a/src/api/java/appeng/api/parts/IAlphaPassItem.java b/api/src/main/java/appeng/api/parts/IAlphaPassItem.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IAlphaPassItem.java
rename to api/src/main/java/appeng/api/parts/IAlphaPassItem.java
diff --git a/src/api/java/appeng/api/parts/ICustomCableConnection.java b/api/src/main/java/appeng/api/parts/ICustomCableConnection.java
similarity index 100%
rename from src/api/java/appeng/api/parts/ICustomCableConnection.java
rename to api/src/main/java/appeng/api/parts/ICustomCableConnection.java
diff --git a/src/api/java/appeng/api/parts/IFacadeContainer.java b/api/src/main/java/appeng/api/parts/IFacadeContainer.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IFacadeContainer.java
rename to api/src/main/java/appeng/api/parts/IFacadeContainer.java
diff --git a/src/api/java/appeng/api/parts/IFacadePart.java b/api/src/main/java/appeng/api/parts/IFacadePart.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IFacadePart.java
rename to api/src/main/java/appeng/api/parts/IFacadePart.java
diff --git a/src/api/java/appeng/api/parts/IPart.java b/api/src/main/java/appeng/api/parts/IPart.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IPart.java
rename to api/src/main/java/appeng/api/parts/IPart.java
diff --git a/src/api/java/appeng/api/parts/IPartCollisionHelper.java b/api/src/main/java/appeng/api/parts/IPartCollisionHelper.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IPartCollisionHelper.java
rename to api/src/main/java/appeng/api/parts/IPartCollisionHelper.java
diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/api/src/main/java/appeng/api/parts/IPartHelper.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IPartHelper.java
rename to api/src/main/java/appeng/api/parts/IPartHelper.java
diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/api/src/main/java/appeng/api/parts/IPartHost.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IPartHost.java
rename to api/src/main/java/appeng/api/parts/IPartHost.java
diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/api/src/main/java/appeng/api/parts/IPartItem.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IPartItem.java
rename to api/src/main/java/appeng/api/parts/IPartItem.java
diff --git a/src/api/java/appeng/api/parts/IPartModel.java b/api/src/main/java/appeng/api/parts/IPartModel.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IPartModel.java
rename to api/src/main/java/appeng/api/parts/IPartModel.java
diff --git a/src/api/java/appeng/api/parts/IPartModels.java b/api/src/main/java/appeng/api/parts/IPartModels.java
similarity index 100%
rename from src/api/java/appeng/api/parts/IPartModels.java
rename to api/src/main/java/appeng/api/parts/IPartModels.java
diff --git a/src/api/java/appeng/api/parts/LayerBase.java b/api/src/main/java/appeng/api/parts/LayerBase.java
similarity index 100%
rename from src/api/java/appeng/api/parts/LayerBase.java
rename to api/src/main/java/appeng/api/parts/LayerBase.java
diff --git a/src/api/java/appeng/api/parts/LayerFlags.java b/api/src/main/java/appeng/api/parts/LayerFlags.java
similarity index 100%
rename from src/api/java/appeng/api/parts/LayerFlags.java
rename to api/src/main/java/appeng/api/parts/LayerFlags.java
diff --git a/src/api/java/appeng/api/parts/PartItemStack.java b/api/src/main/java/appeng/api/parts/PartItemStack.java
similarity index 100%
rename from src/api/java/appeng/api/parts/PartItemStack.java
rename to api/src/main/java/appeng/api/parts/PartItemStack.java
diff --git a/src/api/java/appeng/api/parts/SelectedPart.java b/api/src/main/java/appeng/api/parts/SelectedPart.java
similarity index 100%
rename from src/api/java/appeng/api/parts/SelectedPart.java
rename to api/src/main/java/appeng/api/parts/SelectedPart.java
diff --git a/src/api/java/appeng/api/recipes/ICraftHandler.java b/api/src/main/java/appeng/api/recipes/ICraftHandler.java
similarity index 100%
rename from src/api/java/appeng/api/recipes/ICraftHandler.java
rename to api/src/main/java/appeng/api/recipes/ICraftHandler.java
diff --git a/src/api/java/appeng/api/recipes/IIngredient.java b/api/src/main/java/appeng/api/recipes/IIngredient.java
similarity index 100%
rename from src/api/java/appeng/api/recipes/IIngredient.java
rename to api/src/main/java/appeng/api/recipes/IIngredient.java
diff --git a/src/api/java/appeng/api/recipes/IRecipeHandler.java b/api/src/main/java/appeng/api/recipes/IRecipeHandler.java
similarity index 100%
rename from src/api/java/appeng/api/recipes/IRecipeHandler.java
rename to api/src/main/java/appeng/api/recipes/IRecipeHandler.java
diff --git a/src/api/java/appeng/api/recipes/IRecipeLoader.java b/api/src/main/java/appeng/api/recipes/IRecipeLoader.java
similarity index 100%
rename from src/api/java/appeng/api/recipes/IRecipeLoader.java
rename to api/src/main/java/appeng/api/recipes/IRecipeLoader.java
diff --git a/src/api/java/appeng/api/recipes/ResolverResult.java b/api/src/main/java/appeng/api/recipes/ResolverResult.java
similarity index 100%
rename from src/api/java/appeng/api/recipes/ResolverResult.java
rename to api/src/main/java/appeng/api/recipes/ResolverResult.java
diff --git a/src/api/java/appeng/api/recipes/ResolverResultSet.java b/api/src/main/java/appeng/api/recipes/ResolverResultSet.java
similarity index 100%
rename from src/api/java/appeng/api/recipes/ResolverResultSet.java
rename to api/src/main/java/appeng/api/recipes/ResolverResultSet.java
diff --git a/src/api/java/appeng/api/storage/ICellRegistry.java b/api/src/main/java/appeng/api/storage/ICellRegistry.java
similarity index 100%
rename from src/api/java/appeng/api/storage/ICellRegistry.java
rename to api/src/main/java/appeng/api/storage/ICellRegistry.java
diff --git a/src/api/java/appeng/api/storage/IMEInventory.java b/api/src/main/java/appeng/api/storage/IMEInventory.java
similarity index 100%
rename from src/api/java/appeng/api/storage/IMEInventory.java
rename to api/src/main/java/appeng/api/storage/IMEInventory.java
diff --git a/src/api/java/appeng/api/storage/IMEInventoryHandler.java b/api/src/main/java/appeng/api/storage/IMEInventoryHandler.java
similarity index 100%
rename from src/api/java/appeng/api/storage/IMEInventoryHandler.java
rename to api/src/main/java/appeng/api/storage/IMEInventoryHandler.java
diff --git a/src/api/java/appeng/api/storage/IMEMonitor.java b/api/src/main/java/appeng/api/storage/IMEMonitor.java
similarity index 100%
rename from src/api/java/appeng/api/storage/IMEMonitor.java
rename to api/src/main/java/appeng/api/storage/IMEMonitor.java
diff --git a/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java b/api/src/main/java/appeng/api/storage/IMEMonitorHandlerReceiver.java
similarity index 100%
rename from src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java
rename to api/src/main/java/appeng/api/storage/IMEMonitorHandlerReceiver.java
diff --git a/src/api/java/appeng/api/storage/ISpatialDimension.java b/api/src/main/java/appeng/api/storage/ISpatialDimension.java
similarity index 100%
rename from src/api/java/appeng/api/storage/ISpatialDimension.java
rename to api/src/main/java/appeng/api/storage/ISpatialDimension.java
diff --git a/src/api/java/appeng/api/storage/IStorageChannel.java b/api/src/main/java/appeng/api/storage/IStorageChannel.java
similarity index 100%
rename from src/api/java/appeng/api/storage/IStorageChannel.java
rename to api/src/main/java/appeng/api/storage/IStorageChannel.java
diff --git a/src/api/java/appeng/api/storage/IStorageHelper.java b/api/src/main/java/appeng/api/storage/IStorageHelper.java
similarity index 100%
rename from src/api/java/appeng/api/storage/IStorageHelper.java
rename to api/src/main/java/appeng/api/storage/IStorageHelper.java
diff --git a/src/api/java/appeng/api/storage/IStorageMonitorable.java b/api/src/main/java/appeng/api/storage/IStorageMonitorable.java
similarity index 100%
rename from src/api/java/appeng/api/storage/IStorageMonitorable.java
rename to api/src/main/java/appeng/api/storage/IStorageMonitorable.java
diff --git a/src/api/java/appeng/api/storage/IStorageMonitorableAccessor.java b/api/src/main/java/appeng/api/storage/IStorageMonitorableAccessor.java
similarity index 100%
rename from src/api/java/appeng/api/storage/IStorageMonitorableAccessor.java
rename to api/src/main/java/appeng/api/storage/IStorageMonitorableAccessor.java
diff --git a/src/api/java/appeng/api/storage/ITerminalHost.java b/api/src/main/java/appeng/api/storage/ITerminalHost.java
similarity index 100%
rename from src/api/java/appeng/api/storage/ITerminalHost.java
rename to api/src/main/java/appeng/api/storage/ITerminalHost.java
diff --git a/src/api/java/appeng/api/storage/cells/CellState.java b/api/src/main/java/appeng/api/storage/cells/CellState.java
similarity index 100%
rename from src/api/java/appeng/api/storage/cells/CellState.java
rename to api/src/main/java/appeng/api/storage/cells/CellState.java
diff --git a/src/api/java/appeng/api/storage/cells/ICellContainer.java b/api/src/main/java/appeng/api/storage/cells/ICellContainer.java
similarity index 100%
rename from src/api/java/appeng/api/storage/cells/ICellContainer.java
rename to api/src/main/java/appeng/api/storage/cells/ICellContainer.java
diff --git a/src/api/java/appeng/api/storage/cells/ICellGuiHandler.java b/api/src/main/java/appeng/api/storage/cells/ICellGuiHandler.java
similarity index 100%
rename from src/api/java/appeng/api/storage/cells/ICellGuiHandler.java
rename to api/src/main/java/appeng/api/storage/cells/ICellGuiHandler.java
diff --git a/src/api/java/appeng/api/storage/cells/ICellHandler.java b/api/src/main/java/appeng/api/storage/cells/ICellHandler.java
similarity index 100%
rename from src/api/java/appeng/api/storage/cells/ICellHandler.java
rename to api/src/main/java/appeng/api/storage/cells/ICellHandler.java
diff --git a/src/api/java/appeng/api/storage/cells/ICellInventory.java b/api/src/main/java/appeng/api/storage/cells/ICellInventory.java
similarity index 100%
rename from src/api/java/appeng/api/storage/cells/ICellInventory.java
rename to api/src/main/java/appeng/api/storage/cells/ICellInventory.java
diff --git a/src/api/java/appeng/api/storage/cells/ICellInventoryHandler.java b/api/src/main/java/appeng/api/storage/cells/ICellInventoryHandler.java
similarity index 100%
rename from src/api/java/appeng/api/storage/cells/ICellInventoryHandler.java
rename to api/src/main/java/appeng/api/storage/cells/ICellInventoryHandler.java
diff --git a/src/api/java/appeng/api/storage/cells/ICellProvider.java b/api/src/main/java/appeng/api/storage/cells/ICellProvider.java
similarity index 100%
rename from src/api/java/appeng/api/storage/cells/ICellProvider.java
rename to api/src/main/java/appeng/api/storage/cells/ICellProvider.java
diff --git a/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java b/api/src/main/java/appeng/api/storage/cells/ICellWorkbenchItem.java
similarity index 100%
rename from src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java
rename to api/src/main/java/appeng/api/storage/cells/ICellWorkbenchItem.java
diff --git a/src/api/java/appeng/api/storage/cells/ISaveProvider.java b/api/src/main/java/appeng/api/storage/cells/ISaveProvider.java
similarity index 100%
rename from src/api/java/appeng/api/storage/cells/ISaveProvider.java
rename to api/src/main/java/appeng/api/storage/cells/ISaveProvider.java
diff --git a/src/api/java/appeng/api/storage/channels/IFluidStorageChannel.java b/api/src/main/java/appeng/api/storage/channels/IFluidStorageChannel.java
similarity index 100%
rename from src/api/java/appeng/api/storage/channels/IFluidStorageChannel.java
rename to api/src/main/java/appeng/api/storage/channels/IFluidStorageChannel.java
diff --git a/src/api/java/appeng/api/storage/channels/IItemStorageChannel.java b/api/src/main/java/appeng/api/storage/channels/IItemStorageChannel.java
similarity index 100%
rename from src/api/java/appeng/api/storage/channels/IItemStorageChannel.java
rename to api/src/main/java/appeng/api/storage/channels/IItemStorageChannel.java
diff --git a/src/api/java/appeng/api/storage/data/IAEFluidStack.java b/api/src/main/java/appeng/api/storage/data/IAEFluidStack.java
similarity index 100%
rename from src/api/java/appeng/api/storage/data/IAEFluidStack.java
rename to api/src/main/java/appeng/api/storage/data/IAEFluidStack.java
diff --git a/src/api/java/appeng/api/storage/data/IAEItemStack.java b/api/src/main/java/appeng/api/storage/data/IAEItemStack.java
similarity index 100%
rename from src/api/java/appeng/api/storage/data/IAEItemStack.java
rename to api/src/main/java/appeng/api/storage/data/IAEItemStack.java
diff --git a/src/api/java/appeng/api/storage/data/IAEStack.java b/api/src/main/java/appeng/api/storage/data/IAEStack.java
similarity index 100%
rename from src/api/java/appeng/api/storage/data/IAEStack.java
rename to api/src/main/java/appeng/api/storage/data/IAEStack.java
diff --git a/src/api/java/appeng/api/storage/data/IItemContainer.java b/api/src/main/java/appeng/api/storage/data/IItemContainer.java
similarity index 100%
rename from src/api/java/appeng/api/storage/data/IItemContainer.java
rename to api/src/main/java/appeng/api/storage/data/IItemContainer.java
diff --git a/src/api/java/appeng/api/storage/data/IItemList.java b/api/src/main/java/appeng/api/storage/data/IItemList.java
similarity index 100%
rename from src/api/java/appeng/api/storage/data/IItemList.java
rename to api/src/main/java/appeng/api/storage/data/IItemList.java
diff --git a/src/api/java/appeng/api/util/AEAxisAlignedBB.java b/api/src/main/java/appeng/api/util/AEAxisAlignedBB.java
similarity index 100%
rename from src/api/java/appeng/api/util/AEAxisAlignedBB.java
rename to api/src/main/java/appeng/api/util/AEAxisAlignedBB.java
diff --git a/src/api/java/appeng/api/util/AECableSize.java b/api/src/main/java/appeng/api/util/AECableSize.java
similarity index 100%
rename from src/api/java/appeng/api/util/AECableSize.java
rename to api/src/main/java/appeng/api/util/AECableSize.java
diff --git a/src/api/java/appeng/api/util/AECableType.java b/api/src/main/java/appeng/api/util/AECableType.java
similarity index 100%
rename from src/api/java/appeng/api/util/AECableType.java
rename to api/src/main/java/appeng/api/util/AECableType.java
diff --git a/src/api/java/appeng/api/util/AECableVariant.java b/api/src/main/java/appeng/api/util/AECableVariant.java
similarity index 100%
rename from src/api/java/appeng/api/util/AECableVariant.java
rename to api/src/main/java/appeng/api/util/AECableVariant.java
diff --git a/src/api/java/appeng/api/util/AEColor.java b/api/src/main/java/appeng/api/util/AEColor.java
similarity index 100%
rename from src/api/java/appeng/api/util/AEColor.java
rename to api/src/main/java/appeng/api/util/AEColor.java
diff --git a/src/api/java/appeng/api/util/AEColoredItemDefinition.java b/api/src/main/java/appeng/api/util/AEColoredItemDefinition.java
similarity index 100%
rename from src/api/java/appeng/api/util/AEColoredItemDefinition.java
rename to api/src/main/java/appeng/api/util/AEColoredItemDefinition.java
diff --git a/src/api/java/appeng/api/util/AEPartLocation.java b/api/src/main/java/appeng/api/util/AEPartLocation.java
similarity index 100%
rename from src/api/java/appeng/api/util/AEPartLocation.java
rename to api/src/main/java/appeng/api/util/AEPartLocation.java
diff --git a/src/api/java/appeng/api/util/DimensionalCoord.java b/api/src/main/java/appeng/api/util/DimensionalCoord.java
similarity index 100%
rename from src/api/java/appeng/api/util/DimensionalCoord.java
rename to api/src/main/java/appeng/api/util/DimensionalCoord.java
diff --git a/src/api/java/appeng/api/util/IClientHelper.java b/api/src/main/java/appeng/api/util/IClientHelper.java
similarity index 100%
rename from src/api/java/appeng/api/util/IClientHelper.java
rename to api/src/main/java/appeng/api/util/IClientHelper.java
diff --git a/src/api/java/appeng/api/util/ICommonTile.java b/api/src/main/java/appeng/api/util/ICommonTile.java
similarity index 100%
rename from src/api/java/appeng/api/util/ICommonTile.java
rename to api/src/main/java/appeng/api/util/ICommonTile.java
diff --git a/src/api/java/appeng/api/util/IConfigManager.java b/api/src/main/java/appeng/api/util/IConfigManager.java
similarity index 100%
rename from src/api/java/appeng/api/util/IConfigManager.java
rename to api/src/main/java/appeng/api/util/IConfigManager.java
diff --git a/src/api/java/appeng/api/util/IConfigurableObject.java b/api/src/main/java/appeng/api/util/IConfigurableObject.java
similarity index 100%
rename from src/api/java/appeng/api/util/IConfigurableObject.java
rename to api/src/main/java/appeng/api/util/IConfigurableObject.java
diff --git a/src/api/java/appeng/api/util/INetworkToolAgent.java b/api/src/main/java/appeng/api/util/INetworkToolAgent.java
similarity index 100%
rename from src/api/java/appeng/api/util/INetworkToolAgent.java
rename to api/src/main/java/appeng/api/util/INetworkToolAgent.java
diff --git a/src/api/java/appeng/api/util/IOrientable.java b/api/src/main/java/appeng/api/util/IOrientable.java
similarity index 100%
rename from src/api/java/appeng/api/util/IOrientable.java
rename to api/src/main/java/appeng/api/util/IOrientable.java
diff --git a/src/api/java/appeng/api/util/IOrientableBlock.java b/api/src/main/java/appeng/api/util/IOrientableBlock.java
similarity index 100%
rename from src/api/java/appeng/api/util/IOrientableBlock.java
rename to api/src/main/java/appeng/api/util/IOrientableBlock.java
diff --git a/src/api/java/appeng/api/util/IReadOnlyCollection.java b/api/src/main/java/appeng/api/util/IReadOnlyCollection.java
similarity index 100%
rename from src/api/java/appeng/api/util/IReadOnlyCollection.java
rename to api/src/main/java/appeng/api/util/IReadOnlyCollection.java
diff --git a/src/api/java/appeng/api/util/WorldCoord.java b/api/src/main/java/appeng/api/util/WorldCoord.java
similarity index 100%
rename from src/api/java/appeng/api/util/WorldCoord.java
rename to api/src/main/java/appeng/api/util/WorldCoord.java