diff --git a/parser/Parser.mk b/parser/Parser.mk
index 7f64ce40..fb2af0ce 100644
--- a/parser/Parser.mk
+++ b/parser/Parser.mk
@@ -13,7 +13,7 @@
 ANAME			= 	parser
 
 BUILD_DIR		=	../build
-SRC_DIR			=   ./nnsrc
+SRC_DIR			=   ./src
 GEN_DIR 		=   ./generic
 
 BONUS_FLAGS		=
diff --git a/parser/includes/api.h b/parser/includes/api.h
index 1be78fe0..e2f614fd 100644
--- a/parser/includes/api.h
+++ b/parser/includes/api.h
@@ -1,16 +1,16 @@
-#include "../nnsrc/alloc.h"
-#include "../nnsrc/api.h"
-#include "../nnsrc/array.h"
-#include "../nnsrc/clock.h"
-#include "../nnsrc/host.h"
-#include "../nnsrc/language.h"
-#include "../nnsrc/length.h"
-#include "../nnsrc/lexer.h"
-#include "../nnsrc/parser.h"
-#include "../nnsrc/stack.h"
-#include "../nnsrc/subtree.h"
-#include "../nnsrc/tree.h"
-#include "../nnsrc/tree_cursor.h"
+#include "../src/alloc.h"
+#include "../src/api.h"
+#include "../src/array.h"
+#include "../src/clock.h"
+#include "../src/host.h"
+#include "../src/language.h"
+#include "../src/length.h"
+#include "../src/lexer.h"
+#include "../src/parser.h"
+#include "../src/stack.h"
+#include "../src/subtree.h"
+#include "../src/tree.h"
+#include "../src/tree_cursor.h"
 #include "me/mem/mem.h"
 #include <stdint.h>
 
diff --git a/parser/parse_types.h b/parser/parse_types.h
index 813f522a..bae2217d 100644
--- a/parser/parse_types.h
+++ b/parser/parse_types.h
@@ -16,9 +16,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "./nnsrc/api.h"
-#include "./nnsrc/lexer.h"
-#include "./nnsrc/parser.h"
+#include "./src/api.h"
+#include "./src/lexer.h"
+#include "./src/parser.h"
 #include "me/types.h"
 
 #include "parser/types/types_lexer_state.h"
diff --git a/parser/nnsrc/alloc.c b/parser/src/alloc.c
similarity index 100%
rename from parser/nnsrc/alloc.c
rename to parser/src/alloc.c
diff --git a/parser/nnsrc/alloc.h b/parser/src/alloc.h
similarity index 100%
rename from parser/nnsrc/alloc.h
rename to parser/src/alloc.h
diff --git a/parser/nnsrc/api.h b/parser/src/api.h
similarity index 100%
rename from parser/nnsrc/api.h
rename to parser/src/api.h
diff --git a/parser/nnsrc/array.h b/parser/src/array.h
similarity index 100%
rename from parser/nnsrc/array.h
rename to parser/src/array.h
diff --git a/parser/nnsrc/atomic.h b/parser/src/atomic.h
similarity index 100%
rename from parser/nnsrc/atomic.h
rename to parser/src/atomic.h
diff --git a/parser/nnsrc/clock.h b/parser/src/clock.h
similarity index 100%
rename from parser/nnsrc/clock.h
rename to parser/src/clock.h
diff --git a/parser/nnsrc/create_language.c b/parser/src/create_language.c
similarity index 100%
rename from parser/nnsrc/create_language.c
rename to parser/src/create_language.c
diff --git a/parser/nnsrc/error_costs.h b/parser/src/error_costs.h
similarity index 100%
rename from parser/nnsrc/error_costs.h
rename to parser/src/error_costs.h
diff --git a/parser/nnsrc/get_changed_ranges.c b/parser/src/get_changed_ranges.c
similarity index 100%
rename from parser/nnsrc/get_changed_ranges.c
rename to parser/src/get_changed_ranges.c
diff --git a/parser/nnsrc/get_changed_ranges.h b/parser/src/get_changed_ranges.h
similarity index 100%
rename from parser/nnsrc/get_changed_ranges.h
rename to parser/src/get_changed_ranges.h
diff --git a/parser/nnsrc/host.h b/parser/src/host.h
similarity index 100%
rename from parser/nnsrc/host.h
rename to parser/src/host.h
diff --git a/parser/nnsrc/language.c b/parser/src/language.c
similarity index 100%
rename from parser/nnsrc/language.c
rename to parser/src/language.c
diff --git a/parser/nnsrc/language.h b/parser/src/language.h
similarity index 100%
rename from parser/nnsrc/language.h
rename to parser/src/language.h
diff --git a/parser/nnsrc/length.h b/parser/src/length.h
similarity index 100%
rename from parser/nnsrc/length.h
rename to parser/src/length.h
diff --git a/parser/nnsrc/lexer.c b/parser/src/lexer.c
similarity index 100%
rename from parser/nnsrc/lexer.c
rename to parser/src/lexer.c
diff --git a/parser/nnsrc/lexer.h b/parser/src/lexer.h
similarity index 100%
rename from parser/nnsrc/lexer.h
rename to parser/src/lexer.h
diff --git a/parser/nnsrc/lib.c b/parser/src/lib.c
similarity index 91%
rename from parser/nnsrc/lib.c
rename to parser/src/lib.c
index 36cf4750..f79f1ca0 100644
--- a/parser/nnsrc/lib.c
+++ b/parser/src/lib.c
@@ -13,5 +13,5 @@
 #include "./tree_cursor.c"
 #include "./wasm_store.c"
 
