diff --git a/Cargo.toml b/Cargo.toml
index 302a881..3e417c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ schala-codegen = { path = "schala-codegen" }
 maaru-lang = { path = "maaru" }
 rukka-lang = { path = "rukka" }
 robo-lang = { path = "robo" }
-schala-lang = { path = "schala-lang" }
+schala-lang = { path = "schala-lang/language" }
 
 [build-dependencies]
 includedir_codegen = "0.2.0"
diff --git a/schala-lang/Cargo.toml b/schala-lang/language/Cargo.toml
similarity index 66%
rename from schala-lang/Cargo.toml
rename to schala-lang/language/Cargo.toml
index 5ec98b6..e7f1e68 100644
--- a/schala-lang/Cargo.toml
+++ b/schala-lang/language/Cargo.toml
@@ -9,5 +9,5 @@ take_mut = "0.1.3"
 maplit = "*"
 lazy_static = "0.2.8"
 
-schala-repl = { path = "../schala-repl" }
-schala-codegen = { path = "../schala-codegen" }
+schala-repl = { path = "../../schala-repl" }
+schala-codegen = { path = "../../schala-codegen" }
diff --git a/schala-lang/src/ast.rs b/schala-lang/language/src/ast.rs
similarity index 100%
rename from schala-lang/src/ast.rs
rename to schala-lang/language/src/ast.rs
diff --git a/schala-lang/src/builtin.rs b/schala-lang/language/src/builtin.rs
similarity index 100%
rename from schala-lang/src/builtin.rs
rename to schala-lang/language/src/builtin.rs
diff --git a/schala-lang/src/eval.rs b/schala-lang/language/src/eval.rs
similarity index 100%
rename from schala-lang/src/eval.rs
rename to schala-lang/language/src/eval.rs
diff --git a/schala-lang/src/lib.rs b/schala-lang/language/src/lib.rs
similarity index 100%
rename from schala-lang/src/lib.rs
rename to schala-lang/language/src/lib.rs
diff --git a/schala-lang/src/parsing.rs b/schala-lang/language/src/parsing.rs
similarity index 100%
rename from schala-lang/src/parsing.rs
rename to schala-lang/language/src/parsing.rs
diff --git a/schala-lang/src/reduced_ast.rs b/schala-lang/language/src/reduced_ast.rs
similarity index 100%
rename from schala-lang/src/reduced_ast.rs
rename to schala-lang/language/src/reduced_ast.rs
diff --git a/schala-lang/src/symbol_table.rs b/schala-lang/language/src/symbol_table.rs
similarity index 100%
rename from schala-lang/src/symbol_table.rs
rename to schala-lang/language/src/symbol_table.rs
diff --git a/schala-lang/src/tokenizing.rs b/schala-lang/language/src/tokenizing.rs
similarity index 100%
rename from schala-lang/src/tokenizing.rs
rename to schala-lang/language/src/tokenizing.rs
diff --git a/schala-lang/src/type_check.rs b/schala-lang/language/src/type_check.rs
similarity index 100%
rename from schala-lang/src/type_check.rs
rename to schala-lang/language/src/type_check.rs
diff --git a/schala-lang/src/typechecking.rs b/schala-lang/language/src/typechecking.rs
similarity index 100%
rename from schala-lang/src/typechecking.rs
rename to schala-lang/language/src/typechecking.rs
diff --git a/schala-lang/src/util.rs b/schala-lang/language/src/util.rs
similarity index 100%
rename from schala-lang/src/util.rs
rename to schala-lang/language/src/util.rs