diff --git a/bclib.gradle b/bclib.gradle index 034ee6b6..44d81040 100644 --- a/bclib.gradle +++ b/bclib.gradle @@ -24,6 +24,22 @@ repositories { maven { url 'https://maven.terraformersmc.com/releases' } } +archivesBaseName = project.archives_base_name +version = project.mod_version + +loom { + accessWidenerPath = file("src/main/resources/bclib.accesswidener") +} + +moduleDependencies(project, ["together-v1"]) +repositories { + maven { url 'https://maven.terraformersmc.com/releases' } +} + +dependencies { + modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" +} + allprojects { group = project.maven_group apply plugin: "java-library" diff --git a/build.gradle b/build.gradle index 67652397..254ddcd2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'idea' id 'eclipse' - id 'fabric-loom' version "${loom_version}" apply false + id 'fabric-loom' version "${loom_version}" id 'maven-publish' } diff --git a/core-v1/build.gradle b/core-v1/build.gradle deleted file mode 100644 index b759726c..00000000 --- a/core-v1/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -archivesBaseName = "core-v1" -version = getSubprojectVersion(project) - -loom { - accessWidenerPath = file("src/main/resources/bclib.accesswidener") -} - -moduleDependencies(project, ["together-v1"]) -//compileOnlyDependencies(project, [ -// "com.terraformersmc:modmenu:${project.modmenu_version}" -//]) - -repositories { - maven { url 'https://maven.terraformersmc.com/releases' } -} - -dependencies { - modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" -} - -jar { - from "../LICENSE" -} \ No newline at end of file diff --git a/core-v1/gradle.properties b/core-v1/gradle.properties deleted file mode 100644 index 9fa83611..00000000 --- a/core-v1/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies -modmenu_version=4.0.0 \ No newline at end of file diff --git a/core-v1/src/main/resources/assets/bclib/icon.png b/core-v1/src/main/resources/assets/bclib/icon.png deleted file mode 100644 index 368a2a60..00000000 Binary files a/core-v1/src/main/resources/assets/bclib/icon.png and /dev/null differ diff --git a/core-v1/src/main/resources/assets/bclib/iconpixelated.png b/core-v1/src/main/resources/assets/bclib/iconpixelated.png deleted file mode 100644 index 056ed30a..00000000 Binary files a/core-v1/src/main/resources/assets/bclib/iconpixelated.png and /dev/null differ diff --git a/core-v1/src/main/resources/fabric.mod.json b/core-v1/src/main/resources/fabric.mod.json deleted file mode 100644 index 88ebc4ee..00000000 --- a/core-v1/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "schemaVersion": 1, - "id": "bclib", - "version": "2.0.10", - "name": "BCLib", - "description": "A library for BetterX team mods", - "authors": [ - "Quiqueck", - "paulevs", - "Bulldog83" - ], - "contact": { - "homepage": "https://www.curseforge.com/minecraft/mc-mods/bclib", - "issues": "https://github.com/quiqueck/bclib/issues", - "sources": "https://github.com/quiqueck/bclib" - }, - "license": "MIT", - "icon": "assets/bclib/icon.png", - "environment": "*", - "entrypoints": { - "main": [ - "org.betterx.bclib.BCLib" - ], - "client": [ - "org.betterx.bclib.client.BCLibClient" - ], - "server": [ - "org.betterx.bclib.server.BCLibServer" - ], - "modmenu": [ - "org.betterx.bclib.integration.modmenu.ModMenuEntryPoint" - ], - "worlds_together": [ - "org.betterx.bclib.registry.PresetsRegistry" - ] - }, - "accessWidener": "bclib.accesswidener", - "mixins": [ - "bclib.mixins.common.json", - "bclib.mixins.client.json" - ], - "depends": { - "fabricloader": ">=0.14.6", - "fabric": ">=0.56.0", - "minecraft": "1.19" - }, - "custom": { - "modmenu": { - "links": { - "title.link.bclib.discord": "https://discord.gg/kYuATbYbKW" - } - } - } -} diff --git a/gradle.properties b/gradle.properties index 095256a4..62c71df1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,4 +12,6 @@ mod_version=2.0.10 core-v1-version=2.0.10 together-v1-version=2.0.10 maven_group=org.betterx.bclib -archives_base_name=bclib \ No newline at end of file +archives_base_name=bclib +# Dependencies +modmenu_version=4.0.0 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 4b698508..25443c8e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,4 +11,3 @@ pluginManagement { include("together-v1") -include("core-v1") diff --git a/core-v1/src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java b/src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java similarity index 100% rename from core-v1/src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java rename to src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java diff --git a/core-v1/src/main/java/org/betterx/bclib/BCLib.java b/src/main/java/org/betterx/bclib/BCLib.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/BCLib.java rename to src/main/java/org/betterx/bclib/BCLib.java diff --git a/core-v1/src/main/java/org/betterx/bclib/BCLibPatch.java b/src/main/java/org/betterx/bclib/BCLibPatch.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/BCLibPatch.java rename to src/main/java/org/betterx/bclib/BCLibPatch.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java b/src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java rename to src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java b/src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java rename to src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/DiggerItemSpeed.java b/src/main/java/org/betterx/bclib/api/v2/DiggerItemSpeed.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/DiggerItemSpeed.java rename to src/main/java/org/betterx/bclib/api/v2/DiggerItemSpeed.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java b/src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java rename to src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java b/src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java rename to src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java b/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java rename to src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java b/src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java rename to src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java b/src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java rename to src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java b/src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java b/src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java b/src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java rename to src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/TheEndBiomesHelper.java b/src/main/java/org/betterx/bclib/api/v2/generator/TheEndBiomesHelper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/TheEndBiomesHelper.java rename to src/main/java/org/betterx/bclib/api/v2/generator/TheEndBiomesHelper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLEndBiomeSourceConfig.java b/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLEndBiomeSourceConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLEndBiomeSourceConfig.java rename to src/main/java/org/betterx/bclib/api/v2/generator/config/BCLEndBiomeSourceConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLNetherBiomeSourceConfig.java b/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLNetherBiomeSourceConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLNetherBiomeSourceConfig.java rename to src/main/java/org/betterx/bclib/api/v2/generator/config/BCLNetherBiomeSourceConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/UserGrowableFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/UserGrowableFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/UserGrowableFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/UserGrowableFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Debug.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Debug.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Debug.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Debug.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/ForAll.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/ForAll.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/ForAll.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/ForAll.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RoughNoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RoughNoiseCondition.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RoughNoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RoughNoiseCondition.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/poi/BCLPoiType.java b/src/main/java/org/betterx/bclib/api/v2/poi/BCLPoiType.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/poi/BCLPoiType.java rename to src/main/java/org/betterx/bclib/api/v2/poi/BCLPoiType.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java b/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java b/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java rename to src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java b/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java rename to src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java b/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java rename to src/main/java/org/betterx/bclib/api/v2/tag/TagType.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLConfigureFeature.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLConfigureFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLConfigureFeature.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLConfigureFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeature.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeature.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLInlinePlacedBuilder.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLInlinePlacedBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLInlinePlacedBuilder.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLInlinePlacedBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLPlacedFeatureBuilder.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLPlacedFeatureBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLPlacedFeatureBuilder.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLPlacedFeatureBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/UserGrowableFeature.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/UserGrowableFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/UserGrowableFeature.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/UserGrowableFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/IsFullShape.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/IsFullShape.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/IsFullShape.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/IsFullShape.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/ConditionFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/ConditionFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/ConditionFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/ConditionFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PillarFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PillarFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PillarFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PillarFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceBlockFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceBlockFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceBlockFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceBlockFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceFacingBlockConfig.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceFacingBlockConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceFacingBlockConfig.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceFacingBlockConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/SequenceFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/SequenceFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/SequenceFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/SequenceFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/TemplateFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/TemplateFeatureConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/TemplateFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/TemplateFeatureConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/ConditionFeature.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/ConditionFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/ConditionFeature.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/ConditionFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/MarkPostProcessingFeature.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/MarkPostProcessingFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/MarkPostProcessingFeature.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/MarkPostProcessingFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PillarFeature.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PillarFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PillarFeature.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PillarFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PlaceBlockFeature.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PlaceBlockFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PlaceBlockFeature.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PlaceBlockFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/SequenceFeature.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/SequenceFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/SequenceFeature.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/SequenceFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/TemplateFeature.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/TemplateFeature.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/TemplateFeature.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/TemplateFeature.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/All.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/All.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/All.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/All.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Debug.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Debug.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Debug.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Debug.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Extend.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Extend.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Extend.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Extend.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/FindSolidInDirection.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/FindSolidInDirection.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/FindSolidInDirection.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/FindSolidInDirection.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/ForAll.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/ForAll.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/ForAll.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/ForAll.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Is.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Is.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Is.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Is.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsBasin.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsBasin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsBasin.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsBasin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsNextTo.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsNextTo.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsNextTo.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsNextTo.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/NoiseFilter.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/NoiseFilter.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/NoiseFilter.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/NoiseFilter.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Offset.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Offset.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Offset.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Offset.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/OnEveryLayer.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/OnEveryLayer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/OnEveryLayer.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/OnEveryLayer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/PlacementModifiers.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/PlacementModifiers.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/PlacementModifiers.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/PlacementModifiers.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Stencil.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Stencil.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Stencil.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Stencil.java diff --git a/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/UnderEveryLayer.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/UnderEveryLayer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/UnderEveryLayer.java rename to src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/UnderEveryLayer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blockentities/BaseBarrelBlockEntity.java b/src/main/java/org/betterx/bclib/blockentities/BaseBarrelBlockEntity.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blockentities/BaseBarrelBlockEntity.java rename to src/main/java/org/betterx/bclib/blockentities/BaseBarrelBlockEntity.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blockentities/BaseChestBlockEntity.java b/src/main/java/org/betterx/bclib/blockentities/BaseChestBlockEntity.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blockentities/BaseChestBlockEntity.java rename to src/main/java/org/betterx/bclib/blockentities/BaseChestBlockEntity.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blockentities/BaseFurnaceBlockEntity.java b/src/main/java/org/betterx/bclib/blockentities/BaseFurnaceBlockEntity.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blockentities/BaseFurnaceBlockEntity.java rename to src/main/java/org/betterx/bclib/blockentities/BaseFurnaceBlockEntity.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blockentities/BaseSignBlockEntity.java b/src/main/java/org/betterx/bclib/blockentities/BaseSignBlockEntity.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blockentities/BaseSignBlockEntity.java rename to src/main/java/org/betterx/bclib/blockentities/BaseSignBlockEntity.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blockentities/DynamicBlockEntityType.java b/src/main/java/org/betterx/bclib/blockentities/DynamicBlockEntityType.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blockentities/DynamicBlockEntityType.java rename to src/main/java/org/betterx/bclib/blockentities/DynamicBlockEntityType.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseAttachedBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseAttachedBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseAttachedBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseAttachedBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlockNotFull.java b/src/main/java/org/betterx/bclib/blocks/BaseBlockNotFull.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlockNotFull.java rename to src/main/java/org/betterx/bclib/blocks/BaseBlockNotFull.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java b/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java rename to src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java rename to src/main/java/org/betterx/bclib/blocks/BasePathBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java rename to src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BasePlantWithAgeBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePlantWithAgeBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BasePlantWithAgeBlock.java rename to src/main/java/org/betterx/bclib/blocks/BasePlantWithAgeBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java rename to src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseWallPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWallPlantBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseWallPlantBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseWallPlantBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java rename to src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/BlockProperties.java b/src/main/java/org/betterx/bclib/blocks/BlockProperties.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/BlockProperties.java rename to src/main/java/org/betterx/bclib/blocks/BlockProperties.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/FeatureHangingSaplingBlock.java b/src/main/java/org/betterx/bclib/blocks/FeatureHangingSaplingBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/FeatureHangingSaplingBlock.java rename to src/main/java/org/betterx/bclib/blocks/FeatureHangingSaplingBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java b/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java rename to src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java b/src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java rename to src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java b/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java rename to src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java b/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java rename to src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/StonePressurePlateBlock.java b/src/main/java/org/betterx/bclib/blocks/StonePressurePlateBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/StonePressurePlateBlock.java rename to src/main/java/org/betterx/bclib/blocks/StonePressurePlateBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java b/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java rename to src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java rename to src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java rename to src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantWithAgeBlock.java b/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantWithAgeBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantWithAgeBlock.java rename to src/main/java/org/betterx/bclib/blocks/UnderwaterPlantWithAgeBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java rename to src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java b/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java rename to src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/blocks/WoodenPressurePlateBlock.java b/src/main/java/org/betterx/bclib/blocks/WoodenPressurePlateBlock.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/blocks/WoodenPressurePlateBlock.java rename to src/main/java/org/betterx/bclib/blocks/WoodenPressurePlateBlock.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/BCLibClient.java b/src/main/java/org/betterx/bclib/client/BCLibClient.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/BCLibClient.java rename to src/main/java/org/betterx/bclib/client/BCLibClient.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java b/src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java rename to src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java b/src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java rename to src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java b/src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java rename to src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java b/src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java rename to src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/models/BaseChestBlockModel.java b/src/main/java/org/betterx/bclib/client/models/BaseChestBlockModel.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/models/BaseChestBlockModel.java rename to src/main/java/org/betterx/bclib/client/models/BaseChestBlockModel.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/models/BasePatterns.java b/src/main/java/org/betterx/bclib/client/models/BasePatterns.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/models/BasePatterns.java rename to src/main/java/org/betterx/bclib/client/models/BasePatterns.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java b/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java rename to src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/models/CustomModelData.java b/src/main/java/org/betterx/bclib/client/models/CustomModelData.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/models/CustomModelData.java rename to src/main/java/org/betterx/bclib/client/models/CustomModelData.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/models/ModelsHelper.java b/src/main/java/org/betterx/bclib/client/models/ModelsHelper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/models/ModelsHelper.java rename to src/main/java/org/betterx/bclib/client/models/ModelsHelper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/models/OBJBlockModel.java b/src/main/java/org/betterx/bclib/client/models/OBJBlockModel.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/models/OBJBlockModel.java rename to src/main/java/org/betterx/bclib/client/models/OBJBlockModel.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/models/OBJModelBuilder.java b/src/main/java/org/betterx/bclib/client/models/OBJModelBuilder.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/models/OBJModelBuilder.java rename to src/main/java/org/betterx/bclib/client/models/OBJModelBuilder.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/models/PatternsHelper.java b/src/main/java/org/betterx/bclib/client/models/PatternsHelper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/models/PatternsHelper.java rename to src/main/java/org/betterx/bclib/client/models/PatternsHelper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/models/UnbakedQuad.java b/src/main/java/org/betterx/bclib/client/models/UnbakedQuad.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/models/UnbakedQuad.java rename to src/main/java/org/betterx/bclib/client/models/UnbakedQuad.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/render/BCLRenderLayer.java b/src/main/java/org/betterx/bclib/client/render/BCLRenderLayer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/render/BCLRenderLayer.java rename to src/main/java/org/betterx/bclib/client/render/BCLRenderLayer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java b/src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java rename to src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/render/BaseSignBlockEntityRenderer.java b/src/main/java/org/betterx/bclib/client/render/BaseSignBlockEntityRenderer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/render/BaseSignBlockEntityRenderer.java rename to src/main/java/org/betterx/bclib/client/render/BaseSignBlockEntityRenderer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java b/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java rename to src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/render/EmissiveTextureInfo.java b/src/main/java/org/betterx/bclib/client/render/EmissiveTextureInfo.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/render/EmissiveTextureInfo.java rename to src/main/java/org/betterx/bclib/client/render/EmissiveTextureInfo.java diff --git a/core-v1/src/main/java/org/betterx/bclib/client/sound/BlockSounds.java b/src/main/java/org/betterx/bclib/client/sound/BlockSounds.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/client/sound/BlockSounds.java rename to src/main/java/org/betterx/bclib/client/sound/BlockSounds.java diff --git a/core-v1/src/main/java/org/betterx/bclib/commands/CommandRegistry.java b/src/main/java/org/betterx/bclib/commands/CommandRegistry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/commands/CommandRegistry.java rename to src/main/java/org/betterx/bclib/commands/CommandRegistry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/commands/DumpDatapack.java b/src/main/java/org/betterx/bclib/commands/DumpDatapack.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/commands/DumpDatapack.java rename to src/main/java/org/betterx/bclib/commands/DumpDatapack.java diff --git a/core-v1/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java b/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java rename to src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java diff --git a/core-v1/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java b/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java rename to src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java diff --git a/core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java rename to src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/ComplexMaterialEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/ComplexMaterialEntry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/ComplexMaterialEntry.java rename to src/main/java/org/betterx/bclib/complexmaterials/entry/ComplexMaterialEntry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java rename to src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/RecipeEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/RecipeEntry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/RecipeEntry.java rename to src/main/java/org/betterx/bclib/complexmaterials/entry/RecipeEntry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/BiomesConfig.java b/src/main/java/org/betterx/bclib/config/BiomesConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/BiomesConfig.java rename to src/main/java/org/betterx/bclib/config/BiomesConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/CategoryConfig.java b/src/main/java/org/betterx/bclib/config/CategoryConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/CategoryConfig.java rename to src/main/java/org/betterx/bclib/config/CategoryConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/ClientConfig.java b/src/main/java/org/betterx/bclib/config/ClientConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/ClientConfig.java rename to src/main/java/org/betterx/bclib/config/ClientConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/Config.java b/src/main/java/org/betterx/bclib/config/Config.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/Config.java rename to src/main/java/org/betterx/bclib/config/Config.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/ConfigKeeper.java b/src/main/java/org/betterx/bclib/config/ConfigKeeper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/ConfigKeeper.java rename to src/main/java/org/betterx/bclib/config/ConfigKeeper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/ConfigKey.java b/src/main/java/org/betterx/bclib/config/ConfigKey.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/ConfigKey.java rename to src/main/java/org/betterx/bclib/config/ConfigKey.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/ConfigUI.java b/src/main/java/org/betterx/bclib/config/ConfigUI.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/ConfigUI.java rename to src/main/java/org/betterx/bclib/config/ConfigUI.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/ConfigWriter.java b/src/main/java/org/betterx/bclib/config/ConfigWriter.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/ConfigWriter.java rename to src/main/java/org/betterx/bclib/config/ConfigWriter.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/Configs.java b/src/main/java/org/betterx/bclib/config/Configs.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/Configs.java rename to src/main/java/org/betterx/bclib/config/Configs.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/EntryConfig.java b/src/main/java/org/betterx/bclib/config/EntryConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/EntryConfig.java rename to src/main/java/org/betterx/bclib/config/EntryConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/GeneratorConfig.java b/src/main/java/org/betterx/bclib/config/GeneratorConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/GeneratorConfig.java rename to src/main/java/org/betterx/bclib/config/GeneratorConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/IdConfig.java b/src/main/java/org/betterx/bclib/config/IdConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/IdConfig.java rename to src/main/java/org/betterx/bclib/config/IdConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/MainConfig.java b/src/main/java/org/betterx/bclib/config/MainConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/MainConfig.java rename to src/main/java/org/betterx/bclib/config/MainConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/NamedPathConfig.java b/src/main/java/org/betterx/bclib/config/NamedPathConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/NamedPathConfig.java rename to src/main/java/org/betterx/bclib/config/NamedPathConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/PathConfig.java b/src/main/java/org/betterx/bclib/config/PathConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/PathConfig.java rename to src/main/java/org/betterx/bclib/config/PathConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/config/ServerConfig.java b/src/main/java/org/betterx/bclib/config/ServerConfig.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/config/ServerConfig.java rename to src/main/java/org/betterx/bclib/config/ServerConfig.java diff --git a/core-v1/src/main/java/org/betterx/bclib/entity/BCLEntityWrapper.java b/src/main/java/org/betterx/bclib/entity/BCLEntityWrapper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/entity/BCLEntityWrapper.java rename to src/main/java/org/betterx/bclib/entity/BCLEntityWrapper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/entity/DespawnableAnimal.java b/src/main/java/org/betterx/bclib/entity/DespawnableAnimal.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/entity/DespawnableAnimal.java rename to src/main/java/org/betterx/bclib/entity/DespawnableAnimal.java diff --git a/core-v1/src/main/java/org/betterx/bclib/integration/ModIntegration.java b/src/main/java/org/betterx/bclib/integration/ModIntegration.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/integration/ModIntegration.java rename to src/main/java/org/betterx/bclib/integration/ModIntegration.java diff --git a/core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenu.java b/src/main/java/org/betterx/bclib/integration/modmenu/ModMenu.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenu.java rename to src/main/java/org/betterx/bclib/integration/modmenu/ModMenu.java diff --git a/core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java b/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java rename to src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java diff --git a/core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuIntegration.java b/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuIntegration.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuIntegration.java rename to src/main/java/org/betterx/bclib/integration/modmenu/ModMenuIntegration.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java b/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java rename to src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/BCLPlacementContext.java b/src/main/java/org/betterx/bclib/interfaces/BCLPlacementContext.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/BCLPlacementContext.java rename to src/main/java/org/betterx/bclib/interfaces/BCLPlacementContext.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java b/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java rename to src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java b/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java rename to src/main/java/org/betterx/bclib/interfaces/BiomeMap.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeSetter.java b/src/main/java/org/betterx/bclib/interfaces/BiomeSetter.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeSetter.java rename to src/main/java/org/betterx/bclib/interfaces/BiomeSetter.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeSourceAccessor.java b/src/main/java/org/betterx/bclib/interfaces/BiomeSourceAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeSourceAccessor.java rename to src/main/java/org/betterx/bclib/interfaces/BiomeSourceAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/BlockModelProvider.java b/src/main/java/org/betterx/bclib/interfaces/BlockModelProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/BlockModelProvider.java rename to src/main/java/org/betterx/bclib/interfaces/BlockModelProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/ChunkGeneratorAccessor.java b/src/main/java/org/betterx/bclib/interfaces/ChunkGeneratorAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/ChunkGeneratorAccessor.java rename to src/main/java/org/betterx/bclib/interfaces/ChunkGeneratorAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/CustomColorProvider.java b/src/main/java/org/betterx/bclib/interfaces/CustomColorProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/CustomColorProvider.java rename to src/main/java/org/betterx/bclib/interfaces/CustomColorProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java b/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java rename to src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/ItemModelProvider.java b/src/main/java/org/betterx/bclib/interfaces/ItemModelProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/ItemModelProvider.java rename to src/main/java/org/betterx/bclib/interfaces/ItemModelProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/LootPoolAccessor.java b/src/main/java/org/betterx/bclib/interfaces/LootPoolAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/LootPoolAccessor.java rename to src/main/java/org/betterx/bclib/interfaces/LootPoolAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/NoiseGeneratorSettingsProvider.java b/src/main/java/org/betterx/bclib/interfaces/NoiseGeneratorSettingsProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/NoiseGeneratorSettingsProvider.java rename to src/main/java/org/betterx/bclib/interfaces/NoiseGeneratorSettingsProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/NumericProvider.java b/src/main/java/org/betterx/bclib/interfaces/NumericProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/NumericProvider.java rename to src/main/java/org/betterx/bclib/interfaces/NumericProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java b/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java rename to src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java b/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java rename to src/main/java/org/betterx/bclib/interfaces/PatchFunction.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/PostInitable.java b/src/main/java/org/betterx/bclib/interfaces/PostInitable.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/PostInitable.java rename to src/main/java/org/betterx/bclib/interfaces/PostInitable.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/RenderLayerProvider.java b/src/main/java/org/betterx/bclib/interfaces/RenderLayerProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/RenderLayerProvider.java rename to src/main/java/org/betterx/bclib/interfaces/RenderLayerProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/SettingsExtender.java b/src/main/java/org/betterx/bclib/interfaces/SettingsExtender.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/SettingsExtender.java rename to src/main/java/org/betterx/bclib/interfaces/SettingsExtender.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/SpawnRule.java b/src/main/java/org/betterx/bclib/interfaces/SpawnRule.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/SpawnRule.java rename to src/main/java/org/betterx/bclib/interfaces/SpawnRule.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java b/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java rename to src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/SurfaceProvider.java b/src/main/java/org/betterx/bclib/interfaces/SurfaceProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/SurfaceProvider.java rename to src/main/java/org/betterx/bclib/interfaces/SurfaceProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnBlocks.java b/src/main/java/org/betterx/bclib/interfaces/SurvivesOnBlocks.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnBlocks.java rename to src/main/java/org/betterx/bclib/interfaces/SurvivesOnBlocks.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnSpecialGround.java b/src/main/java/org/betterx/bclib/interfaces/SurvivesOnSpecialGround.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnSpecialGround.java rename to src/main/java/org/betterx/bclib/interfaces/SurvivesOnSpecialGround.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java b/src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java rename to src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/TagProvider.java b/src/main/java/org/betterx/bclib/interfaces/TagProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/TagProvider.java rename to src/main/java/org/betterx/bclib/interfaces/TagProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/TheEndBiomesAccessor.java b/src/main/java/org/betterx/bclib/interfaces/TheEndBiomesAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/TheEndBiomesAccessor.java rename to src/main/java/org/betterx/bclib/interfaces/TheEndBiomesAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/TileEntityRenderProvider.java b/src/main/java/org/betterx/bclib/interfaces/TileEntityRenderProvider.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/TileEntityRenderProvider.java rename to src/main/java/org/betterx/bclib/interfaces/TileEntityRenderProvider.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/TriConsumer.java b/src/main/java/org/betterx/bclib/interfaces/TriConsumer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/TriConsumer.java rename to src/main/java/org/betterx/bclib/interfaces/TriConsumer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/UnknownReceipBookCategory.java b/src/main/java/org/betterx/bclib/interfaces/UnknownReceipBookCategory.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/UnknownReceipBookCategory.java rename to src/main/java/org/betterx/bclib/interfaces/UnknownReceipBookCategory.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableAxe.java b/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableAxe.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableAxe.java rename to src/main/java/org/betterx/bclib/interfaces/tools/AddMineableAxe.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHammer.java b/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHammer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHammer.java rename to src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHammer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHoe.java b/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHoe.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHoe.java rename to src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHoe.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineablePickaxe.java b/src/main/java/org/betterx/bclib/interfaces/tools/AddMineablePickaxe.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineablePickaxe.java rename to src/main/java/org/betterx/bclib/interfaces/tools/AddMineablePickaxe.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShears.java b/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShears.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShears.java rename to src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShears.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShovel.java b/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShovel.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShovel.java rename to src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShovel.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableSword.java b/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableSword.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableSword.java rename to src/main/java/org/betterx/bclib/interfaces/tools/AddMineableSword.java diff --git a/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/PreventMineableAdd.java b/src/main/java/org/betterx/bclib/interfaces/tools/PreventMineableAdd.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/interfaces/tools/PreventMineableAdd.java rename to src/main/java/org/betterx/bclib/interfaces/tools/PreventMineableAdd.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/BaseAnvilItem.java b/src/main/java/org/betterx/bclib/items/BaseAnvilItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/BaseAnvilItem.java rename to src/main/java/org/betterx/bclib/items/BaseAnvilItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/BaseArmorItem.java b/src/main/java/org/betterx/bclib/items/BaseArmorItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/BaseArmorItem.java rename to src/main/java/org/betterx/bclib/items/BaseArmorItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/BaseAttribute.java b/src/main/java/org/betterx/bclib/items/BaseAttribute.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/BaseAttribute.java rename to src/main/java/org/betterx/bclib/items/BaseAttribute.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/BaseBucketItem.java b/src/main/java/org/betterx/bclib/items/BaseBucketItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/BaseBucketItem.java rename to src/main/java/org/betterx/bclib/items/BaseBucketItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/BaseDiscItem.java b/src/main/java/org/betterx/bclib/items/BaseDiscItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/BaseDiscItem.java rename to src/main/java/org/betterx/bclib/items/BaseDiscItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/BaseDrinkItem.java b/src/main/java/org/betterx/bclib/items/BaseDrinkItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/BaseDrinkItem.java rename to src/main/java/org/betterx/bclib/items/BaseDrinkItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/BaseSpawnEggItem.java b/src/main/java/org/betterx/bclib/items/BaseSpawnEggItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/BaseSpawnEggItem.java rename to src/main/java/org/betterx/bclib/items/BaseSpawnEggItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/ModelProviderItem.java b/src/main/java/org/betterx/bclib/items/ModelProviderItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/ModelProviderItem.java rename to src/main/java/org/betterx/bclib/items/ModelProviderItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java b/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java rename to src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/elytra/BCLElytraUtils.java b/src/main/java/org/betterx/bclib/items/elytra/BCLElytraUtils.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/elytra/BCLElytraUtils.java rename to src/main/java/org/betterx/bclib/items/elytra/BCLElytraUtils.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseAxeItem.java b/src/main/java/org/betterx/bclib/items/tool/BaseAxeItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/tool/BaseAxeItem.java rename to src/main/java/org/betterx/bclib/items/tool/BaseAxeItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseHoeItem.java b/src/main/java/org/betterx/bclib/items/tool/BaseHoeItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/tool/BaseHoeItem.java rename to src/main/java/org/betterx/bclib/items/tool/BaseHoeItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/tool/BasePickaxeItem.java b/src/main/java/org/betterx/bclib/items/tool/BasePickaxeItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/tool/BasePickaxeItem.java rename to src/main/java/org/betterx/bclib/items/tool/BasePickaxeItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java b/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java rename to src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseShovelItem.java b/src/main/java/org/betterx/bclib/items/tool/BaseShovelItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/tool/BaseShovelItem.java rename to src/main/java/org/betterx/bclib/items/tool/BaseShovelItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseSwordItem.java b/src/main/java/org/betterx/bclib/items/tool/BaseSwordItem.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/items/tool/BaseSwordItem.java rename to src/main/java/org/betterx/bclib/items/tool/BaseSwordItem.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java b/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/BlockMixin.java b/src/main/java/org/betterx/bclib/mixin/client/BlockMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/BlockMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/BlockMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/ClientRecipeBookMixin.java b/src/main/java/org/betterx/bclib/mixin/client/ClientRecipeBookMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/ClientRecipeBookMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/ClientRecipeBookMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/FogRendererMixin.java b/src/main/java/org/betterx/bclib/mixin/client/FogRendererMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/FogRendererMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/FogRendererMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java b/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/GameMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java b/src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java b/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java b/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java b/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java b/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/SignEditScreenMixin.java b/src/main/java/org/betterx/bclib/mixin/client/SignEditScreenMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/SignEditScreenMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/SignEditScreenMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/client/TextureAtlasMixin.java b/src/main/java/org/betterx/bclib/mixin/client/TextureAtlasMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/client/TextureAtlasMixin.java rename to src/main/java/org/betterx/bclib/mixin/client/TextureAtlasMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/AnvilBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/AnvilBlockMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/AnvilBlockMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/AnvilBlockMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java b/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeGenerationSettingsAccessor.java b/src/main/java/org/betterx/bclib/mixin/common/BiomeGenerationSettingsAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeGenerationSettingsAccessor.java rename to src/main/java/org/betterx/bclib/mixin/common/BiomeGenerationSettingsAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeMixin.java b/src/main/java/org/betterx/bclib/mixin/common/BiomeMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/BiomeMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeSourceMixin.java b/src/main/java/org/betterx/bclib/mixin/common/BiomeSourceMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeSourceMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/BiomeSourceMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java b/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorAccessor.java b/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorAccessor.java rename to src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorMixin.java b/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java b/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/ComposterBlockAccessor.java b/src/main/java/org/betterx/bclib/mixin/common/ComposterBlockAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/ComposterBlockAccessor.java rename to src/main/java/org/betterx/bclib/mixin/common/ComposterBlockAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java b/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/DiggerItemMixin.java b/src/main/java/org/betterx/bclib/mixin/common/DiggerItemMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/DiggerItemMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/DiggerItemMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/DimensionTypeMixin.java b/src/main/java/org/betterx/bclib/mixin/common/DimensionTypeMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/DimensionTypeMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/DimensionTypeMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/ItemStackMixin.java b/src/main/java/org/betterx/bclib/mixin/common/ItemStackMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/ItemStackMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/ItemStackMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/LayerLightSectionStorageMixin.java b/src/main/java/org/betterx/bclib/mixin/common/LayerLightSectionStorageMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/LayerLightSectionStorageMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/LayerLightSectionStorageMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java b/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java b/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/MobSpawnSettingsAccessor.java b/src/main/java/org/betterx/bclib/mixin/common/MobSpawnSettingsAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/MobSpawnSettingsAccessor.java rename to src/main/java/org/betterx/bclib/mixin/common/MobSpawnSettingsAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/MultiPackResourceManagerMixin.java b/src/main/java/org/betterx/bclib/mixin/common/MultiPackResourceManagerMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/MultiPackResourceManagerMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/MultiPackResourceManagerMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java b/src/main/java/org/betterx/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/PlacementContextMixin.java b/src/main/java/org/betterx/bclib/mixin/common/PlacementContextMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/PlacementContextMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/PlacementContextMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java b/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/PotionBrewingAccessor.java b/src/main/java/org/betterx/bclib/mixin/common/PotionBrewingAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/PotionBrewingAccessor.java rename to src/main/java/org/betterx/bclib/mixin/common/PotionBrewingAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerAccessor.java b/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerAccessor.java rename to src/main/java/org/betterx/bclib/mixin/common/RecipeManagerAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java b/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java b/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/ShovelItemAccessor.java b/src/main/java/org/betterx/bclib/mixin/common/ShovelItemAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/ShovelItemAccessor.java rename to src/main/java/org/betterx/bclib/mixin/common/ShovelItemAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/StructuresAccessor.java b/src/main/java/org/betterx/bclib/mixin/common/StructuresAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/StructuresAccessor.java rename to src/main/java/org/betterx/bclib/mixin/common/StructuresAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/SurfaceRulesContextAccessor.java b/src/main/java/org/betterx/bclib/mixin/common/SurfaceRulesContextAccessor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/SurfaceRulesContextAccessor.java rename to src/main/java/org/betterx/bclib/mixin/common/SurfaceRulesContextAccessor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/TheEndBiomesMixin.java b/src/main/java/org/betterx/bclib/mixin/common/TheEndBiomesMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/TheEndBiomesMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/TheEndBiomesMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/WorldGenRegionMixin.java b/src/main/java/org/betterx/bclib/mixin/common/WorldGenRegionMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/WorldGenRegionMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/WorldGenRegionMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java b/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/BeehiveBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/BeehiveBlockMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/BeehiveBlockMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/shears/BeehiveBlockMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/DiggingEnchantmentMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/DiggingEnchantmentMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/DiggingEnchantmentMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/shears/DiggingEnchantmentMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/MushroomCowMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/MushroomCowMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/MushroomCowMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/shears/MushroomCowMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/PumpkinBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/PumpkinBlockMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/PumpkinBlockMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/shears/PumpkinBlockMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/SheepMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/SheepMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/SheepMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/shears/SheepMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/SnowGolemMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/SnowGolemMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/SnowGolemMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/shears/SnowGolemMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/TripWireBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/TripWireBlockMixin.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/TripWireBlockMixin.java rename to src/main/java/org/betterx/bclib/mixin/common/shears/TripWireBlockMixin.java diff --git a/core-v1/src/main/java/org/betterx/bclib/noise/Noises.java b/src/main/java/org/betterx/bclib/noise/Noises.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/noise/Noises.java rename to src/main/java/org/betterx/bclib/noise/Noises.java diff --git a/core-v1/src/main/java/org/betterx/bclib/noise/OpenSimplexNoise.java b/src/main/java/org/betterx/bclib/noise/OpenSimplexNoise.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/noise/OpenSimplexNoise.java rename to src/main/java/org/betterx/bclib/noise/OpenSimplexNoise.java diff --git a/core-v1/src/main/java/org/betterx/bclib/noise/VoronoiNoise.java b/src/main/java/org/betterx/bclib/noise/VoronoiNoise.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/noise/VoronoiNoise.java rename to src/main/java/org/betterx/bclib/noise/VoronoiNoise.java diff --git a/core-v1/src/main/java/org/betterx/bclib/particles/BCLParticleType.java b/src/main/java/org/betterx/bclib/particles/BCLParticleType.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/particles/BCLParticleType.java rename to src/main/java/org/betterx/bclib/particles/BCLParticleType.java diff --git a/core-v1/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java b/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java rename to src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java diff --git a/core-v1/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java b/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java rename to src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java diff --git a/core-v1/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java b/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java rename to src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java diff --git a/core-v1/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java b/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java rename to src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java diff --git a/core-v1/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java b/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java rename to src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java diff --git a/core-v1/src/main/java/org/betterx/bclib/recipes/GridRecipe.java b/src/main/java/org/betterx/bclib/recipes/GridRecipe.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/recipes/GridRecipe.java rename to src/main/java/org/betterx/bclib/recipes/GridRecipe.java diff --git a/core-v1/src/main/java/org/betterx/bclib/recipes/SmithingTableRecipe.java b/src/main/java/org/betterx/bclib/recipes/SmithingTableRecipe.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/recipes/SmithingTableRecipe.java rename to src/main/java/org/betterx/bclib/recipes/SmithingTableRecipe.java diff --git a/core-v1/src/main/java/org/betterx/bclib/registry/BaseBlockEntities.java b/src/main/java/org/betterx/bclib/registry/BaseBlockEntities.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/registry/BaseBlockEntities.java rename to src/main/java/org/betterx/bclib/registry/BaseBlockEntities.java diff --git a/core-v1/src/main/java/org/betterx/bclib/registry/BaseBlockEntityRenders.java b/src/main/java/org/betterx/bclib/registry/BaseBlockEntityRenders.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/registry/BaseBlockEntityRenders.java rename to src/main/java/org/betterx/bclib/registry/BaseBlockEntityRenders.java diff --git a/core-v1/src/main/java/org/betterx/bclib/registry/BaseRegistry.java b/src/main/java/org/betterx/bclib/registry/BaseRegistry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/registry/BaseRegistry.java rename to src/main/java/org/betterx/bclib/registry/BaseRegistry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/registry/BlockRegistry.java b/src/main/java/org/betterx/bclib/registry/BlockRegistry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/registry/BlockRegistry.java rename to src/main/java/org/betterx/bclib/registry/BlockRegistry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/registry/ItemRegistry.java b/src/main/java/org/betterx/bclib/registry/ItemRegistry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/registry/ItemRegistry.java rename to src/main/java/org/betterx/bclib/registry/ItemRegistry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java b/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java rename to src/main/java/org/betterx/bclib/registry/PresetsRegistry.java diff --git a/core-v1/src/main/java/org/betterx/bclib/registry/PresetsRegistryClient.java b/src/main/java/org/betterx/bclib/registry/PresetsRegistryClient.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/registry/PresetsRegistryClient.java rename to src/main/java/org/betterx/bclib/registry/PresetsRegistryClient.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/PosInfo.java b/src/main/java/org/betterx/bclib/sdf/PosInfo.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/PosInfo.java rename to src/main/java/org/betterx/bclib/sdf/PosInfo.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/SDF.java b/src/main/java/org/betterx/bclib/sdf/SDF.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/SDF.java rename to src/main/java/org/betterx/bclib/sdf/SDF.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFBinary.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFBinary.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFBinary.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFBinary.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFCoordModify.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFCoordModify.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFCoordModify.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFCoordModify.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFCopyRotate.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFCopyRotate.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFCopyRotate.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFCopyRotate.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFDisplacement.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFDisplacement.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFDisplacement.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFDisplacement.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFFlatWave.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFFlatWave.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFFlatWave.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFFlatWave.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFHeightmap.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFHeightmap.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFHeightmap.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFHeightmap.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFIntersection.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFIntersection.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFIntersection.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFIntersection.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFInvert.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFInvert.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFInvert.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFInvert.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRadialNoiseMap.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFRadialNoiseMap.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRadialNoiseMap.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFRadialNoiseMap.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRotation.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFRotation.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRotation.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFRotation.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRound.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFRound.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRound.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFRound.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFScale.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFScale.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFScale.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFScale.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFScale3D.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFScale3D.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFScale3D.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFScale3D.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothIntersection.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothIntersection.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothIntersection.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothIntersection.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothSubtraction.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothSubtraction.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothSubtraction.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothSubtraction.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothUnion.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothUnion.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothUnion.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothUnion.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSubtraction.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFSubtraction.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSubtraction.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFSubtraction.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFTranslate.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFTranslate.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFTranslate.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFTranslate.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFUnary.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFUnary.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFUnary.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFUnary.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFUnion.java b/src/main/java/org/betterx/bclib/sdf/operator/SDFUnion.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFUnion.java rename to src/main/java/org/betterx/bclib/sdf/operator/SDFUnion.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFCappedCone.java b/src/main/java/org/betterx/bclib/sdf/primitive/SDFCappedCone.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFCappedCone.java rename to src/main/java/org/betterx/bclib/sdf/primitive/SDFCappedCone.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFCapsule.java b/src/main/java/org/betterx/bclib/sdf/primitive/SDFCapsule.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFCapsule.java rename to src/main/java/org/betterx/bclib/sdf/primitive/SDFCapsule.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFFlatland.java b/src/main/java/org/betterx/bclib/sdf/primitive/SDFFlatland.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFFlatland.java rename to src/main/java/org/betterx/bclib/sdf/primitive/SDFFlatland.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFHexPrism.java b/src/main/java/org/betterx/bclib/sdf/primitive/SDFHexPrism.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFHexPrism.java rename to src/main/java/org/betterx/bclib/sdf/primitive/SDFHexPrism.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFLine.java b/src/main/java/org/betterx/bclib/sdf/primitive/SDFLine.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFLine.java rename to src/main/java/org/betterx/bclib/sdf/primitive/SDFLine.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFPie.java b/src/main/java/org/betterx/bclib/sdf/primitive/SDFPie.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFPie.java rename to src/main/java/org/betterx/bclib/sdf/primitive/SDFPie.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFPrimitive.java b/src/main/java/org/betterx/bclib/sdf/primitive/SDFPrimitive.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFPrimitive.java rename to src/main/java/org/betterx/bclib/sdf/primitive/SDFPrimitive.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFSphere.java b/src/main/java/org/betterx/bclib/sdf/primitive/SDFSphere.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFSphere.java rename to src/main/java/org/betterx/bclib/sdf/primitive/SDFSphere.java diff --git a/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFTorus.java b/src/main/java/org/betterx/bclib/sdf/primitive/SDFTorus.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFTorus.java rename to src/main/java/org/betterx/bclib/sdf/primitive/SDFTorus.java diff --git a/core-v1/src/main/java/org/betterx/bclib/server/BCLibServer.java b/src/main/java/org/betterx/bclib/server/BCLibServer.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/server/BCLibServer.java rename to src/main/java/org/betterx/bclib/server/BCLibServer.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/BackgroundInfo.java b/src/main/java/org/betterx/bclib/util/BackgroundInfo.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/BackgroundInfo.java rename to src/main/java/org/betterx/bclib/util/BackgroundInfo.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/BlocksHelper.java b/src/main/java/org/betterx/bclib/util/BlocksHelper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/BlocksHelper.java rename to src/main/java/org/betterx/bclib/util/BlocksHelper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/CollectionsUtil.java b/src/main/java/org/betterx/bclib/util/CollectionsUtil.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/CollectionsUtil.java rename to src/main/java/org/betterx/bclib/util/CollectionsUtil.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/ColorExtractor.java b/src/main/java/org/betterx/bclib/util/ColorExtractor.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/ColorExtractor.java rename to src/main/java/org/betterx/bclib/util/ColorExtractor.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/ColorUtil.java b/src/main/java/org/betterx/bclib/util/ColorUtil.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/ColorUtil.java rename to src/main/java/org/betterx/bclib/util/ColorUtil.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/ItemUtil.java b/src/main/java/org/betterx/bclib/util/ItemUtil.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/ItemUtil.java rename to src/main/java/org/betterx/bclib/util/ItemUtil.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/JsonFactory.java b/src/main/java/org/betterx/bclib/util/JsonFactory.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/JsonFactory.java rename to src/main/java/org/betterx/bclib/util/JsonFactory.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/Logger.java b/src/main/java/org/betterx/bclib/util/Logger.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/Logger.java rename to src/main/java/org/betterx/bclib/util/Logger.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/LootUtil.java b/src/main/java/org/betterx/bclib/util/LootUtil.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/LootUtil.java rename to src/main/java/org/betterx/bclib/util/LootUtil.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/MHelper.java b/src/main/java/org/betterx/bclib/util/MHelper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/MHelper.java rename to src/main/java/org/betterx/bclib/util/MHelper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/MethodReplace.java b/src/main/java/org/betterx/bclib/util/MethodReplace.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/MethodReplace.java rename to src/main/java/org/betterx/bclib/util/MethodReplace.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/ModUtil.java b/src/main/java/org/betterx/bclib/util/ModUtil.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/ModUtil.java rename to src/main/java/org/betterx/bclib/util/ModUtil.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/Pair.java b/src/main/java/org/betterx/bclib/util/Pair.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/Pair.java rename to src/main/java/org/betterx/bclib/util/Pair.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/PathUtil.java b/src/main/java/org/betterx/bclib/util/PathUtil.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/PathUtil.java rename to src/main/java/org/betterx/bclib/util/PathUtil.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/RecipeHelper.java b/src/main/java/org/betterx/bclib/util/RecipeHelper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/RecipeHelper.java rename to src/main/java/org/betterx/bclib/util/RecipeHelper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/SplineHelper.java b/src/main/java/org/betterx/bclib/util/SplineHelper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/SplineHelper.java rename to src/main/java/org/betterx/bclib/util/SplineHelper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/StructureErode.java b/src/main/java/org/betterx/bclib/util/StructureErode.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/StructureErode.java rename to src/main/java/org/betterx/bclib/util/StructureErode.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/StructureHelper.java b/src/main/java/org/betterx/bclib/util/StructureHelper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/StructureHelper.java rename to src/main/java/org/betterx/bclib/util/StructureHelper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/TranslationHelper.java b/src/main/java/org/betterx/bclib/util/TranslationHelper.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/TranslationHelper.java rename to src/main/java/org/betterx/bclib/util/TranslationHelper.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/TriFunction.java b/src/main/java/org/betterx/bclib/util/TriFunction.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/TriFunction.java rename to src/main/java/org/betterx/bclib/util/TriFunction.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/Triple.java b/src/main/java/org/betterx/bclib/util/Triple.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/Triple.java rename to src/main/java/org/betterx/bclib/util/Triple.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/WeighTree.java b/src/main/java/org/betterx/bclib/util/WeighTree.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/WeighTree.java rename to src/main/java/org/betterx/bclib/util/WeighTree.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/WeightedList.java b/src/main/java/org/betterx/bclib/util/WeightedList.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/util/WeightedList.java rename to src/main/java/org/betterx/bclib/util/WeightedList.java diff --git a/core-v1/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java b/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java similarity index 100% rename from core-v1/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java rename to src/main/java/org/betterx/bclib/world/structures/BCLStructure.java diff --git a/core-v1/src/main/resources/assets/bclib/lang/de_de.json b/src/main/resources/assets/bclib/lang/de_de.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/lang/de_de.json rename to src/main/resources/assets/bclib/lang/de_de.json diff --git a/core-v1/src/main/resources/assets/bclib/lang/en_us.json b/src/main/resources/assets/bclib/lang/en_us.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/lang/en_us.json rename to src/main/resources/assets/bclib/lang/en_us.json diff --git a/core-v1/src/main/resources/assets/bclib/lang/ko_kr.json b/src/main/resources/assets/bclib/lang/ko_kr.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/lang/ko_kr.json rename to src/main/resources/assets/bclib/lang/ko_kr.json diff --git a/core-v1/src/main/resources/assets/bclib/lang/ru_ru.json b/src/main/resources/assets/bclib/lang/ru_ru.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/lang/ru_ru.json rename to src/main/resources/assets/bclib/lang/ru_ru.json diff --git a/core-v1/src/main/resources/assets/bclib/lang/uk_ua.json b/src/main/resources/assets/bclib/lang/uk_ua.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/lang/uk_ua.json rename to src/main/resources/assets/bclib/lang/uk_ua.json diff --git a/core-v1/src/main/resources/assets/bclib/lang/zh_cn.json b/src/main/resources/assets/bclib/lang/zh_cn.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/lang/zh_cn.json rename to src/main/resources/assets/bclib/lang/zh_cn.json diff --git a/core-v1/src/main/resources/assets/bclib/materialmaps/block/alpha_emission.json b/src/main/resources/assets/bclib/materialmaps/block/alpha_emission.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/materialmaps/block/alpha_emission.json rename to src/main/resources/assets/bclib/materialmaps/block/alpha_emission.json diff --git a/core-v1/src/main/resources/assets/bclib/materials/alpha_emission.json b/src/main/resources/assets/bclib/materials/alpha_emission.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/materials/alpha_emission.json rename to src/main/resources/assets/bclib/materials/alpha_emission.json diff --git a/core-v1/src/main/resources/assets/bclib/models/block/chest_item.json b/src/main/resources/assets/bclib/models/block/chest_item.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/models/block/chest_item.json rename to src/main/resources/assets/bclib/models/block/chest_item.json diff --git a/core-v1/src/main/resources/assets/bclib/models/block/ladder.json b/src/main/resources/assets/bclib/models/block/ladder.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/models/block/ladder.json rename to src/main/resources/assets/bclib/models/block/ladder.json diff --git a/core-v1/src/main/resources/assets/bclib/models/block/path.json b/src/main/resources/assets/bclib/models/block/path.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/models/block/path.json rename to src/main/resources/assets/bclib/models/block/path.json diff --git a/core-v1/src/main/resources/assets/bclib/models/block/sided_door_bottom.json b/src/main/resources/assets/bclib/models/block/sided_door_bottom.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/models/block/sided_door_bottom.json rename to src/main/resources/assets/bclib/models/block/sided_door_bottom.json diff --git a/core-v1/src/main/resources/assets/bclib/models/block/sided_door_bottom_rh.json b/src/main/resources/assets/bclib/models/block/sided_door_bottom_rh.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/models/block/sided_door_bottom_rh.json rename to src/main/resources/assets/bclib/models/block/sided_door_bottom_rh.json diff --git a/core-v1/src/main/resources/assets/bclib/models/block/sided_door_top.json b/src/main/resources/assets/bclib/models/block/sided_door_top.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/models/block/sided_door_top.json rename to src/main/resources/assets/bclib/models/block/sided_door_top.json diff --git a/core-v1/src/main/resources/assets/bclib/models/block/sided_door_top_rh.json b/src/main/resources/assets/bclib/models/block/sided_door_top_rh.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/models/block/sided_door_top_rh.json rename to src/main/resources/assets/bclib/models/block/sided_door_top_rh.json diff --git a/core-v1/src/main/resources/assets/bclib/models/block/sided_trapdoor.json b/src/main/resources/assets/bclib/models/block/sided_trapdoor.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/models/block/sided_trapdoor.json rename to src/main/resources/assets/bclib/models/block/sided_trapdoor.json diff --git a/core-v1/src/main/resources/assets/bclib/models/block/tint_cube.json b/src/main/resources/assets/bclib/models/block/tint_cube.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/models/block/tint_cube.json rename to src/main/resources/assets/bclib/models/block/tint_cube.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/anvil.json b/src/main/resources/assets/bclib/patterns/block/anvil.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/anvil.json rename to src/main/resources/assets/bclib/patterns/block/anvil.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/barrel_open.json b/src/main/resources/assets/bclib/patterns/block/barrel_open.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/barrel_open.json rename to src/main/resources/assets/bclib/patterns/block/barrel_open.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/bars_post.json b/src/main/resources/assets/bclib/patterns/block/bars_post.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/bars_post.json rename to src/main/resources/assets/bclib/patterns/block/bars_post.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/bars_side.json b/src/main/resources/assets/bclib/patterns/block/bars_side.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/bars_side.json rename to src/main/resources/assets/bclib/patterns/block/bars_side.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/block.json b/src/main/resources/assets/bclib/patterns/block/block.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/block.json rename to src/main/resources/assets/bclib/patterns/block/block.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/block_bottom_top.json b/src/main/resources/assets/bclib/patterns/block/block_bottom_top.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/block_bottom_top.json rename to src/main/resources/assets/bclib/patterns/block/block_bottom_top.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/block_colored.json b/src/main/resources/assets/bclib/patterns/block/block_colored.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/block_colored.json rename to src/main/resources/assets/bclib/patterns/block/block_colored.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/block_sided.json b/src/main/resources/assets/bclib/patterns/block/block_sided.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/block_sided.json rename to src/main/resources/assets/bclib/patterns/block/block_sided.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/bookshelf.json b/src/main/resources/assets/bclib/patterns/block/bookshelf.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/bookshelf.json rename to src/main/resources/assets/bclib/patterns/block/bookshelf.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/button.json b/src/main/resources/assets/bclib/patterns/block/button.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/button.json rename to src/main/resources/assets/bclib/patterns/block/button.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/button_pressed.json b/src/main/resources/assets/bclib/patterns/block/button_pressed.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/button_pressed.json rename to src/main/resources/assets/bclib/patterns/block/button_pressed.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/chain.json b/src/main/resources/assets/bclib/patterns/block/chain.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/chain.json rename to src/main/resources/assets/bclib/patterns/block/chain.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/composter.json b/src/main/resources/assets/bclib/patterns/block/composter.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/composter.json rename to src/main/resources/assets/bclib/patterns/block/composter.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/cross.json b/src/main/resources/assets/bclib/patterns/block/cross.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/cross.json rename to src/main/resources/assets/bclib/patterns/block/cross.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/cross_shaded.json b/src/main/resources/assets/bclib/patterns/block/cross_shaded.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/cross_shaded.json rename to src/main/resources/assets/bclib/patterns/block/cross_shaded.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/door_bottom.json b/src/main/resources/assets/bclib/patterns/block/door_bottom.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/door_bottom.json rename to src/main/resources/assets/bclib/patterns/block/door_bottom.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/door_bottom_hinge.json b/src/main/resources/assets/bclib/patterns/block/door_bottom_hinge.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/door_bottom_hinge.json rename to src/main/resources/assets/bclib/patterns/block/door_bottom_hinge.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/door_top.json b/src/main/resources/assets/bclib/patterns/block/door_top.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/door_top.json rename to src/main/resources/assets/bclib/patterns/block/door_top.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/door_top_hinge.json b/src/main/resources/assets/bclib/patterns/block/door_top_hinge.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/door_top_hinge.json rename to src/main/resources/assets/bclib/patterns/block/door_top_hinge.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/empty.json b/src/main/resources/assets/bclib/patterns/block/empty.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/empty.json rename to src/main/resources/assets/bclib/patterns/block/empty.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/fence_gate_closed.json b/src/main/resources/assets/bclib/patterns/block/fence_gate_closed.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/fence_gate_closed.json rename to src/main/resources/assets/bclib/patterns/block/fence_gate_closed.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/fence_gate_open.json b/src/main/resources/assets/bclib/patterns/block/fence_gate_open.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/fence_gate_open.json rename to src/main/resources/assets/bclib/patterns/block/fence_gate_open.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/fence_post.json b/src/main/resources/assets/bclib/patterns/block/fence_post.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/fence_post.json rename to src/main/resources/assets/bclib/patterns/block/fence_post.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/fence_side.json b/src/main/resources/assets/bclib/patterns/block/fence_side.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/fence_side.json rename to src/main/resources/assets/bclib/patterns/block/fence_side.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/furnace.json b/src/main/resources/assets/bclib/patterns/block/furnace.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/furnace.json rename to src/main/resources/assets/bclib/patterns/block/furnace.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/furnace_glow.json b/src/main/resources/assets/bclib/patterns/block/furnace_glow.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/furnace_glow.json rename to src/main/resources/assets/bclib/patterns/block/furnace_glow.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/ladder.json b/src/main/resources/assets/bclib/patterns/block/ladder.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/ladder.json rename to src/main/resources/assets/bclib/patterns/block/ladder.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/path.json b/src/main/resources/assets/bclib/patterns/block/path.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/path.json rename to src/main/resources/assets/bclib/patterns/block/path.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/pillar.json b/src/main/resources/assets/bclib/patterns/block/pillar.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/pillar.json rename to src/main/resources/assets/bclib/patterns/block/pillar.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/pressure_plate_down.json b/src/main/resources/assets/bclib/patterns/block/pressure_plate_down.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/pressure_plate_down.json rename to src/main/resources/assets/bclib/patterns/block/pressure_plate_down.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/pressure_plate_up.json b/src/main/resources/assets/bclib/patterns/block/pressure_plate_up.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/pressure_plate_up.json rename to src/main/resources/assets/bclib/patterns/block/pressure_plate_up.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/slab.json b/src/main/resources/assets/bclib/patterns/block/slab.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/slab.json rename to src/main/resources/assets/bclib/patterns/block/slab.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/stairs.json b/src/main/resources/assets/bclib/patterns/block/stairs.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/stairs.json rename to src/main/resources/assets/bclib/patterns/block/stairs.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/stairs_inner.json b/src/main/resources/assets/bclib/patterns/block/stairs_inner.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/stairs_inner.json rename to src/main/resources/assets/bclib/patterns/block/stairs_inner.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/stairs_outer.json b/src/main/resources/assets/bclib/patterns/block/stairs_outer.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/stairs_outer.json rename to src/main/resources/assets/bclib/patterns/block/stairs_outer.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/top_side_bottom.json b/src/main/resources/assets/bclib/patterns/block/top_side_bottom.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/top_side_bottom.json rename to src/main/resources/assets/bclib/patterns/block/top_side_bottom.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/trapdoor.json b/src/main/resources/assets/bclib/patterns/block/trapdoor.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/trapdoor.json rename to src/main/resources/assets/bclib/patterns/block/trapdoor.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/wall_gate_closed.json b/src/main/resources/assets/bclib/patterns/block/wall_gate_closed.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/wall_gate_closed.json rename to src/main/resources/assets/bclib/patterns/block/wall_gate_closed.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/wall_gate_open.json b/src/main/resources/assets/bclib/patterns/block/wall_gate_open.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/wall_gate_open.json rename to src/main/resources/assets/bclib/patterns/block/wall_gate_open.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/wall_inventory.json b/src/main/resources/assets/bclib/patterns/block/wall_inventory.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/wall_inventory.json rename to src/main/resources/assets/bclib/patterns/block/wall_inventory.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/wall_post.json b/src/main/resources/assets/bclib/patterns/block/wall_post.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/wall_post.json rename to src/main/resources/assets/bclib/patterns/block/wall_post.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/wall_side.json b/src/main/resources/assets/bclib/patterns/block/wall_side.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/wall_side.json rename to src/main/resources/assets/bclib/patterns/block/wall_side.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/block/wall_side_tall.json b/src/main/resources/assets/bclib/patterns/block/wall_side_tall.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/block/wall_side_tall.json rename to src/main/resources/assets/bclib/patterns/block/wall_side_tall.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_block_item.json b/src/main/resources/assets/bclib/patterns/item/pattern_block_item.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/item/pattern_block_item.json rename to src/main/resources/assets/bclib/patterns/item/pattern_block_item.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_button.json b/src/main/resources/assets/bclib/patterns/item/pattern_button.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/item/pattern_button.json rename to src/main/resources/assets/bclib/patterns/item/pattern_button.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_chest.json b/src/main/resources/assets/bclib/patterns/item/pattern_chest.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/item/pattern_chest.json rename to src/main/resources/assets/bclib/patterns/item/pattern_chest.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_fence.json b/src/main/resources/assets/bclib/patterns/item/pattern_fence.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/item/pattern_fence.json rename to src/main/resources/assets/bclib/patterns/item/pattern_fence.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_generated.json b/src/main/resources/assets/bclib/patterns/item/pattern_item_generated.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_generated.json rename to src/main/resources/assets/bclib/patterns/item/pattern_item_generated.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_handheld.json b/src/main/resources/assets/bclib/patterns/item/pattern_item_handheld.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_handheld.json rename to src/main/resources/assets/bclib/patterns/item/pattern_item_handheld.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_spawn_egg.json b/src/main/resources/assets/bclib/patterns/item/pattern_item_spawn_egg.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_spawn_egg.json rename to src/main/resources/assets/bclib/patterns/item/pattern_item_spawn_egg.json diff --git a/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_wall.json b/src/main/resources/assets/bclib/patterns/item/pattern_wall.json similarity index 100% rename from core-v1/src/main/resources/assets/bclib/patterns/item/pattern_wall.json rename to src/main/resources/assets/bclib/patterns/item/pattern_wall.json diff --git a/core-v1/src/main/resources/assets/bclib/shaders/material/alpha_emission.frag b/src/main/resources/assets/bclib/shaders/material/alpha_emission.frag similarity index 100% rename from core-v1/src/main/resources/assets/bclib/shaders/material/alpha_emission.frag rename to src/main/resources/assets/bclib/shaders/material/alpha_emission.frag diff --git a/core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_cutout.fsh b/src/main/resources/assets/minecraft/shaders/core/rendertype_cutout.fsh similarity index 100% rename from core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_cutout.fsh rename to src/main/resources/assets/minecraft/shaders/core/rendertype_cutout.fsh diff --git a/core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh b/src/main/resources/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh similarity index 100% rename from core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh rename to src/main/resources/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh diff --git a/core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh b/src/main/resources/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh similarity index 100% rename from core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh rename to src/main/resources/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh diff --git a/core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh b/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh similarity index 100% rename from core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh rename to src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh diff --git a/core-v1/src/main/resources/bclib.accesswidener b/src/main/resources/bclib.accesswidener similarity index 100% rename from core-v1/src/main/resources/bclib.accesswidener rename to src/main/resources/bclib.accesswidener diff --git a/core-v1/src/main/resources/bclib.mixins.client.json b/src/main/resources/bclib.mixins.client.json similarity index 100% rename from core-v1/src/main/resources/bclib.mixins.client.json rename to src/main/resources/bclib.mixins.client.json diff --git a/core-v1/src/main/resources/bclib.mixins.common.json b/src/main/resources/bclib.mixins.common.json similarity index 100% rename from core-v1/src/main/resources/bclib.mixins.common.json rename to src/main/resources/bclib.mixins.common.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index bef018ed..0d14b068 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,12 +29,13 @@ ], "modmenu": [ "org.betterx.bclib.integration.modmenu.ModMenuEntryPoint" + ], + "worlds_together": [ + "org.betterx.bclib.registry.PresetsRegistry" ] }, "accessWidener": "bclib.accesswidener", "mixins": [ - "together.mixins.common.json", - "together.mixins.client.json", "bclib.mixins.common.json", "bclib.mixins.client.json" ],