diff --git a/Makefile b/Makefile
index afdfdbf..b7ca82b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
 CC=clang++
-CFLAGS=-pedantic -Wall -ggdb -fsanitize=address
+CFLAGS=-pedantic -Wall -Wextra -Werror -fsanitize=address -fsanitize=undefined -ggdb -fsanitize=address
 VFLAGS=--show-leak-kinds=all --leak-check=full
 OUT=
 
-btree.out: btree.cpp
+btree.out: impls/btree.cpp
 	$(CC) $(CFLAGS) $^ -o $@
 
-list.out: list.cpp
+list.out: impls/list.cpp
 	$(CC) $(CFLAGS) $^ -o $@
 
-bsearch.out: bsearch.cpp
+bsearch.out: impls/bsearch.cpp
 	$(CC) $(CFLAGS) $^ -o $@
 
 .PHONY: run
@@ -18,4 +18,4 @@ run: $(OUT)
 
 .PHONY: clean
 clean:
-	rm -v *.out;
+	rm -v *.out *.txt;
diff --git a/bsearch-gen.el b/impls/bsearch-gen.el
similarity index 100%
rename from bsearch-gen.el
rename to impls/bsearch-gen.el
diff --git a/bsearch.cpp b/impls/bsearch.cpp
similarity index 100%
rename from bsearch.cpp
rename to impls/bsearch.cpp
diff --git a/btree.cpp b/impls/btree.cpp
similarity index 100%
rename from btree.cpp
rename to impls/btree.cpp
diff --git a/list.cpp b/impls/list.cpp
similarity index 100%
rename from list.cpp
rename to impls/list.cpp
diff --git a/powerset.rkt b/impls/powerset.rkt
similarity index 100%
rename from powerset.rkt
rename to impls/powerset.rkt