-//#include "./create_language.c"
+#include "./create_language.c"
 #include "./scanner.c"
diff --git a/parser/nnsrc/node.c b/parser/src/node.c
similarity index 100%
rename from parser/nnsrc/node.c
rename to parser/src/node.c
diff --git a/parser/nnsrc/parser.c b/parser/src/parser.c
similarity index 100%
rename from parser/nnsrc/parser.c
rename to parser/src/parser.c
diff --git a/parser/nnsrc/parser.h b/parser/src/parser.h
similarity index 100%
rename from parser/nnsrc/parser.h
rename to parser/src/parser.h
diff --git a/parser/nnsrc/point.h b/parser/src/point.h
similarity index 100%
rename from parser/nnsrc/point.h
rename to parser/src/point.h
diff --git a/parser/nnsrc/query.c b/parser/src/query.c
similarity index 100%
rename from parser/nnsrc/query.c
rename to parser/src/query.c
diff --git a/parser/nnsrc/reduce_action.h b/parser/src/reduce_action.h
similarity index 100%
rename from parser/nnsrc/reduce_action.h
rename to parser/src/reduce_action.h
diff --git a/parser/nnsrc/reusable_node.h b/parser/src/reusable_node.h
similarity index 100%
rename from parser/nnsrc/reusable_node.h
rename to parser/src/reusable_node.h
diff --git a/parser/nnsrc/scanner.c b/parser/src/scanner.c
similarity index 100%
rename from parser/nnsrc/scanner.c
rename to parser/src/scanner.c
diff --git a/parser/nnsrc/stack.c b/parser/src/stack.c
similarity index 100%
rename from parser/nnsrc/stack.c
rename to parser/src/stack.c
diff --git a/parser/nnsrc/stack.h b/parser/src/stack.h
similarity index 100%
rename from parser/nnsrc/stack.h
rename to parser/src/stack.h
diff --git a/parser/nnsrc/subtree.c b/parser/src/subtree.c
similarity index 100%
rename from parser/nnsrc/subtree.c
rename to parser/src/subtree.c
diff --git a/parser/nnsrc/subtree.h b/parser/src/subtree.h
similarity index 100%
rename from parser/nnsrc/subtree.h
rename to parser/src/subtree.h
diff --git a/parser/nnsrc/tree.c b/parser/src/tree.c
similarity index 100%
rename from parser/nnsrc/tree.c
rename to parser/src/tree.c
diff --git a/parser/nnsrc/tree.h b/parser/src/tree.h
similarity index 100%
rename from parser/nnsrc/tree.h
rename to parser/src/tree.h
diff --git a/parser/nnsrc/tree_cursor.c b/parser/src/tree_cursor.c
similarity index 100%
rename from parser/nnsrc/tree_cursor.c
rename to parser/src/tree_cursor.c
diff --git a/parser/nnsrc/tree_cursor.h b/parser/src/tree_cursor.h
similarity index 100%
rename from parser/nnsrc/tree_cursor.h
rename to parser/src/tree_cursor.h
diff --git a/parser/nnsrc/unicode.h b/parser/src/unicode.h
similarity index 100%
rename from parser/nnsrc/unicode.h
rename to parser/src/unicode.h
diff --git a/parser/nnsrc/unicode/ICU_SHA b/parser/src/unicode/ICU_SHA
similarity index 100%
rename from parser/nnsrc/unicode/ICU_SHA
rename to parser/src/unicode/ICU_SHA
diff --git a/parser/nnsrc/unicode/LICENSE b/parser/src/unicode/LICENSE
similarity index 100%
rename from parser/nnsrc/unicode/LICENSE
rename to parser/src/unicode/LICENSE
diff --git a/parser/nnsrc/unicode/README.md b/parser/src/unicode/README.md
similarity index 100%
rename from parser/nnsrc/unicode/README.md
rename to parser/src/unicode/README.md
diff --git a/parser/nnsrc/unicode/ptypes.h b/parser/src/unicode/ptypes.h
similarity index 100%
rename from parser/nnsrc/unicode/ptypes.h
rename to parser/src/unicode/ptypes.h
diff --git a/parser/nnsrc/unicode/umachine.h b/parser/src/unicode/umachine.h
similarity index 100%
rename from parser/nnsrc/unicode/umachine.h
rename to parser/src/unicode/umachine.h
diff --git a/parser/nnsrc/unicode/urename.h b/parser/src/unicode/urename.h
similarity index 100%
rename from parser/nnsrc/unicode/urename.h
rename to parser/src/unicode/urename.h
diff --git a/parser/nnsrc/unicode/utf.h b/parser/src/unicode/utf.h
similarity index 100%
rename from parser/nnsrc/unicode/utf.h
rename to parser/src/unicode/utf.h
diff --git a/parser/nnsrc/unicode/utf16.h b/parser/src/unicode/utf16.h
similarity index 100%
rename from parser/nnsrc/unicode/utf16.h
rename to parser/src/unicode/utf16.h
diff --git a/parser/nnsrc/unicode/utf8.h b/parser/src/unicode/utf8.h
similarity index 100%
rename from parser/nnsrc/unicode/utf8.h
rename to parser/src/unicode/utf8.h
diff --git a/parser/nnsrc/wasm/stdlib-symbols.txt b/parser/src/wasm/stdlib-symbols.txt
similarity index 100%
rename from parser/nnsrc/wasm/stdlib-symbols.txt
rename to parser/src/wasm/stdlib-symbols.txt
diff --git a/parser/nnsrc/wasm/stdlib.c b/parser/src/wasm/stdlib.c
similarity index 100%
rename from parser/nnsrc/wasm/stdlib.c
rename to parser/src/wasm/stdlib.c
diff --git a/parser/nnsrc/wasm/wasm-stdlib.h b/parser/src/wasm/wasm-stdlib.h
similarity index 100%
rename from parser/nnsrc/wasm/wasm-stdlib.h
rename to parser/src/wasm/wasm-stdlib.h
diff --git a/parser/nnsrc/wasm_store.c b/parser/src/wasm_store.c
similarity index 100%
rename from parser/nnsrc/wasm_store.c
rename to parser/src/wasm_store.c
diff --git a/parser/nnsrc/wasm_store.h b/parser/src/wasm_store.h
similarity index 100%
rename from parser/nnsrc/wasm_store.h
rename to parser/src/wasm_store.h