diff --git a/.gitignore b/.gitignore
index 294ef06..aa7d26f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
 *.user
 [Bb]in/
+.bin/
 [Oo]bj/
 [Oo]ut/
 [Ll]og/
 [Ll]ogs/
 .vs/
 .vshistory/
-.idea/
\ No newline at end of file
+.idea/
+.vscode/
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index b119ca9..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "files.associations": {
-        "*.h": "c",
-        "type_traits": "c",
-        "*.tcc": "c",
-        "functional": "c",
-        "istream": "c",
-        "ranges": "c",
-        "streambuf": "c",
-        "chrono": "c",
-        "string": "c",
-        "deque": "c",
-        "list": "c",
-        "unordered_map": "c",
-        "vector": "c",
-        "system_error": "c"
-    },
-    "C_Cpp.errorSquiggles": "Disabled"
-}
\ No newline at end of file
diff --git a/DtsodC/.vscode/c_cpp_properties.json b/DtsodC/.vscode/c_cpp_properties.json
deleted file mode 100644
index 862aed8..0000000
--- a/DtsodC/.vscode/c_cpp_properties.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Linux",
-            "includePath": [
-                "${workspaceFolder}/**"
-            ],
-            "defines": [],
-            "compilerPath": "/usr/bin/gcc",
-            "cStandard": "gnu17",
-            "cppStandard": "gnu++14",
-            "intelliSenseMode": "linux-gcc-x64"
-        }
-    ],
-    "version": 4
-}
\ No newline at end of file
diff --git a/DtsodC/.vscode/settings.json b/DtsodC/.vscode/settings.json
deleted file mode 100644
index 0e7b133..0000000
--- a/DtsodC/.vscode/settings.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "files.associations": {
-        "*.h": "c",
-        "cstdint": "c",
-        "limits": "c",
-        "cstdio": "c",
-        "cwchar": "c",
-        "compare": "c",
-        "type_traits": "c"
-    },
-    "C_Cpp.default.defines": [],
-    "C_Cpp.intelliSenseCacheSize": 10
-}
\ No newline at end of file
diff --git a/DtsodC/src/Autoarr/Autoarr.c b/DtsodC/Autoarr/Autoarr.c
similarity index 100%
rename from DtsodC/src/Autoarr/Autoarr.c
rename to DtsodC/Autoarr/Autoarr.c
diff --git a/DtsodC/src/Autoarr/Autoarr.h b/DtsodC/Autoarr/Autoarr.h
similarity index 100%
rename from DtsodC/src/Autoarr/Autoarr.h
rename to DtsodC/Autoarr/Autoarr.h
diff --git a/DtsodC/src/Autoarr/Autoarr_declare.h b/DtsodC/Autoarr/Autoarr_declare.h
similarity index 100%
rename from DtsodC/src/Autoarr/Autoarr_declare.h
rename to DtsodC/Autoarr/Autoarr_declare.h
diff --git a/DtsodC/src/Autoarr/Autoarr_define.h b/DtsodC/Autoarr/Autoarr_define.h
similarity index 100%
rename from DtsodC/src/Autoarr/Autoarr_define.h
rename to DtsodC/Autoarr/Autoarr_define.h
diff --git a/DtsodC/src/Autoarr/StringBuilder.c b/DtsodC/Autoarr/StringBuilder.c
similarity index 100%
rename from DtsodC/src/Autoarr/StringBuilder.c
rename to DtsodC/Autoarr/StringBuilder.c
diff --git a/DtsodC/src/Autoarr/StringBuilder.h b/DtsodC/Autoarr/StringBuilder.h
similarity index 100%
rename from DtsodC/src/Autoarr/StringBuilder.h
rename to DtsodC/Autoarr/StringBuilder.h
diff --git a/DtsodC/src/DtsodParser/DtsodV24.c b/DtsodC/DtsodParser/DtsodV24.c
similarity index 100%
rename from DtsodC/src/DtsodParser/DtsodV24.c
rename to DtsodC/DtsodParser/DtsodV24.c
diff --git a/DtsodC/src/DtsodParser/DtsodV24.h b/DtsodC/DtsodParser/DtsodV24.h
similarity index 100%
rename from DtsodC/src/DtsodParser/DtsodV24.h
rename to DtsodC/DtsodParser/DtsodV24.h
diff --git a/DtsodC/src/Hashtable/Hashtable.c b/DtsodC/Hashtable/Hashtable.c
similarity index 100%
rename from DtsodC/src/Hashtable/Hashtable.c
rename to DtsodC/Hashtable/Hashtable.c
diff --git a/DtsodC/src/Hashtable/Hashtable.h b/DtsodC/Hashtable/Hashtable.h
similarity index 100%
rename from DtsodC/src/Hashtable/Hashtable.h
rename to DtsodC/Hashtable/Hashtable.h
diff --git a/DtsodC/src/Hashtable/KeyValuePair.c b/DtsodC/Hashtable/KeyValuePair.c
similarity index 100%
rename from DtsodC/src/Hashtable/KeyValuePair.c
rename to DtsodC/Hashtable/KeyValuePair.c
diff --git a/DtsodC/src/Hashtable/KeyValuePair.h b/DtsodC/Hashtable/KeyValuePair.h
similarity index 100%
rename from DtsodC/src/Hashtable/KeyValuePair.h
rename to DtsodC/Hashtable/KeyValuePair.h
diff --git a/DtsodC/src/Hashtable/hash.c b/DtsodC/Hashtable/hash.c
similarity index 100%
rename from DtsodC/src/Hashtable/hash.c
rename to DtsodC/Hashtable/hash.c
diff --git a/DtsodC/src/Hashtable/hash.h b/DtsodC/Hashtable/hash.h
similarity index 100%
rename from DtsodC/src/Hashtable/hash.h
rename to DtsodC/Hashtable/hash.h
diff --git a/DtsodC/Makefile b/DtsodC/Makefile
index 3dcc61c..7d5f464 100644
--- a/DtsodC/Makefile
+++ b/DtsodC/Makefile
@@ -1,7 +1,7 @@
-SRC=$(wildcard src/*c) $(wildcard src/**/*.c)
+SRC=$(wildcard [^tests]**/*.c)
 TESTS=$(wildcard tests/*c) $(wildcard tests/**/*.c)
