diff --git a/core/.codecov.yml b/.codecov.yml similarity index 100% rename from core/.codecov.yml rename to .codecov.yml diff --git a/core/axon.gradle.kts b/axon.gradle.kts similarity index 100% rename from core/axon.gradle.kts rename to axon.gradle.kts diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8255db05..093474d2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ trigger: - '*' stages: -- stage: Build_Core +- stage: Build jobs: - job: Linux @@ -18,8 +18,8 @@ stages: - task: Gradle@2 displayName: 'Check' inputs: - workingDirectory: './core' - gradleWrapperFile: './core/gradlew' + workingDirectory: '' + gradleWrapperFile: 'gradlew' gradleOptions: '-Xmx3072m' options: '--stacktrace -PlogTests -Pheadless' javaHomeOption: 'JDKVersion' @@ -31,7 +31,7 @@ stages: - bash: bash <(curl -s https://codecov.io/bash) -f "*jacocoTestReport.xml" -f "*mergeReports.xml" || echo 'Codecov failed to upload' displayName: 'CodeCov' - workingDirectory: './core' + workingDirectory: '' env: CODECOV_TOKEN: $(CODECOV_TOKEN) @@ -44,8 +44,8 @@ stages: - task: Gradle@2 displayName: 'Check' inputs: - workingDirectory: './core' - gradleWrapperFile: './core/gradlew' + workingDirectory: '' + gradleWrapperFile: 'gradlew' gradleOptions: '-Xmx3072m' options: '--stacktrace -PlogTests -Pheadless' javaHomeOption: 'JDKVersion' @@ -63,8 +63,8 @@ stages: - task: Gradle@2 displayName: 'Check' inputs: - workingDirectory: './core' - gradleWrapperFile: './core/gradlew' + workingDirectory: '' + gradleWrapperFile: 'gradlew' gradleOptions: '-Xmx3072m' options: '--stacktrace -PlogTests -Pheadless' javaHomeOption: 'JDKVersion' diff --git a/core/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml similarity index 100% rename from core/config/checkstyle/checkstyle.xml rename to config/checkstyle/checkstyle.xml diff --git a/core/config/checkstyle/checkstyleSuppressions.xml b/config/checkstyle/checkstyleSuppressions.xml similarity index 100% rename from core/config/checkstyle/checkstyleSuppressions.xml rename to config/checkstyle/checkstyleSuppressions.xml diff --git a/core/config/detekt/config.yml b/config/detekt/config.yml similarity index 100% rename from core/config/detekt/config.yml rename to config/detekt/config.yml diff --git a/core/config/pmd/pmd-ruleset.xml b/config/pmd/pmd-ruleset.xml similarity index 100% rename from core/config/pmd/pmd-ruleset.xml rename to config/pmd/pmd-ruleset.xml diff --git a/core/config/spotbugs/spotbugs-excludeFilter.xml b/config/spotbugs/spotbugs-excludeFilter.xml similarity index 100% rename from core/config/spotbugs/spotbugs-excludeFilter.xml rename to config/spotbugs/spotbugs-excludeFilter.xml diff --git a/core/.gitignore b/core/.gitignore deleted file mode 100644 index e658def6..00000000 --- a/core/.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -# Created by https://www.gitignore.io/ - -### Gradle ### -.gradle -build/ -build-cache/ -*.class - -# Ignore Gradle GUI config -gradle-app.setting - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - -### Intellij ### -.idea/ -*.iws -*.iml -*.ipr -out/ - -### NetworkTable Persistence ### -networktables.ini -networktables.ini.bak -CSGdatabase.json -lib/ -conf/ -.attach_pid* -*.hprof -.~lock* -venv -spec_failures diff --git a/core/core/core.gradle.kts b/core/core.gradle.kts similarity index 100% rename from core/core/core.gradle.kts rename to core/core.gradle.kts diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/input/DictionaryInputStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/input/DictionaryInputStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/input/DictionaryInputStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/input/DictionaryInputStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/input/InputStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/input/InputStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/input/InputStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/input/InputStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageFromDiskStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageFromDiskStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageFromDiskStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageFromDiskStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageFromTensorProtoStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageFromTensorProtoStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageFromTensorProtoStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageFromTensorProtoStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/loadimage/LoadImageStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/output/OutputStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/output/OutputStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/output/OutputStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/output/OutputStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/output/Yolov3OutputStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/output/Yolov3OutputStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/output/Yolov3OutputStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/output/Yolov3OutputStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/postprocess/PostprocessStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/postprocess/PostprocessStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/postprocess/PostprocessStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/postprocess/PostprocessStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/postprocess/Yolov3PostprocessStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/postprocess/Yolov3PostprocessStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/postprocess/Yolov3PostprocessStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/postprocess/Yolov3PostprocessStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/preprocess/ImagePreprocessStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/preprocess/ImagePreprocessStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/preprocess/ImagePreprocessStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/preprocess/ImagePreprocessStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/preprocess/PilImagePreprocessStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/preprocess/PilImagePreprocessStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/preprocess/PilImagePreprocessStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/preprocess/PilImagePreprocessStrategy.kt diff --git a/core/core/src/main/kotlin/edu/wpi/axon/core/preprocess/TensorProtoImagePreprocessStrategy.kt b/core/src/main/kotlin/edu/wpi/axon/core/preprocess/TensorProtoImagePreprocessStrategy.kt similarity index 100% rename from core/core/src/main/kotlin/edu/wpi/axon/core/preprocess/TensorProtoImagePreprocessStrategy.kt rename to core/src/main/kotlin/edu/wpi/axon/core/preprocess/TensorProtoImagePreprocessStrategy.kt diff --git a/core/core/src/test/kotlin/edu/wpi/axon/core/DictionaryInputStrategyTest.kt b/core/src/test/kotlin/edu/wpi/axon/core/DictionaryInputStrategyTest.kt similarity index 100% rename from core/core/src/test/kotlin/edu/wpi/axon/core/DictionaryInputStrategyTest.kt rename to core/src/test/kotlin/edu/wpi/axon/core/DictionaryInputStrategyTest.kt diff --git a/core/core/src/test/kotlin/edu/wpi/axon/core/TestMQP.kt b/core/src/test/kotlin/edu/wpi/axon/core/TestMQP.kt similarity index 100% rename from core/core/src/test/kotlin/edu/wpi/axon/core/TestMQP.kt rename to core/src/test/kotlin/edu/wpi/axon/core/TestMQP.kt diff --git a/core/dependencies/tornadofx/LICENSE b/dependencies/tornadofx/LICENSE similarity index 100% rename from core/dependencies/tornadofx/LICENSE rename to dependencies/tornadofx/LICENSE diff --git a/core/dsl-interface/dsl-interface.gradle.kts b/dsl-interface/dsl-interface.gradle.kts similarity index 100% rename from core/dsl-interface/dsl-interface.gradle.kts rename to dsl-interface/dsl-interface.gradle.kts diff --git a/core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Code.kt b/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Code.kt similarity index 100% rename from core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Code.kt rename to dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Code.kt diff --git a/core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Configurable.kt b/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Configurable.kt similarity index 100% rename from core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Configurable.kt rename to dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Configurable.kt diff --git a/core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainer.kt b/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainer.kt similarity index 100% rename from core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainer.kt rename to dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainer.kt diff --git a/core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/Import.kt b/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/Import.kt similarity index 100% rename from core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/Import.kt rename to dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/Import.kt diff --git a/core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/ImportValidator.kt b/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/ImportValidator.kt similarity index 100% rename from core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/ImportValidator.kt rename to dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/ImportValidator.kt diff --git a/core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/task/Task.kt b/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/task/Task.kt similarity index 100% rename from core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/task/Task.kt rename to dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/task/Task.kt diff --git a/core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/path/PathValidator.kt b/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/path/PathValidator.kt similarity index 100% rename from core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/path/PathValidator.kt rename to dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/path/PathValidator.kt diff --git a/core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/VariableNameValidator.kt b/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/VariableNameValidator.kt similarity index 100% rename from core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/VariableNameValidator.kt rename to dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/VariableNameValidator.kt diff --git a/core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/variable/Variable.kt b/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/variable/Variable.kt similarity index 100% rename from core/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/variable/Variable.kt rename to dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/variable/Variable.kt diff --git a/core/dsl-interface/src/test/kotlin/edu/wpi/axon/dsl/ImportTest.kt b/dsl-interface/src/test/kotlin/edu/wpi/axon/dsl/ImportTest.kt similarity index 100% rename from core/dsl-interface/src/test/kotlin/edu/wpi/axon/dsl/ImportTest.kt rename to dsl-interface/src/test/kotlin/edu/wpi/axon/dsl/ImportTest.kt diff --git a/core/dsl-test-util/dsl-test-util.gradle.kts b/dsl-test-util/dsl-test-util.gradle.kts similarity index 100% rename from core/dsl-test-util/dsl-test-util.gradle.kts rename to dsl-test-util/dsl-test-util.gradle.kts diff --git a/core/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockTask.kt b/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockTask.kt similarity index 100% rename from core/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockTask.kt rename to dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockTask.kt diff --git a/core/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockUtil.kt b/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockUtil.kt similarity index 100% rename from core/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockUtil.kt rename to dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockUtil.kt diff --git a/core/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockVariable.kt b/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockVariable.kt similarity index 100% rename from core/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockVariable.kt rename to dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockVariable.kt diff --git a/core/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TestUtil.kt b/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TestUtil.kt similarity index 100% rename from core/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TestUtil.kt rename to dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TestUtil.kt diff --git a/core/dsl/dsl.gradle.kts b/dsl/dsl.gradle.kts similarity index 100% rename from core/dsl/dsl.gradle.kts rename to dsl/dsl.gradle.kts diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/CodeGraph.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/CodeGraph.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/CodeGraph.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/CodeGraph.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/GraphUtil.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/GraphUtil.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/GraphUtil.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/GraphUtil.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/KoinModules.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/KoinModules.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/KoinModules.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/KoinModules.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/PolymorphicNamedDomainObjectContainerUtil.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/PolymorphicNamedDomainObjectContainerUtil.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/PolymorphicNamedDomainObjectContainerUtil.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/PolymorphicNamedDomainObjectContainerUtil.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/ScriptGenerator.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/ScriptGenerator.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/ScriptGenerator.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/ScriptGenerator.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/Util.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/Util.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/Util.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/Util.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DslDelegate.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DslDelegate.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DslDelegate.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DslDelegate.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidator.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidator.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidator.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidator.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/BaseTask.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/BaseTask.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/BaseTask.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/task/BaseTask.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EmptyBaseTask.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EmptyBaseTask.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EmptyBaseTask.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EmptyBaseTask.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/InferenceTask.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/InferenceTask.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/InferenceTask.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/task/InferenceTask.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadClassLabels.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadClassLabels.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadClassLabels.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadClassLabels.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadImageTask.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadImageTask.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadImageTask.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadImageTask.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/MakeNewInferenceSession.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/MakeNewInferenceSession.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/MakeNewInferenceSession.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/task/MakeNewInferenceSession.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidator.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidator.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidator.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidator.kt diff --git a/core/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidator.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidator.kt similarity index 100% rename from core/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidator.kt rename to dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidator.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/CodeGraphTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/CodeGraphTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/CodeGraphTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/CodeGraphTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/MockContainer.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/MockContainer.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/MockContainer.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/MockContainer.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorIntegrationTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorIntegrationTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorIntegrationTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorIntegrationTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidatorTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidatorTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidatorTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidatorTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/BaseTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/BaseTaskTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/BaseTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/task/BaseTaskTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/InferenceTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/InferenceTaskTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/InferenceTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/task/InferenceTaskTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/MakeNewInferenceSessionTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/MakeNewInferenceSessionTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/MakeNewInferenceSessionTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/task/MakeNewInferenceSessionTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidatorTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidatorTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidatorTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidatorTest.kt diff --git a/core/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidatorTest.kt b/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidatorTest.kt similarity index 100% rename from core/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidatorTest.kt rename to dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidatorTest.kt diff --git a/core/gradle.properties b/gradle.properties similarity index 100% rename from core/gradle.properties rename to gradle.properties diff --git a/core/gradle/generated-kotlin-sources.gradle b/gradle/generated-kotlin-sources.gradle similarity index 100% rename from core/gradle/generated-kotlin-sources.gradle rename to gradle/generated-kotlin-sources.gradle diff --git a/core/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from core/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/core/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from core/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/core/gradlew b/gradlew similarity index 100% rename from core/gradlew rename to gradlew diff --git a/core/gradlew.bat b/gradlew.bat similarity index 100% rename from core/gradlew.bat rename to gradlew.bat diff --git a/core/pattern-match/pattern-match.gradle.kts b/pattern-match/pattern-match.gradle.kts similarity index 100% rename from core/pattern-match/pattern-match.gradle.kts rename to pattern-match/pattern-match.gradle.kts diff --git a/core/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/MatchedPremise.kt b/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/MatchedPremise.kt similarity index 100% rename from core/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/MatchedPremise.kt rename to pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/MatchedPremise.kt diff --git a/core/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/Pattern.kt b/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/Pattern.kt similarity index 100% rename from core/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/Pattern.kt rename to pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/Pattern.kt diff --git a/core/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/PatternMatch.kt b/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/PatternMatch.kt similarity index 100% rename from core/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/PatternMatch.kt rename to pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/PatternMatch.kt diff --git a/core/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/ReturnValue.kt b/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/ReturnValue.kt similarity index 100% rename from core/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/ReturnValue.kt rename to pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/ReturnValue.kt diff --git a/core/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternMatchTest.kt b/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternMatchTest.kt similarity index 100% rename from core/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternMatchTest.kt rename to pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternMatchTest.kt diff --git a/core/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternTest.kt b/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternTest.kt similarity index 100% rename from core/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternTest.kt rename to pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternTest.kt diff --git a/core/settings.gradle.kts b/settings.gradle.kts similarity index 100% rename from core/settings.gradle.kts rename to settings.gradle.kts diff --git a/core/task-property-testing/src/test/kotlin/edu/wpi/axon/dsl/GeneralTaskConfigurationTest.kt b/task-property-testing/src/test/kotlin/edu/wpi/axon/dsl/GeneralTaskConfigurationTest.kt similarity index 100% rename from core/task-property-testing/src/test/kotlin/edu/wpi/axon/dsl/GeneralTaskConfigurationTest.kt rename to task-property-testing/src/test/kotlin/edu/wpi/axon/dsl/GeneralTaskConfigurationTest.kt diff --git a/core/task-property-testing/task-property-testing.gradle.kts b/task-property-testing/task-property-testing.gradle.kts similarity index 100% rename from core/task-property-testing/task-property-testing.gradle.kts rename to task-property-testing/task-property-testing.gradle.kts diff --git a/core/tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/ConstructYoloV3ImageInput.kt b/tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/ConstructYoloV3ImageInput.kt similarity index 100% rename from core/tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/ConstructYoloV3ImageInput.kt rename to tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/ConstructYoloV3ImageInput.kt diff --git a/core/tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/LoadYoloV3ImageData.kt b/tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/LoadYoloV3ImageData.kt similarity index 100% rename from core/tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/LoadYoloV3ImageData.kt rename to tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/LoadYoloV3ImageData.kt diff --git a/core/tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/YoloV3PostprocessTask.kt b/tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/YoloV3PostprocessTask.kt similarity index 100% rename from core/tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/YoloV3PostprocessTask.kt rename to tasks-yolov3/src/main/kotlin/edu/wpi/axon/tasks/yolov3/YoloV3PostprocessTask.kt diff --git a/core/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/ConstructYoloV3ImageInputTest.kt b/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/ConstructYoloV3ImageInputTest.kt similarity index 100% rename from core/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/ConstructYoloV3ImageInputTest.kt rename to tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/ConstructYoloV3ImageInputTest.kt diff --git a/core/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/LoadYoloV3ImageDataTest.kt b/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/LoadYoloV3ImageDataTest.kt similarity index 100% rename from core/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/LoadYoloV3ImageDataTest.kt rename to tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/LoadYoloV3ImageDataTest.kt diff --git a/core/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/YoloV3PostprocessTaskTest.kt b/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/YoloV3PostprocessTaskTest.kt similarity index 100% rename from core/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/YoloV3PostprocessTaskTest.kt rename to tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/YoloV3PostprocessTaskTest.kt diff --git a/core/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/Yolov3IntegrationTest.kt b/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/Yolov3IntegrationTest.kt similarity index 100% rename from core/tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/Yolov3IntegrationTest.kt rename to tasks-yolov3/src/test/kotlin/edu/wpi/axon/tasks/yolov3/Yolov3IntegrationTest.kt diff --git a/core/tasks-yolov3/tasks-yolov3.gradle.kts b/tasks-yolov3/tasks-yolov3.gradle.kts similarity index 100% rename from core/tasks-yolov3/tasks-yolov3.gradle.kts rename to tasks-yolov3/tasks-yolov3.gradle.kts diff --git a/core/test-util/src/main/kotlin/edu/wpi/axon/testutil/HamkrestUtil.kt b/test-util/src/main/kotlin/edu/wpi/axon/testutil/HamkrestUtil.kt similarity index 100% rename from core/test-util/src/main/kotlin/edu/wpi/axon/testutil/HamkrestUtil.kt rename to test-util/src/main/kotlin/edu/wpi/axon/testutil/HamkrestUtil.kt diff --git a/core/test-util/src/main/kotlin/edu/wpi/axon/testutil/KoinTestFixture.kt b/test-util/src/main/kotlin/edu/wpi/axon/testutil/KoinTestFixture.kt similarity index 100% rename from core/test-util/src/main/kotlin/edu/wpi/axon/testutil/KoinTestFixture.kt rename to test-util/src/main/kotlin/edu/wpi/axon/testutil/KoinTestFixture.kt diff --git a/core/test-util/test-util.gradle.kts b/test-util/test-util.gradle.kts similarity index 100% rename from core/test-util/test-util.gradle.kts rename to test-util/test-util.gradle.kts diff --git a/core/util/src/main/kotlin/edu/wpi/axon/util/SingleAssign.kt b/util/src/main/kotlin/edu/wpi/axon/util/SingleAssign.kt similarity index 100% rename from core/util/src/main/kotlin/edu/wpi/axon/util/SingleAssign.kt rename to util/src/main/kotlin/edu/wpi/axon/util/SingleAssign.kt diff --git a/core/util/util.gradle.kts b/util/util.gradle.kts similarity index 100% rename from core/util/util.gradle.kts rename to util/util.gradle.kts