diff --git a/app/build.gradle b/app/build.gradle
index b2e3a41..7990914 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,10 +1,5 @@
 dependencies {
-    compile project(':api')
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: '1.3.61'
-    compile group: 'org.pf4j', name: 'pf4j', version: '3.2.0'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.1'
-    compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '2.0.0-alpha1'
+    compile project(':core')
     compile "com.xenomachina:kotlin-argparser:2.0.7"
 }
 
diff --git a/build.gradle b/build.gradle
index 60e2e1d..af24af8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,13 +31,20 @@ repositories {
 }
 
 task clean {
-    dependsOn ':app:clean'
     dependsOn ':api:clean'
+    dependsOn ':core:clean'
+    dependsOn ':app:clean'
     dependsOn ':modules:clean'
 }
 
 task build {
-    dependsOn ':app:jar'
     dependsOn ':api:build'
+    dependsOn ':core:build'
     dependsOn ':modules:build'
+    dependsOn ':app:build'
+}
+
+task jar {
+    dependsOn build
+    dependsOn ':app:jar'
 }
diff --git a/core/build.gradle b/core/build.gradle
new file mode 100644
index 0000000..8d9b7c6
--- /dev/null
+++ b/core/build.gradle
@@ -0,0 +1,8 @@
+dependencies {
+    compile project(':api')
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: '1.3.61'
+    compile group: 'org.pf4j', name: 'pf4j', version: '3.2.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.1'
+    compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '2.0.0-alpha1'
+}
diff --git a/app/src/main/kotlin/io/smnp/callable/function/CustomFunction.kt b/core/src/main/kotlin/io/smnp/callable/function/CustomFunction.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/callable/function/CustomFunction.kt
rename to core/src/main/kotlin/io/smnp/callable/function/CustomFunction.kt
diff --git a/app/src/main/kotlin/io/smnp/callable/method/CustomMethod.kt b/core/src/main/kotlin/io/smnp/callable/method/CustomMethod.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/callable/method/CustomMethod.kt
rename to core/src/main/kotlin/io/smnp/callable/method/CustomMethod.kt
diff --git a/app/src/main/kotlin/io/smnp/callable/util/FunctionEnvironmentProvider.kt b/core/src/main/kotlin/io/smnp/callable/util/FunctionEnvironmentProvider.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/callable/util/FunctionEnvironmentProvider.kt
rename to core/src/main/kotlin/io/smnp/callable/util/FunctionEnvironmentProvider.kt
diff --git a/app/src/main/kotlin/io/smnp/callable/util/FunctionSignatureParser.kt b/core/src/main/kotlin/io/smnp/callable/util/FunctionSignatureParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/callable/util/FunctionSignatureParser.kt
rename to core/src/main/kotlin/io/smnp/callable/util/FunctionSignatureParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/entity/ParserOutput.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/entity/ParserOutput.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/entity/ParserOutput.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/entity/ParserOutput.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/enumeration/ParsingResult.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/enumeration/ParsingResult.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/enumeration/ParsingResult.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/enumeration/ParsingResult.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/AbstractIterableNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/AbstractIterableNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/AbstractIterableNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/AbstractIterableNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/AccessOperatorNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/AccessOperatorNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/AccessOperatorNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/AccessOperatorNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/AssignmentOperatorNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/AssignmentOperatorNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/AssignmentOperatorNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/AssignmentOperatorNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/AtomAbstractNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/AtomAbstractNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/AtomAbstractNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/AtomAbstractNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/BinaryOperatorAbstractNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/BinaryOperatorAbstractNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/BinaryOperatorAbstractNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/BinaryOperatorAbstractNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/BlockNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/BlockNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/BlockNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/BlockNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/BoolLiteralNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/BoolLiteralNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/BoolLiteralNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/BoolLiteralNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/ConditionNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/ConditionNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/ConditionNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/ConditionNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/ExtendNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/ExtendNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/ExtendNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/ExtendNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/FloatLiteralNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/FloatLiteralNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/FloatLiteralNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/FloatLiteralNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionCallArgumentsNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionCallArgumentsNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionCallArgumentsNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionCallArgumentsNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionCallNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionCallNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionCallNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionCallNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionDefinitionArgumentsNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionDefinitionArgumentsNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionDefinitionArgumentsNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionDefinitionArgumentsNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionDefinitionNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionDefinitionNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionDefinitionNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionDefinitionNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/IdentifierNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/IdentifierNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/IdentifierNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/IdentifierNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/ImportNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/ImportNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/ImportNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/ImportNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/IntegerLiteralNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/IntegerLiteralNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/IntegerLiteralNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/IntegerLiteralNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/ListNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/ListNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/ListNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/ListNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/LogicOperatorNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/LogicOperatorNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/LogicOperatorNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/LogicOperatorNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/LoopNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/LoopNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/LoopNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/LoopNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/LoopParametersNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/LoopParametersNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/LoopParametersNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/LoopParametersNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/MapEntryNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/MapEntryNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/MapEntryNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/MapEntryNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/MapNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/MapNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/MapNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/MapNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/MeasureNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/MeasureNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/MeasureNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/MeasureNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/MinusOperatorNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/MinusOperatorNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/MinusOperatorNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/MinusOperatorNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/Node.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/Node.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/Node.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/Node.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/NoneNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/NoneNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/NoneNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/NoneNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/NotOperatorNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/NotOperatorNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/NotOperatorNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/NotOperatorNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/NoteLiteralNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/NoteLiteralNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/NoteLiteralNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/NoteLiteralNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/OptionalFunctionDefinitionArgumentNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/OptionalFunctionDefinitionArgumentNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/OptionalFunctionDefinitionArgumentNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/OptionalFunctionDefinitionArgumentNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/PowerOperatorNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/PowerOperatorNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/PowerOperatorNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/PowerOperatorNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/ProductOperatorNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/ProductOperatorNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/ProductOperatorNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/ProductOperatorNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/RegularFunctionDefinitionArgumentNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/RegularFunctionDefinitionArgumentNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/RegularFunctionDefinitionArgumentNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/RegularFunctionDefinitionArgumentNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/RelationOperatorNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/RelationOperatorNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/RelationOperatorNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/RelationOperatorNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/ReturnNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/ReturnNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/ReturnNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/ReturnNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/RootNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/RootNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/RootNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/RootNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/SingleTypeNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/SingleTypeNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/SingleTypeNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/SingleTypeNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/StaffNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/StaffNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/StaffNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/StaffNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/StringLiteralNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/StringLiteralNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/StringLiteralNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/StringLiteralNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/SumOperatorNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/SumOperatorNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/SumOperatorNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/SumOperatorNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/ThrowNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/ThrowNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/ThrowNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/ThrowNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/TimeSignatureNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/TimeSignatureNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/TimeSignatureNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/TimeSignatureNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/TokenNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/TokenNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/TokenNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/TokenNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/TypeSpecifierNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/TypeSpecifierNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/TypeSpecifierNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/TypeSpecifierNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/TypeSpecifiersNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/TypeSpecifiersNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/TypeSpecifiersNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/TypeSpecifiersNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/UnaryOperatorAbstractNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/UnaryOperatorAbstractNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/UnaryOperatorAbstractNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/UnaryOperatorAbstractNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/model/node/UnionTypeNode.kt b/core/src/main/kotlin/io/smnp/dsl/ast/model/node/UnionTypeNode.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/model/node/UnionTypeNode.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/model/node/UnionTypeNode.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/AbstractIterableParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/AbstractIterableParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/AbstractIterableParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/AbstractIterableParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/AssignmentOperatorParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/AssignmentOperatorParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/AssignmentOperatorParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/AssignmentOperatorParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/AtomParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/AtomParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/AtomParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/AtomParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/BlockParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/BlockParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/BlockParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/BlockParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/BoolLiteralParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/BoolLiteralParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/BoolLiteralParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/BoolLiteralParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/ComplexIdentifierParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/ComplexIdentifierParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/ComplexIdentifierParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/ComplexIdentifierParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/ConditionParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/ConditionParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/ConditionParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/ConditionParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/ExpressionParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/ExpressionParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/ExpressionParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/ExpressionParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/ExtendParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/ExtendParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/ExtendParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/ExtendParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/FactorParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/FactorParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/FactorParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/FactorParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/FloatLiteralParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/FloatLiteralParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/FloatLiteralParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/FloatLiteralParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionCallArgumentsParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionCallArgumentsParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionCallArgumentsParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionCallArgumentsParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionCallParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionCallParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionCallParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionCallParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionArgumentParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionArgumentParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionArgumentParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionArgumentParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionArgumentsParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionArgumentsParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionArgumentsParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionArgumentsParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/FunctionDefinitionParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/ImportParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/ImportParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/ImportParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/ImportParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/IntegerLiteralParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/IntegerLiteralParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/IntegerLiteralParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/IntegerLiteralParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/ListParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/ListParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/ListParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/ListParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/LiteralParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/LiteralParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/LiteralParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/LiteralParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/LoopParametersParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/LoopParametersParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/LoopParametersParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/LoopParametersParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/LoopParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/LoopParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/LoopParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/LoopParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/MapEntryParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/MapEntryParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/MapEntryParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/MapEntryParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/MapParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/MapParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/MapParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/MapParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/MeasureParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/MeasureParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/MeasureParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/MeasureParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/NoteLiteralParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/NoteLiteralParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/NoteLiteralParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/NoteLiteralParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/OptionalFunctionDefinitionArgumentParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/OptionalFunctionDefinitionArgumentParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/OptionalFunctionDefinitionArgumentParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/OptionalFunctionDefinitionArgumentParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/Parser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/Parser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/Parser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/Parser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/RegularFunctionDefinitionArgumentParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/RegularFunctionDefinitionArgumentParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/RegularFunctionDefinitionArgumentParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/RegularFunctionDefinitionArgumentParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/ReturnParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/ReturnParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/ReturnParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/ReturnParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/RootParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/RootParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/RootParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/RootParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/SimpleIdentifierParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/SimpleIdentifierParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/SimpleIdentifierParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/SimpleIdentifierParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/SingleTypeParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/SingleTypeParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/SingleTypeParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/SingleTypeParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/StaffParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/StaffParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/StaffParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/StaffParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/StatementParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/StatementParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/StatementParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/StatementParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/StringLiteralParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/StringLiteralParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/StringLiteralParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/StringLiteralParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/SubexpressionParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/SubexpressionParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/SubexpressionParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/SubexpressionParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/TermParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/TermParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/TermParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/TermParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/ThrowParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/ThrowParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/ThrowParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/ThrowParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/TimeSignatureParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/TimeSignatureParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/TimeSignatureParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/TimeSignatureParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/TypeParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/TypeParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/TypeParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/TypeParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/TypeSpecifierParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/TypeSpecifierParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/TypeSpecifierParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/TypeSpecifierParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/UnionTypeParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/UnionTypeParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/UnionTypeParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/UnionTypeParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/ast/parser/UnitParser.kt b/core/src/main/kotlin/io/smnp/dsl/ast/parser/UnitParser.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/ast/parser/UnitParser.kt
rename to core/src/main/kotlin/io/smnp/dsl/ast/parser/UnitParser.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/model/entity/Token.kt b/core/src/main/kotlin/io/smnp/dsl/token/model/entity/Token.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/model/entity/Token.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/model/entity/Token.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenList.kt b/core/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenList.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenList.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenList.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenPosition.kt b/core/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenPosition.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenPosition.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenPosition.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenizerOutput.kt b/core/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenizerOutput.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenizerOutput.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/model/entity/TokenizerOutput.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/model/enumeration/TokenType.kt b/core/src/main/kotlin/io/smnp/dsl/token/model/enumeration/TokenType.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/model/enumeration/TokenType.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/model/enumeration/TokenType.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/tokenizer/CommentTokenizer.kt b/core/src/main/kotlin/io/smnp/dsl/token/tokenizer/CommentTokenizer.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/tokenizer/CommentTokenizer.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/tokenizer/CommentTokenizer.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/tokenizer/DefaultTokenizer.kt b/core/src/main/kotlin/io/smnp/dsl/token/tokenizer/DefaultTokenizer.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/tokenizer/DefaultTokenizer.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/tokenizer/DefaultTokenizer.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/tokenizer/FloatTokenizer.kt b/core/src/main/kotlin/io/smnp/dsl/token/tokenizer/FloatTokenizer.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/tokenizer/FloatTokenizer.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/tokenizer/FloatTokenizer.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/tokenizer/NoteTokenizer.kt b/core/src/main/kotlin/io/smnp/dsl/token/tokenizer/NoteTokenizer.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/tokenizer/NoteTokenizer.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/tokenizer/NoteTokenizer.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/tokenizer/StringTokenizer.kt b/core/src/main/kotlin/io/smnp/dsl/token/tokenizer/StringTokenizer.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/tokenizer/StringTokenizer.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/tokenizer/StringTokenizer.kt
diff --git a/app/src/main/kotlin/io/smnp/dsl/token/tokenizer/Tokenizer.kt b/core/src/main/kotlin/io/smnp/dsl/token/tokenizer/Tokenizer.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/dsl/token/tokenizer/Tokenizer.kt
rename to core/src/main/kotlin/io/smnp/dsl/token/tokenizer/Tokenizer.kt
diff --git a/app/src/main/kotlin/io/smnp/environment/DefaultEnvironment.kt b/core/src/main/kotlin/io/smnp/environment/DefaultEnvironment.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/environment/DefaultEnvironment.kt
rename to core/src/main/kotlin/io/smnp/environment/DefaultEnvironment.kt
diff --git a/app/src/main/kotlin/io/smnp/error/InvalidSignatureException.kt b/core/src/main/kotlin/io/smnp/error/InvalidSignatureException.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/error/InvalidSignatureException.kt
rename to core/src/main/kotlin/io/smnp/error/InvalidSignatureException.kt
diff --git a/app/src/main/kotlin/io/smnp/error/InvalidSyntaxException.kt b/core/src/main/kotlin/io/smnp/error/InvalidSyntaxException.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/error/InvalidSyntaxException.kt
rename to core/src/main/kotlin/io/smnp/error/InvalidSyntaxException.kt
diff --git a/app/src/main/kotlin/io/smnp/error/ModuleException.kt b/core/src/main/kotlin/io/smnp/error/ModuleException.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/error/ModuleException.kt
rename to core/src/main/kotlin/io/smnp/error/ModuleException.kt
diff --git a/app/src/main/kotlin/io/smnp/error/PositionException.kt b/core/src/main/kotlin/io/smnp/error/PositionException.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/error/PositionException.kt
rename to core/src/main/kotlin/io/smnp/error/PositionException.kt
diff --git a/app/src/main/kotlin/io/smnp/error/PresetException.kt b/core/src/main/kotlin/io/smnp/error/PresetException.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/error/PresetException.kt
rename to core/src/main/kotlin/io/smnp/error/PresetException.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/AccessOperatorEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/AccessOperatorEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/AccessOperatorEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/AccessOperatorEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/AssignmentOperatorEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/AssignmentOperatorEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/AssignmentOperatorEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/AssignmentOperatorEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/BlockEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/BlockEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/BlockEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/BlockEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/BoolLiteralEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/BoolLiteralEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/BoolLiteralEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/BoolLiteralEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/ConditionEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/ConditionEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/ConditionEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/ConditionEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/DefaultEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/DefaultEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/DefaultEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/DefaultEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/Evaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/Evaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/Evaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/Evaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/ExpressionEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/ExpressionEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/ExpressionEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/ExpressionEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/ExtendEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/ExtendEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/ExtendEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/ExtendEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/FloatLiteralEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/FloatLiteralEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/FloatLiteralEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/FloatLiteralEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionCallEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionCallEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionCallEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionCallEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionDefinitionEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionDefinitionEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionDefinitionEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionDefinitionEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/IdentifierEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/IdentifierEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/IdentifierEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/IdentifierEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/ImportEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/ImportEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/ImportEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/ImportEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/IntegerLiteralEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/IntegerLiteralEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/IntegerLiteralEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/IntegerLiteralEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/ListEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/ListEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/ListEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/ListEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/LogicOperatorEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/LogicOperatorEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/LogicOperatorEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/LogicOperatorEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/LoopEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/LoopEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/LoopEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/LoopEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/MapEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/MapEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/MapEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/MapEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/MinusOperatorEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/MinusOperatorEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/MinusOperatorEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/MinusOperatorEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/NotOperatorEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/NotOperatorEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/NotOperatorEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/NotOperatorEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/NoteLiteralEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/NoteLiteralEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/NoteLiteralEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/NoteLiteralEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/PowerOperatorEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/PowerOperatorEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/PowerOperatorEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/PowerOperatorEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/ProductOperatorEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/ProductOperatorEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/ProductOperatorEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/ProductOperatorEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/RelationOperatorEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/RelationOperatorEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/RelationOperatorEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/RelationOperatorEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/ReturnEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/ReturnEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/ReturnEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/ReturnEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/RootEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/RootEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/RootEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/RootEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/StaffEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/StaffEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/StaffEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/StaffEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/StringLiteralEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/StringLiteralEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/StringLiteralEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/StringLiteralEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/SumOperatorEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/SumOperatorEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/SumOperatorEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/SumOperatorEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/evaluator/ThrowEvaluator.kt b/core/src/main/kotlin/io/smnp/evaluation/evaluator/ThrowEvaluator.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/evaluator/ThrowEvaluator.kt
rename to core/src/main/kotlin/io/smnp/evaluation/evaluator/ThrowEvaluator.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/model/entity/EvaluatorOutput.kt b/core/src/main/kotlin/io/smnp/evaluation/model/entity/EvaluatorOutput.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/model/entity/EvaluatorOutput.kt
rename to core/src/main/kotlin/io/smnp/evaluation/model/entity/EvaluatorOutput.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/model/enumeration/EvaluationResult.kt b/core/src/main/kotlin/io/smnp/evaluation/model/enumeration/EvaluationResult.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/model/enumeration/EvaluationResult.kt
rename to core/src/main/kotlin/io/smnp/evaluation/model/enumeration/EvaluationResult.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/model/exception/Return.kt b/core/src/main/kotlin/io/smnp/evaluation/model/exception/Return.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/model/exception/Return.kt
rename to core/src/main/kotlin/io/smnp/evaluation/model/exception/Return.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/util/ContextExceptionFactory.kt b/core/src/main/kotlin/io/smnp/evaluation/util/ContextExceptionFactory.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/util/ContextExceptionFactory.kt
rename to core/src/main/kotlin/io/smnp/evaluation/util/ContextExceptionFactory.kt
diff --git a/app/src/main/kotlin/io/smnp/evaluation/util/NumberUnification.kt b/core/src/main/kotlin/io/smnp/evaluation/util/NumberUnification.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/evaluation/util/NumberUnification.kt
rename to core/src/main/kotlin/io/smnp/evaluation/util/NumberUnification.kt
diff --git a/app/src/main/kotlin/io/smnp/ext/registry/DefaultModuleRegistry.kt b/core/src/main/kotlin/io/smnp/ext/registry/DefaultModuleRegistry.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/ext/registry/DefaultModuleRegistry.kt
rename to core/src/main/kotlin/io/smnp/ext/registry/DefaultModuleRegistry.kt
diff --git a/app/src/main/kotlin/io/smnp/interpreter/DefaultInterpreter.kt b/core/src/main/kotlin/io/smnp/interpreter/DefaultInterpreter.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/interpreter/DefaultInterpreter.kt
rename to core/src/main/kotlin/io/smnp/interpreter/DefaultInterpreter.kt
diff --git a/app/src/main/kotlin/io/smnp/interpreter/DefaultLanguageModuleInterpreter.kt b/core/src/main/kotlin/io/smnp/interpreter/DefaultLanguageModuleInterpreter.kt
similarity index 100%
rename from app/src/main/kotlin/io/smnp/interpreter/DefaultLanguageModuleInterpreter.kt
rename to core/src/main/kotlin/io/smnp/interpreter/DefaultLanguageModuleInterpreter.kt
diff --git a/settings.gradle b/settings.gradle
index cc9c0f7..671dd52 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,6 @@
 rootProject.name = 'io.smnp'
 include 'api'
+include 'core'
 include 'app'
 include 'modules'