diff --git a/Cargo.toml b/Cargo.toml
index 688a0df..0debb9d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ resolver = "2"
 getopts = "0.2.21"
 
 schala-repl = { path = "schala-repl" }
-schala-lang = { path = "schala-lang/language" }
+schala-lang = { path = "schala-lang" }
 # maaru-lang = { path = "maaru" }
 # rukka-lang = { path = "rukka" }
 # robo-lang = { path = "robo" }
diff --git a/schala-lang/language/Cargo.toml b/schala-lang/Cargo.toml
similarity index 91%
rename from schala-lang/language/Cargo.toml
rename to schala-lang/Cargo.toml
index bd8b08f..7985d46 100644
--- a/schala-lang/language/Cargo.toml
+++ b/schala-lang/Cargo.toml
@@ -18,7 +18,7 @@ assert_matches = "1.5"
 peg = { git = "https://github.com/kevinmehall/rust-peg", rev = "960222580c8da25b17d32c2aae6f52f902728b62" }
 
 
-schala-repl = { path = "../../schala-repl" }
+schala-repl = { path = "../schala-repl" }
 
 [dev-dependencies]
 test-case = "1.2.0"
diff --git a/schala-lang/language/source-files/prelude.schala b/schala-lang/source-files/prelude.schala
similarity index 100%
rename from schala-lang/language/source-files/prelude.schala
rename to schala-lang/source-files/prelude.schala
diff --git a/schala-lang/language/src/ast/mod.rs b/schala-lang/src/ast/mod.rs
similarity index 100%
rename from schala-lang/language/src/ast/mod.rs
rename to schala-lang/src/ast/mod.rs
diff --git a/schala-lang/language/src/ast/operators.rs b/schala-lang/src/ast/operators.rs
similarity index 100%
rename from schala-lang/language/src/ast/operators.rs
rename to schala-lang/src/ast/operators.rs
diff --git a/schala-lang/language/src/ast/visitor.rs b/schala-lang/src/ast/visitor.rs
similarity index 100%
rename from schala-lang/language/src/ast/visitor.rs
rename to schala-lang/src/ast/visitor.rs
diff --git a/schala-lang/language/src/ast/visualize.rs b/schala-lang/src/ast/visualize.rs
similarity index 100%
rename from schala-lang/language/src/ast/visualize.rs
rename to schala-lang/src/ast/visualize.rs
diff --git a/schala-lang/language/src/builtin.rs b/schala-lang/src/builtin.rs
similarity index 100%
rename from schala-lang/language/src/builtin.rs
rename to schala-lang/src/builtin.rs
diff --git a/schala-lang/language/src/error.rs b/schala-lang/src/error.rs
similarity index 100%
rename from schala-lang/language/src/error.rs
rename to schala-lang/src/error.rs
diff --git a/schala-lang/language/src/identifier.rs b/schala-lang/src/identifier.rs
similarity index 100%
rename from schala-lang/language/src/identifier.rs
rename to schala-lang/src/identifier.rs
diff --git a/schala-lang/language/src/lib.rs b/schala-lang/src/lib.rs
similarity index 100%
rename from schala-lang/language/src/lib.rs
rename to schala-lang/src/lib.rs
diff --git a/schala-lang/language/src/parsing/mod.rs b/schala-lang/src/parsing/mod.rs
similarity index 100%
rename from schala-lang/language/src/parsing/mod.rs
rename to schala-lang/src/parsing/mod.rs
diff --git a/schala-lang/language/src/parsing/new.rs b/schala-lang/src/parsing/new.rs
similarity index 100%
rename from schala-lang/language/src/parsing/new.rs
rename to schala-lang/src/parsing/new.rs
diff --git a/schala-lang/language/src/parsing/test.rs b/schala-lang/src/parsing/test.rs
similarity index 100%
rename from schala-lang/language/src/parsing/test.rs
rename to schala-lang/src/parsing/test.rs
diff --git a/schala-lang/language/src/reduced_ir/mod.rs b/schala-lang/src/reduced_ir/mod.rs
similarity index 100%
rename from schala-lang/language/src/reduced_ir/mod.rs
rename to schala-lang/src/reduced_ir/mod.rs
diff --git a/schala-lang/language/src/reduced_ir/test.rs b/schala-lang/src/reduced_ir/test.rs
similarity index 100%
rename from schala-lang/language/src/reduced_ir/test.rs
rename to schala-lang/src/reduced_ir/test.rs
diff --git a/schala-lang/language/src/reduced_ir/types.rs b/schala-lang/src/reduced_ir/types.rs
similarity index 100%
rename from schala-lang/language/src/reduced_ir/types.rs
rename to schala-lang/src/reduced_ir/types.rs
diff --git a/schala-lang/language/src/schala.rs b/schala-lang/src/schala.rs
similarity index 100%
rename from schala-lang/language/src/schala.rs
rename to schala-lang/src/schala.rs
diff --git a/schala-lang/language/src/symbol_table/fqsn.rs b/schala-lang/src/symbol_table/fqsn.rs
similarity index 100%
rename from schala-lang/language/src/symbol_table/fqsn.rs
rename to schala-lang/src/symbol_table/fqsn.rs
diff --git a/schala-lang/language/src/symbol_table/mod.rs b/schala-lang/src/symbol_table/mod.rs
similarity index 100%
rename from schala-lang/language/src/symbol_table/mod.rs
rename to schala-lang/src/symbol_table/mod.rs
diff --git a/schala-lang/language/src/symbol_table/populator.rs b/schala-lang/src/symbol_table/populator.rs
similarity index 100%
rename from schala-lang/language/src/symbol_table/populator.rs
rename to schala-lang/src/symbol_table/populator.rs
diff --git a/schala-lang/language/src/symbol_table/resolver.rs b/schala-lang/src/symbol_table/resolver.rs
similarity index 100%
rename from schala-lang/language/src/symbol_table/resolver.rs
rename to schala-lang/src/symbol_table/resolver.rs
diff --git a/schala-lang/language/src/symbol_table/symbol_trie.rs b/schala-lang/src/symbol_table/symbol_trie.rs
similarity index 100%
rename from schala-lang/language/src/symbol_table/symbol_trie.rs
rename to schala-lang/src/symbol_table/symbol_trie.rs
diff --git a/schala-lang/language/src/symbol_table/test.rs b/schala-lang/src/symbol_table/test.rs
similarity index 100%
rename from schala-lang/language/src/symbol_table/test.rs
rename to schala-lang/src/symbol_table/test.rs
diff --git a/schala-lang/language/src/tree_walk_eval/evaluator.rs b/schala-lang/src/tree_walk_eval/evaluator.rs
similarity index 100%
rename from schala-lang/language/src/tree_walk_eval/evaluator.rs
rename to schala-lang/src/tree_walk_eval/evaluator.rs
diff --git a/schala-lang/language/src/tree_walk_eval/mod.rs b/schala-lang/src/tree_walk_eval/mod.rs
similarity index 100%
rename from schala-lang/language/src/tree_walk_eval/mod.rs
rename to schala-lang/src/tree_walk_eval/mod.rs
diff --git a/schala-lang/language/src/tree_walk_eval/test.rs b/schala-lang/src/tree_walk_eval/test.rs
similarity index 100%
rename from schala-lang/language/src/tree_walk_eval/test.rs
rename to schala-lang/src/tree_walk_eval/test.rs
diff --git a/schala-lang/language/src/type_check.rs b/schala-lang/src/type_check.rs
similarity index 100%
rename from schala-lang/language/src/type_check.rs
rename to schala-lang/src/type_check.rs
diff --git a/schala-lang/language/src/type_inference/mod.rs b/schala-lang/src/type_inference/mod.rs
similarity index 100%
rename from schala-lang/language/src/type_inference/mod.rs
rename to schala-lang/src/type_inference/mod.rs
diff --git a/schala-lang/language/src/typechecking.rs b/schala-lang/src/typechecking.rs
similarity index 100%
rename from schala-lang/language/src/typechecking.rs
rename to schala-lang/src/typechecking.rs
diff --git a/schala-lang/language/src/util.rs b/schala-lang/src/util.rs
similarity index 100%
rename from schala-lang/language/src/util.rs
rename to schala-lang/src/util.rs