-OUTDIR=bin/
-OUTFILE=$(OUTDIR)dtsodc.com
+OUTDIR=.bin
+OUTFILE=$(OUTDIR)/dtsodc.com
 CMP=gcc
 all: clear_c build test
 
@@ -9,19 +9,20 @@ clear_c:
 	clear
 clear_bin:
 	@echo -e '\e[96m--------------[clear_bin]--------------\e[0m'
-	touch $(OUTDIR)_.com
-	rm $(OUTDIR)*.com
+	touch $(OUTDIR)/_.com
+	rm $(OUTDIR)/*.com
 
 clang: CMP=clang
 clang: all
 
 CMPARGS= -Wall -Wno-discarded-qualifiers $(SRC) $(TESTS) -o $(OUTFILE)
 build:
+	@echo $(SRC)
 	@echo -e '\n\e[96m----------------[build]----------------\e[0m'
-	@mkdir -p bin
+	@mkdir -p $(OUTDIR)
 	$(CMP) -O1 -flto $(CMPARGS)
 build_dbg: 
-	@mkdir -p bin
+	@mkdir -p $(OUTDIR)
 	@echo -e '\n\e[96m--------------[build_dbg]--------------\e[0m'
 	$(CMP) -O0 -g $(CMPARGS).dbg
 test:
diff --git a/DtsodC/src/SearchTree/SearchTree.c b/DtsodC/SearchTree/SearchTree.c
similarity index 100%
rename from DtsodC/src/SearchTree/SearchTree.c
rename to DtsodC/SearchTree/SearchTree.c
diff --git a/DtsodC/src/SearchTree/SearchTree.h b/DtsodC/SearchTree/SearchTree.h
similarity index 100%
rename from DtsodC/src/SearchTree/SearchTree.h
rename to DtsodC/SearchTree/SearchTree.h
diff --git a/DtsodC/src/SearchTree/SearchTree.md b/DtsodC/SearchTree/SearchTree.md
similarity index 100%
rename from DtsodC/src/SearchTree/SearchTree.md
rename to DtsodC/SearchTree/SearchTree.md
diff --git a/DtsodC/src/base/base.h b/DtsodC/base/base.h
similarity index 100%
rename from DtsodC/src/base/base.h
rename to DtsodC/base/base.h
diff --git a/DtsodC/src/base/errors.c b/DtsodC/base/errors.c
similarity index 100%
rename from DtsodC/src/base/errors.c
rename to DtsodC/base/errors.c
diff --git a/DtsodC/src/base/errors.h b/DtsodC/base/errors.h
similarity index 100%
rename from DtsodC/src/base/errors.h
rename to DtsodC/base/errors.h
diff --git a/DtsodC/src/base/fsleep.c b/DtsodC/base/fsleep.c
similarity index 100%
rename from DtsodC/src/base/fsleep.c
rename to DtsodC/base/fsleep.c
diff --git a/DtsodC/src/base/mystr.c b/DtsodC/base/mystr.c
similarity index 100%
rename from DtsodC/src/base/mystr.c
rename to DtsodC/base/mystr.c
diff --git a/DtsodC/src/base/mystr.h b/DtsodC/base/mystr.h
similarity index 100%
rename from DtsodC/src/base/mystr.h
rename to DtsodC/base/mystr.h
diff --git a/DtsodC/src/base/std.h b/DtsodC/base/std.h
similarity index 100%
rename from DtsodC/src/base/std.h
rename to DtsodC/base/std.h
diff --git a/DtsodC/src/base/types.c b/DtsodC/base/types.c
similarity index 100%
rename from DtsodC/src/base/types.c
rename to DtsodC/base/types.c
diff --git a/DtsodC/src/base/types.h b/DtsodC/base/types.h
similarity index 100%
rename from DtsodC/src/base/types.h
rename to DtsodC/base/types.h
diff --git a/DtsodC/tests/main.c b/DtsodC/tests/main.c
index b5b2fcf..8524ffd 100644
--- a/DtsodC/tests/main.c
+++ b/DtsodC/tests/main.c
@@ -1,4 +1,4 @@
-#include "../src/base/base.h"
+#include "../base/base.h"
 #include "tests.h"
 
 
diff --git a/DtsodC/tests/test_autoarr.c b/DtsodC/tests/test_autoarr.c
index a0ded06..7faf28d 100644
--- a/DtsodC/tests/test_autoarr.c
+++ b/DtsodC/tests/test_autoarr.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include "../src/Autoarr/Autoarr.h"
+#include "../Autoarr/Autoarr.h"
 
 static void printautoarr(Autoarr(uint16)* ar){
     printf("\e[94mAutoarr(uint16): %lu\n"
diff --git a/DtsodC/tests/test_dtsod.c b/DtsodC/tests/test_dtsod.c
index 306610c..e290f93 100644
--- a/DtsodC/tests/test_dtsod.c
+++ b/DtsodC/tests/test_dtsod.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include "../src/DtsodParser/DtsodV24.h"
+#include "../DtsodParser/DtsodV24.h"
 
 void test_dtsod(){
     printf("\e[96m-------------[test_dtsod]-------------\n");
diff --git a/DtsodC/tests/test_hashtable.c b/DtsodC/tests/test_hashtable.c
index 9bb8d62..991bf63 100644
--- a/DtsodC/tests/test_hashtable.c
+++ b/DtsodC/tests/test_hashtable.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include "../src/Hashtable/Hashtable.h"
+#include "../Hashtable/Hashtable.h"
 
 void printkvp(KeyValuePair p){
     printf("{\"%s\", ",p.key);
diff --git a/DtsodC/tests/test_searchtree.c b/DtsodC/tests/test_searchtree.c
index c3c2b68..eab380b 100644
--- a/DtsodC/tests/test_searchtree.c
+++ b/DtsodC/tests/test_searchtree.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include "../src/SearchTree/SearchTree.h"
+#include "../SearchTree/SearchTree.h"
 
 void printstnode(STNode* node){
     printf("\e[94mSTNode: %lu\n  address: %p\n  value: ",sizeof(STNode),node);
diff --git a/DtsodC/tests/test_string.c b/DtsodC/tests/test_string.c
index 87a05d2..d6202ef 100644
--- a/DtsodC/tests/test_string.c
+++ b/DtsodC/tests/test_string.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include "../src/base/mystr.h"
+#include "../base/mystr.h"
 
 void test_string(){
     optime(__func__,1,({
diff --git a/DtsodC/tests/tests.h b/DtsodC/tests/tests.h
index 8a32c74..a357fd2 100644
--- a/DtsodC/tests/tests.h
+++ b/DtsodC/tests/tests.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../src/base/base.h"
+#include "../base/base.h"
 
 void printuni(Unitype v);