diff --git a/Makefile b/Makefile
index c4b4e2e..470b3cb 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ docserve:
 	mdbook serve documentation
 
 install_dev_deps:
-	sudo apt install gcc valgrind lcov clang-format
+	sudo apt install gcc make valgrind lcov clang-format hyperfine
+	cargo install mdbook
 
 .PHONY: tests tests_dev format bench docbuild docserve install_dev_deps
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index f7695a3..ddb99ed 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,7 +1,11 @@
 CC=gcc
-INCLUDE=-I ../src
+INCLUDE=-I ..
 CFLAGS=-Wall -Wextra -Werror
 
 benchmark: benchmark.c
 	$(CC) $(CFLAGS) $(INCLUDE) $< -o ./$@.exe -lm
 	./$@.exe
+
+clean:
+	rm *.exe -f
+	rm *.txt -f
diff --git a/benchmarks/comparisons/hashtable/Makefile b/benchmarks/comparisons/hashtable/Makefile
index 38cf60e..8b53a39 100644
--- a/benchmarks/comparisons/hashtable/Makefile
+++ b/benchmarks/comparisons/hashtable/Makefile
@@ -1,4 +1,4 @@
-INCLUDE=-I ../../../src
+INCLUDE=-I ../../..
 CFLAGS=-O3 -Wall -Wextra -Werror -DCOUNT=20000000 -DCMC_NO_CALLBACKS
 
 # Install hyperfine
@@ -15,4 +15,5 @@ build:
 	g++ unorderedmap.cpp $(INCLUDE) -o unorderedmap.exe $(CFLAGS)
 
 clean:
-	rm *.exe
+	rm *.exe -f
+	rm *.txt -f
diff --git a/src/cmc/bitset.h b/cmc/bitset.h
similarity index 100%
rename from src/cmc/bitset.h
rename to cmc/bitset.h
diff --git a/src/cmc/cmc/bitset/code.h b/cmc/bitset/code.h
similarity index 100%
rename from src/cmc/cmc/bitset/code.h
rename to cmc/bitset/code.h
diff --git a/src/cmc/cmc/bitset/ext/code.h b/cmc/bitset/ext/code.h
similarity index 100%
rename from src/cmc/cmc/bitset/ext/code.h
rename to cmc/bitset/ext/code.h
diff --git a/src/cmc/cmc/bitset/ext/header.h b/cmc/bitset/ext/header.h
similarity index 100%
rename from src/cmc/cmc/bitset/ext/header.h
rename to cmc/bitset/ext/header.h
diff --git a/src/cmc/cmc/bitset/ext/struct.h b/cmc/bitset/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/bitset/ext/struct.h
rename to cmc/bitset/ext/struct.h
diff --git a/src/cmc/cmc/bitset/header.h b/cmc/bitset/header.h
similarity index 100%
rename from src/cmc/cmc/bitset/header.h
rename to cmc/bitset/header.h
diff --git a/src/cmc/cmc/bitset/struct.h b/cmc/bitset/struct.h
similarity index 100%
rename from src/cmc/cmc/bitset/struct.h
rename to cmc/bitset/struct.h
diff --git a/src/cmc/cor/alloc.h b/cmc/cor/alloc.h
similarity index 100%
rename from src/cmc/cor/alloc.h
rename to cmc/cor/alloc.h
diff --git a/src/cmc/cor/bitset.h b/cmc/cor/bitset.h
similarity index 100%
rename from src/cmc/cor/bitset.h
rename to cmc/cor/bitset.h
diff --git a/src/cmc/cor/callbacks.h b/cmc/cor/callbacks.h
similarity index 100%
rename from src/cmc/cor/callbacks.h
rename to cmc/cor/callbacks.h
diff --git a/src/cmc/cor/core.h b/cmc/cor/core.h
similarity index 100%
rename from src/cmc/cor/core.h
rename to cmc/cor/core.h
diff --git a/src/cmc/cor/dev.h b/cmc/cor/dev.h
similarity index 100%
rename from src/cmc/cor/dev.h
rename to cmc/cor/dev.h
diff --git a/src/cmc/cor/flags.h b/cmc/cor/flags.h
similarity index 97%
rename from src/cmc/cor/flags.h
rename to cmc/cor/flags.h
index fd5d6c3..d3c3a12 100644
--- a/src/cmc/cor/flags.h
+++ b/cmc/cor/flags.h
@@ -65,7 +65,7 @@ enum cmc_flags
  *
  * Maps the error codes to their character representation.
  */
-CMC_UNUSED static const char *cmc_flags_to_str[11] = {
+CMC_UNUSED static const char *cmc_flags_to_str[12] = {
     "OK", "ALLOC", "EMPTY", "NOT_FOUND", "INVALID", "RANGE", "DUPLICATE", "ERROR", "THREAD", "MUTEX", "FULL", "FTABLE"
 };
 
diff --git a/src/cmc/cor/ftable.h b/cmc/cor/ftable.h
similarity index 100%
rename from src/cmc/cor/ftable.h
rename to cmc/cor/ftable.h
diff --git a/src/cmc/cor/hashtable.h b/cmc/cor/hashtable.h
similarity index 100%
rename from src/cmc/cor/hashtable.h
rename to cmc/cor/hashtable.h
diff --git a/src/cmc/cor/heap.h b/cmc/cor/heap.h
similarity index 100%
rename from src/cmc/cor/heap.h
rename to cmc/cor/heap.h
diff --git a/src/cmc/cor/undef.h b/cmc/cor/undef.h
similarity index 100%
rename from src/cmc/cor/undef.h
rename to cmc/cor/undef.h
diff --git a/src/cmc/deque.h b/cmc/deque.h
similarity index 100%
rename from src/cmc/deque.h
rename to cmc/deque.h
diff --git a/src/cmc/cmc/deque/code.h b/cmc/deque/code.h
similarity index 100%
rename from src/cmc/cmc/deque/code.h
rename to cmc/deque/code.h
diff --git a/src/cmc/cmc/deque/ext/code.h b/cmc/deque/ext/code.h
similarity index 100%
rename from src/cmc/cmc/deque/ext/code.h
rename to cmc/deque/ext/code.h
diff --git a/src/cmc/cmc/deque/ext/header.h b/cmc/deque/ext/header.h
similarity index 100%
rename from src/cmc/cmc/deque/ext/header.h
rename to cmc/deque/ext/header.h
diff --git a/src/cmc/cmc/deque/ext/struct.h b/cmc/deque/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/deque/ext/struct.h
rename to cmc/deque/ext/struct.h
diff --git a/src/cmc/cmc/deque/header.h b/cmc/deque/header.h
similarity index 100%
rename from src/cmc/cmc/deque/header.h
rename to cmc/deque/header.h
diff --git a/src/cmc/cmc/deque/struct.h b/cmc/deque/struct.h
similarity index 100%
rename from src/cmc/cmc/deque/struct.h
rename to cmc/deque/struct.h
diff --git a/src/cmc/hashbidimap.h b/cmc/hashbidimap.h
similarity index 100%
rename from src/cmc/hashbidimap.h
rename to cmc/hashbidimap.h
diff --git a/src/cmc/cmc/hashbidimap/code.h b/cmc/hashbidimap/code.h
similarity index 100%
rename from src/cmc/cmc/hashbidimap/code.h
rename to cmc/hashbidimap/code.h
diff --git a/src/cmc/cmc/hashbidimap/ext/code.h b/cmc/hashbidimap/ext/code.h
similarity index 100%
rename from src/cmc/cmc/hashbidimap/ext/code.h
rename to cmc/hashbidimap/ext/code.h
diff --git a/src/cmc/cmc/hashbidimap/ext/header.h b/cmc/hashbidimap/ext/header.h
similarity index 100%
rename from src/cmc/cmc/hashbidimap/ext/header.h
rename to cmc/hashbidimap/ext/header.h
diff --git a/src/cmc/cmc/hashbidimap/ext/struct.h b/cmc/hashbidimap/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/hashbidimap/ext/struct.h
rename to cmc/hashbidimap/ext/struct.h
diff --git a/src/cmc/cmc/hashbidimap/header.h b/cmc/hashbidimap/header.h
similarity index 100%
rename from src/cmc/cmc/hashbidimap/header.h
rename to cmc/hashbidimap/header.h
diff --git a/src/cmc/cmc/hashbidimap/struct.h b/cmc/hashbidimap/struct.h
similarity index 100%
rename from src/cmc/cmc/hashbidimap/struct.h
rename to cmc/hashbidimap/struct.h
diff --git a/src/cmc/hashmap.h b/cmc/hashmap.h
similarity index 100%
rename from src/cmc/hashmap.h
rename to cmc/hashmap.h
diff --git a/src/cmc/cmc/hashmap/code.h b/cmc/hashmap/code.h
similarity index 100%
rename from src/cmc/cmc/hashmap/code.h
rename to cmc/hashmap/code.h
diff --git a/src/cmc/cmc/hashmap/ext/code.h b/cmc/hashmap/ext/code.h
similarity index 100%
rename from src/cmc/cmc/hashmap/ext/code.h
rename to cmc/hashmap/ext/code.h
diff --git a/src/cmc/cmc/hashmap/ext/header.h b/cmc/hashmap/ext/header.h
similarity index 100%
rename from src/cmc/cmc/hashmap/ext/header.h
rename to cmc/hashmap/ext/header.h
diff --git a/src/cmc/cmc/hashmap/ext/struct.h b/cmc/hashmap/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/hashmap/ext/struct.h
rename to cmc/hashmap/ext/struct.h
diff --git a/src/cmc/cmc/hashmap/header.h b/cmc/hashmap/header.h
similarity index 100%
rename from src/cmc/cmc/hashmap/header.h
rename to cmc/hashmap/header.h
diff --git a/src/cmc/cmc/hashmap/struct.h b/cmc/hashmap/struct.h
similarity index 100%
rename from src/cmc/cmc/hashmap/struct.h
rename to cmc/hashmap/struct.h
diff --git a/src/cmc/hashmultimap.h b/cmc/hashmultimap.h
similarity index 100%
rename from src/cmc/hashmultimap.h
rename to cmc/hashmultimap.h
diff --git a/src/cmc/cmc/hashmultimap/code.h b/cmc/hashmultimap/code.h
similarity index 100%
rename from src/cmc/cmc/hashmultimap/code.h
rename to cmc/hashmultimap/code.h
diff --git a/src/cmc/cmc/hashmultimap/ext/code.h b/cmc/hashmultimap/ext/code.h
similarity index 100%
rename from src/cmc/cmc/hashmultimap/ext/code.h
rename to cmc/hashmultimap/ext/code.h
diff --git a/src/cmc/cmc/hashmultimap/ext/header.h b/cmc/hashmultimap/ext/header.h
similarity index 100%
rename from src/cmc/cmc/hashmultimap/ext/header.h
rename to cmc/hashmultimap/ext/header.h
diff --git a/src/cmc/cmc/hashmultimap/ext/struct.h b/cmc/hashmultimap/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/hashmultimap/ext/struct.h
rename to cmc/hashmultimap/ext/struct.h
diff --git a/src/cmc/cmc/hashmultimap/header.h b/cmc/hashmultimap/header.h
similarity index 100%
rename from src/cmc/cmc/hashmultimap/header.h
rename to cmc/hashmultimap/header.h
diff --git a/src/cmc/cmc/hashmultimap/struct.h b/cmc/hashmultimap/struct.h
similarity index 100%
rename from src/cmc/cmc/hashmultimap/struct.h
rename to cmc/hashmultimap/struct.h
diff --git a/src/cmc/hashmultiset.h b/cmc/hashmultiset.h
similarity index 100%
rename from src/cmc/hashmultiset.h
rename to cmc/hashmultiset.h
diff --git a/src/cmc/cmc/hashmultiset/code.h b/cmc/hashmultiset/code.h
similarity index 100%
rename from src/cmc/cmc/hashmultiset/code.h
rename to cmc/hashmultiset/code.h
diff --git a/src/cmc/cmc/hashmultiset/ext/code.h b/cmc/hashmultiset/ext/code.h
similarity index 100%
rename from src/cmc/cmc/hashmultiset/ext/code.h
rename to cmc/hashmultiset/ext/code.h
diff --git a/src/cmc/cmc/hashmultiset/ext/header.h b/cmc/hashmultiset/ext/header.h
similarity index 100%
rename from src/cmc/cmc/hashmultiset/ext/header.h
rename to cmc/hashmultiset/ext/header.h
diff --git a/src/cmc/cmc/hashmultiset/ext/struct.h b/cmc/hashmultiset/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/hashmultiset/ext/struct.h
rename to cmc/hashmultiset/ext/struct.h
diff --git a/src/cmc/cmc/hashmultiset/header.h b/cmc/hashmultiset/header.h
similarity index 100%
rename from src/cmc/cmc/hashmultiset/header.h
rename to cmc/hashmultiset/header.h
diff --git a/src/cmc/cmc/hashmultiset/struct.h b/cmc/hashmultiset/struct.h
similarity index 100%
rename from src/cmc/cmc/hashmultiset/struct.h
rename to cmc/hashmultiset/struct.h
diff --git a/src/cmc/hashset.h b/cmc/hashset.h
similarity index 100%
rename from src/cmc/hashset.h
rename to cmc/hashset.h
diff --git a/src/cmc/cmc/hashset/code.h b/cmc/hashset/code.h
similarity index 100%
rename from src/cmc/cmc/hashset/code.h
rename to cmc/hashset/code.h
diff --git a/src/cmc/cmc/hashset/ext/code.h b/cmc/hashset/ext/code.h
similarity index 100%
rename from src/cmc/cmc/hashset/ext/code.h
rename to cmc/hashset/ext/code.h
diff --git a/src/cmc/cmc/hashset/ext/header.h b/cmc/hashset/ext/header.h
similarity index 100%
rename from src/cmc/cmc/hashset/ext/header.h
rename to cmc/hashset/ext/header.h
diff --git a/src/cmc/cmc/hashset/ext/struct.h b/cmc/hashset/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/hashset/ext/struct.h
rename to cmc/hashset/ext/struct.h
diff --git a/src/cmc/cmc/hashset/header.h b/cmc/hashset/header.h
similarity index 100%
rename from src/cmc/cmc/hashset/header.h
rename to cmc/hashset/header.h
diff --git a/src/cmc/cmc/hashset/struct.h b/cmc/hashset/struct.h
similarity index 100%
rename from src/cmc/cmc/hashset/struct.h
rename to cmc/hashset/struct.h
diff --git a/src/cmc/heap.h b/cmc/heap.h
similarity index 100%
rename from src/cmc/heap.h
rename to cmc/heap.h
diff --git a/src/cmc/cmc/heap/code.h b/cmc/heap/code.h
similarity index 100%
rename from src/cmc/cmc/heap/code.h
rename to cmc/heap/code.h
diff --git a/src/cmc/cmc/heap/ext/code.h b/cmc/heap/ext/code.h
similarity index 100%
rename from src/cmc/cmc/heap/ext/code.h
rename to cmc/heap/ext/code.h
diff --git a/src/cmc/cmc/heap/ext/header.h b/cmc/heap/ext/header.h
similarity index 100%
rename from src/cmc/cmc/heap/ext/header.h
rename to cmc/heap/ext/header.h
diff --git a/src/cmc/cmc/heap/ext/struct.h b/cmc/heap/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/heap/ext/struct.h
rename to cmc/heap/ext/struct.h
diff --git a/src/cmc/cmc/heap/header.h b/cmc/heap/header.h
similarity index 100%
rename from src/cmc/cmc/heap/header.h
rename to cmc/heap/header.h
diff --git a/src/cmc/cmc/heap/struct.h b/cmc/heap/struct.h
similarity index 100%
rename from src/cmc/cmc/heap/struct.h
rename to cmc/heap/struct.h
diff --git a/src/cmc/intervalheap.h b/cmc/intervalheap.h
similarity index 100%
rename from src/cmc/intervalheap.h
rename to cmc/intervalheap.h
diff --git a/src/cmc/cmc/intervalheap/code.h b/cmc/intervalheap/code.h
similarity index 100%
rename from src/cmc/cmc/intervalheap/code.h
rename to cmc/intervalheap/code.h
diff --git a/src/cmc/cmc/intervalheap/ext/code.h b/cmc/intervalheap/ext/code.h
similarity index 100%
rename from src/cmc/cmc/intervalheap/ext/code.h
rename to cmc/intervalheap/ext/code.h
diff --git a/src/cmc/cmc/intervalheap/ext/header.h b/cmc/intervalheap/ext/header.h
similarity index 100%
rename from src/cmc/cmc/intervalheap/ext/header.h
rename to cmc/intervalheap/ext/header.h
diff --git a/src/cmc/cmc/intervalheap/ext/struct.h b/cmc/intervalheap/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/intervalheap/ext/struct.h
rename to cmc/intervalheap/ext/struct.h
diff --git a/src/cmc/cmc/intervalheap/header.h b/cmc/intervalheap/header.h
similarity index 100%
rename from src/cmc/cmc/intervalheap/header.h
rename to cmc/intervalheap/header.h
diff --git a/src/cmc/cmc/intervalheap/struct.h b/cmc/intervalheap/struct.h
similarity index 100%
rename from src/cmc/cmc/intervalheap/struct.h
rename to cmc/intervalheap/struct.h
diff --git a/src/cmc/linkedlist.h b/cmc/linkedlist.h
similarity index 100%
rename from src/cmc/linkedlist.h
rename to cmc/linkedlist.h
diff --git a/src/cmc/cmc/linkedlist/code.h b/cmc/linkedlist/code.h
similarity index 100%
rename from src/cmc/cmc/linkedlist/code.h
rename to cmc/linkedlist/code.h
diff --git a/src/cmc/cmc/linkedlist/ext/code.h b/cmc/linkedlist/ext/code.h
similarity index 100%
rename from src/cmc/cmc/linkedlist/ext/code.h
rename to cmc/linkedlist/ext/code.h
diff --git a/src/cmc/cmc/linkedlist/ext/header.h b/cmc/linkedlist/ext/header.h
similarity index 100%
rename from src/cmc/cmc/linkedlist/ext/header.h
rename to cmc/linkedlist/ext/header.h
diff --git a/src/cmc/cmc/linkedlist/ext/struct.h b/cmc/linkedlist/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/linkedlist/ext/struct.h
rename to cmc/linkedlist/ext/struct.h
diff --git a/src/cmc/cmc/linkedlist/header.h b/cmc/linkedlist/header.h
similarity index 100%
rename from src/cmc/cmc/linkedlist/header.h
rename to cmc/linkedlist/header.h
diff --git a/src/cmc/cmc/linkedlist/struct.h b/cmc/linkedlist/struct.h
similarity index 100%
rename from src/cmc/cmc/linkedlist/struct.h
rename to cmc/linkedlist/struct.h
diff --git a/src/cmc/list.h b/cmc/list.h
similarity index 100%
rename from src/cmc/list.h
rename to cmc/list.h
diff --git a/src/cmc/cmc/list/code.h b/cmc/list/code.h
similarity index 100%
rename from src/cmc/cmc/list/code.h
rename to cmc/list/code.h
diff --git a/src/cmc/cmc/list/ext/code.h b/cmc/list/ext/code.h
similarity index 100%
rename from src/cmc/cmc/list/ext/code.h
rename to cmc/list/ext/code.h
diff --git a/src/cmc/cmc/list/ext/header.h b/cmc/list/ext/header.h
similarity index 100%
rename from src/cmc/cmc/list/ext/header.h
rename to cmc/list/ext/header.h
diff --git a/src/cmc/cmc/list/ext/struct.h b/cmc/list/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/list/ext/struct.h
rename to cmc/list/ext/struct.h
diff --git a/src/cmc/cmc/list/header.h b/cmc/list/header.h
similarity index 100%
rename from src/cmc/cmc/list/header.h
rename to cmc/list/header.h
diff --git a/src/cmc/cmc/list/struct.h b/cmc/list/struct.h
similarity index 100%
rename from src/cmc/cmc/list/struct.h
rename to cmc/list/struct.h
diff --git a/src/cmc/queue.h b/cmc/queue.h
similarity index 100%
rename from src/cmc/queue.h
rename to cmc/queue.h
diff --git a/src/cmc/cmc/queue/code.h b/cmc/queue/code.h
similarity index 100%
rename from src/cmc/cmc/queue/code.h
rename to cmc/queue/code.h
diff --git a/src/cmc/cmc/queue/ext/code.h b/cmc/queue/ext/code.h
similarity index 100%
rename from src/cmc/cmc/queue/ext/code.h
rename to cmc/queue/ext/code.h
diff --git a/src/cmc/cmc/queue/ext/header.h b/cmc/queue/ext/header.h
similarity index 100%
rename from src/cmc/cmc/queue/ext/header.h
rename to cmc/queue/ext/header.h
diff --git a/src/cmc/cmc/queue/ext/struct.h b/cmc/queue/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/queue/ext/struct.h
rename to cmc/queue/ext/struct.h
diff --git a/src/cmc/cmc/queue/header.h b/cmc/queue/header.h
similarity index 100%
rename from src/cmc/cmc/queue/header.h
rename to cmc/queue/header.h
diff --git a/src/cmc/cmc/queue/struct.h b/cmc/queue/struct.h
similarity index 100%
rename from src/cmc/cmc/queue/struct.h
rename to cmc/queue/struct.h
diff --git a/src/cmc/sortedlist.h b/cmc/sortedlist.h
similarity index 100%
rename from src/cmc/sortedlist.h
rename to cmc/sortedlist.h
diff --git a/src/cmc/cmc/sortedlist/code.h b/cmc/sortedlist/code.h
similarity index 100%
rename from src/cmc/cmc/sortedlist/code.h
rename to cmc/sortedlist/code.h
diff --git a/src/cmc/cmc/sortedlist/ext/code.h b/cmc/sortedlist/ext/code.h
similarity index 100%
rename from src/cmc/cmc/sortedlist/ext/code.h
rename to cmc/sortedlist/ext/code.h
diff --git a/src/cmc/cmc/sortedlist/ext/header.h b/cmc/sortedlist/ext/header.h
similarity index 100%
rename from src/cmc/cmc/sortedlist/ext/header.h
rename to cmc/sortedlist/ext/header.h
diff --git a/src/cmc/cmc/sortedlist/ext/struct.h b/cmc/sortedlist/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/sortedlist/ext/struct.h
rename to cmc/sortedlist/ext/struct.h
diff --git a/src/cmc/cmc/sortedlist/header.h b/cmc/sortedlist/header.h
similarity index 100%
rename from src/cmc/cmc/sortedlist/header.h
rename to cmc/sortedlist/header.h
diff --git a/src/cmc/cmc/sortedlist/struct.h b/cmc/sortedlist/struct.h
similarity index 100%
rename from src/cmc/cmc/sortedlist/struct.h
rename to cmc/sortedlist/struct.h
diff --git a/src/cmc/stack.h b/cmc/stack.h
similarity index 100%
rename from src/cmc/stack.h
rename to cmc/stack.h
diff --git a/src/cmc/cmc/stack/code.h b/cmc/stack/code.h
similarity index 100%
rename from src/cmc/cmc/stack/code.h
rename to cmc/stack/code.h
diff --git a/src/cmc/cmc/stack/ext/code.h b/cmc/stack/ext/code.h
similarity index 100%
rename from src/cmc/cmc/stack/ext/code.h
rename to cmc/stack/ext/code.h
diff --git a/src/cmc/cmc/stack/ext/header.h b/cmc/stack/ext/header.h
similarity index 100%
rename from src/cmc/cmc/stack/ext/header.h
rename to cmc/stack/ext/header.h
diff --git a/src/cmc/cmc/stack/ext/struct.h b/cmc/stack/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/stack/ext/struct.h
rename to cmc/stack/ext/struct.h
diff --git a/src/cmc/cmc/stack/header.h b/cmc/stack/header.h
similarity index 100%
rename from src/cmc/cmc/stack/header.h
rename to cmc/stack/header.h
diff --git a/src/cmc/cmc/stack/struct.h b/cmc/stack/struct.h
similarity index 100%
rename from src/cmc/cmc/stack/struct.h
rename to cmc/stack/struct.h
diff --git a/src/cmc/treemap.h b/cmc/treemap.h
similarity index 100%
rename from src/cmc/treemap.h
rename to cmc/treemap.h
diff --git a/src/cmc/cmc/treemap/code.h b/cmc/treemap/code.h
similarity index 100%
rename from src/cmc/cmc/treemap/code.h
rename to cmc/treemap/code.h
diff --git a/src/cmc/cmc/treemap/ext/code.h b/cmc/treemap/ext/code.h
similarity index 100%
rename from src/cmc/cmc/treemap/ext/code.h
rename to cmc/treemap/ext/code.h
diff --git a/src/cmc/cmc/treemap/ext/header.h b/cmc/treemap/ext/header.h
similarity index 100%
rename from src/cmc/cmc/treemap/ext/header.h
rename to cmc/treemap/ext/header.h
diff --git a/src/cmc/cmc/treemap/ext/struct.h b/cmc/treemap/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/treemap/ext/struct.h
rename to cmc/treemap/ext/struct.h
diff --git a/src/cmc/cmc/treemap/header.h b/cmc/treemap/header.h
similarity index 100%
rename from src/cmc/cmc/treemap/header.h
rename to cmc/treemap/header.h
diff --git a/src/cmc/cmc/treemap/struct.h b/cmc/treemap/struct.h
similarity index 100%
rename from src/cmc/cmc/treemap/struct.h
rename to cmc/treemap/struct.h
diff --git a/src/cmc/treeset.h b/cmc/treeset.h
similarity index 100%
rename from src/cmc/treeset.h
rename to cmc/treeset.h
diff --git a/src/cmc/cmc/treeset/code.h b/cmc/treeset/code.h
similarity index 100%
rename from src/cmc/cmc/treeset/code.h
rename to cmc/treeset/code.h
diff --git a/src/cmc/cmc/treeset/ext/code.h b/cmc/treeset/ext/code.h
similarity index 100%
rename from src/cmc/cmc/treeset/ext/code.h
rename to cmc/treeset/ext/code.h
diff --git a/src/cmc/cmc/treeset/ext/header.h b/cmc/treeset/ext/header.h
similarity index 100%
rename from src/cmc/cmc/treeset/ext/header.h
rename to cmc/treeset/ext/header.h
diff --git a/src/cmc/cmc/treeset/ext/struct.h b/cmc/treeset/ext/struct.h
similarity index 100%
rename from src/cmc/cmc/treeset/ext/struct.h
rename to cmc/treeset/ext/struct.h
diff --git a/src/cmc/cmc/treeset/header.h b/cmc/treeset/header.h
similarity index 100%
rename from src/cmc/cmc/treeset/header.h
rename to cmc/treeset/header.h
diff --git a/src/cmc/cmc/treeset/struct.h b/cmc/treeset/struct.h
similarity index 100%
rename from src/cmc/cmc/treeset/struct.h
rename to cmc/treeset/struct.h
diff --git a/src/cmc/utl/assert.h b/cmc/utl/assert.h
similarity index 100%
rename from src/cmc/utl/assert.h
rename to cmc/utl/assert.h
diff --git a/src/cmc/utl/foreach.h b/cmc/utl/foreach.h
similarity index 100%
rename from src/cmc/utl/foreach.h
rename to cmc/utl/foreach.h
diff --git a/src/cmc/utl/futils.h b/cmc/utl/futils.h
similarity index 100%
rename from src/cmc/utl/futils.h
rename to cmc/utl/futils.h
diff --git a/src/cmc/utl/log.h b/cmc/utl/log.h
similarity index 100%
rename from src/cmc/utl/log.h
rename to cmc/utl/log.h
diff --git a/src/cmc/utl/mutex.h b/cmc/utl/mutex.h
similarity index 100%
rename from src/cmc/utl/mutex.h
rename to cmc/utl/mutex.h
diff --git a/src/cmc/utl/test.h b/cmc/utl/test.h
similarity index 100%
rename from src/cmc/utl/test.h
rename to cmc/utl/test.h
diff --git a/src/cmc/utl/thread.h b/cmc/utl/thread.h
similarity index 100%
rename from src/cmc/utl/thread.h
rename to cmc/utl/thread.h
diff --git a/src/cmc/utl/timer.h b/cmc/utl/timer.h
similarity index 100%
rename from src/cmc/utl/timer.h
rename to cmc/utl/timer.h
diff --git a/examples/Makefile b/examples/Makefile
index 61a643b..f85598b 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,6 +1,6 @@
 CC=gcc
 CFLAGS=-Wall -Wextra -Werror -O3
-INCLUDE=-I ../src
+INCLUDE=-I ..
 
 ifndef FILE
 main:
diff --git a/tests/Makefile b/tests/Makefile
index 389b2f2..dfee430 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,6 +1,6 @@
 CC=gcc
 CFLAGS=-Wall -Wextra -Werror -fprofile-arcs -ftest-coverage -ftime-report -g -O0 -DCMC_CALLBACKS
-INCLUDE=-I ../src
+INCLUDE=-I ..
 OUTDIR=out
 
 main: