diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index b91dfaa25707bd59687041693d553929b2796872..0000000000000000000000000000000000000000
--- a/Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-PROGS=selective_cfi.exe
-
-CXX=@CXX@
-CXXFLAGS= 
-INCLUDE=-I. -I../include -I../xform -I../../beaengine/include -I../../libIRDB/include/ -I../../libMEDSannotation/include/ -I../libtransform/include/ -I../transforms
-CXXFLAGS= @EXTRA_CXXFLAGS@ $(INCLUDE) 
-LIBS=-L../../lib -lxform -lIRDB-core -lIRDB-cfg -lBeaEngine_s_d -lpqxx  -lMEDSannotation -ltransform ../transforms/Rewrite_Utility.o -lpq
-
-
-OBJS=scfi_driver.o scfi_instr.o
-programs=selective_cfi.exe
-
-.SUFFIXES: .o .c .exe .cpp .hpp
-
-all: $(programs)
-	@echo "---------------------------------------------"
-	@echo "- Selective CFI directory -- Build complete -"
-	@echo "---------------------------------------------"
-
-
--include $(OBJS:.o=.d)
-
-%.o: %.cpp
-	$(CXX) -c  $(CXXFLAGS) $*.cpp 
-	@#
-	@# build dependencies --  http://scottmcpeak.com/autodepend/autodepend.html
-	@#
-	@cpp -MM $(CXXFLAGS) $*.cpp > $*.d 2> /dev/null || true		# might fail on solaris with CXX=sun's CC.
-	@cp -f $*.d $*.d.tmp
-	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
-	@rm -f $*.d.tmp
-	
-clean:
-	rm -f *.o core *.exe
-
-$(programs): ../../lib/*.a
-
-selective_cfi.exe:   $(OBJS)
-	$(CXX) $(CXXFLAGS) $^ $(INCLUDE) $(LIBS) -o $@
-
diff --git a/SConscript b/selective_cfi/SConscript
similarity index 100%
rename from SConscript
rename to selective_cfi/SConscript
diff --git a/SConstruct b/selective_cfi/SConstruct
similarity index 100%
rename from SConstruct
rename to selective_cfi/SConstruct
diff --git a/color_map.cpp b/selective_cfi/color_map.cpp
similarity index 100%
rename from color_map.cpp
rename to selective_cfi/color_map.cpp
diff --git a/color_map.hpp b/selective_cfi/color_map.hpp
similarity index 100%
rename from color_map.hpp
rename to selective_cfi/color_map.hpp
diff --git a/scfi_driver.cpp b/selective_cfi/scfi_driver.cpp
similarity index 100%
rename from scfi_driver.cpp
rename to selective_cfi/scfi_driver.cpp
diff --git a/scfi_instr.cpp b/selective_cfi/scfi_instr.cpp
similarity index 100%
rename from scfi_instr.cpp
rename to selective_cfi/scfi_instr.cpp
diff --git a/scfi_instr.hpp b/selective_cfi/scfi_instr.hpp
similarity index 100%
rename from scfi_instr.hpp
rename to selective_cfi/scfi_instr.hpp
diff --git a/tests/cfi_all_configs.sh b/selective_cfi/tests/cfi_all_configs.sh
similarity index 100%
rename from tests/cfi_all_configs.sh
rename to selective_cfi/tests/cfi_all_configs.sh
diff --git a/tests/cfi_smokescreen_configs.sh b/selective_cfi/tests/cfi_smokescreen_configs.sh
similarity index 100%
rename from tests/cfi_smokescreen_configs.sh
rename to selective_cfi/tests/cfi_smokescreen_configs.sh
diff --git a/tests/cicd_tests/fib_src/fib.c b/selective_cfi/tests/cicd_tests/fib_src/fib.c
similarity index 100%
rename from tests/cicd_tests/fib_src/fib.c
rename to selective_cfi/tests/cicd_tests/fib_src/fib.c
diff --git a/tests/cicd_tests/fib_src/libfib.c b/selective_cfi/tests/cicd_tests/fib_src/libfib.c
similarity index 100%
rename from tests/cicd_tests/fib_src/libfib.c
rename to selective_cfi/tests/cicd_tests/fib_src/libfib.c
diff --git a/tests/cicd_tests/fib_src/libfib2.c b/selective_cfi/tests/cicd_tests/fib_src/libfib2.c
similarity index 100%
rename from tests/cicd_tests/fib_src/libfib2.c
rename to selective_cfi/tests/cicd_tests/fib_src/libfib2.c
diff --git a/tests/cicd_tests/foo_src/foo.c b/selective_cfi/tests/cicd_tests/foo_src/foo.c
similarity index 100%
rename from tests/cicd_tests/foo_src/foo.c
rename to selective_cfi/tests/cicd_tests/foo_src/foo.c
diff --git a/tests/cicd_tests/foo_src/libfoo.c b/selective_cfi/tests/cicd_tests/foo_src/libfoo.c
similarity index 100%
rename from tests/cicd_tests/foo_src/libfoo.c
rename to selective_cfi/tests/cicd_tests/foo_src/libfoo.c
diff --git a/tests/manual_tests/dude.c b/selective_cfi/tests/manual_tests/dude.c
similarity index 100%
rename from tests/manual_tests/dude.c
rename to selective_cfi/tests/manual_tests/dude.c
diff --git a/tests/manual_tests/fib.c b/selective_cfi/tests/manual_tests/fib.c
similarity index 100%
rename from tests/manual_tests/fib.c
rename to selective_cfi/tests/manual_tests/fib.c
diff --git a/tests/manual_tests/foo.c b/selective_cfi/tests/manual_tests/foo.c
similarity index 100%
rename from tests/manual_tests/foo.c
rename to selective_cfi/tests/manual_tests/foo.c
diff --git a/tests/manual_tests/libc_driver.c b/selective_cfi/tests/manual_tests/libc_driver.c
similarity index 100%
rename from tests/manual_tests/libc_driver.c
rename to selective_cfi/tests/manual_tests/libc_driver.c
diff --git a/tests/manual_tests/libdude.c b/selective_cfi/tests/manual_tests/libdude.c
similarity index 100%
rename from tests/manual_tests/libdude.c
rename to selective_cfi/tests/manual_tests/libdude.c
diff --git a/tests/manual_tests/libfib.c b/selective_cfi/tests/manual_tests/libfib.c
similarity index 100%
rename from tests/manual_tests/libfib.c
rename to selective_cfi/tests/manual_tests/libfib.c
diff --git a/tests/manual_tests/libfib2.c b/selective_cfi/tests/manual_tests/libfib2.c
similarity index 100%
rename from tests/manual_tests/libfib2.c
rename to selective_cfi/tests/manual_tests/libfib2.c
diff --git a/tests/manual_tests/libfoo.c b/selective_cfi/tests/manual_tests/libfoo.c
similarity index 100%
rename from tests/manual_tests/libfoo.c
rename to selective_cfi/tests/manual_tests/libfoo.c
diff --git a/tests/manual_tests/pow.c b/selective_cfi/tests/manual_tests/pow.c
similarity index 100%
rename from tests/manual_tests/pow.c
rename to selective_cfi/tests/manual_tests/pow.c
diff --git a/tests/manual_tests/test_coreutils.sh b/selective_cfi/tests/manual_tests/test_coreutils.sh
similarity index 100%
rename from tests/manual_tests/test_coreutils.sh
rename to selective_cfi/tests/manual_tests/test_coreutils.sh
diff --git a/tests/manual_tests/test_dude.sh b/selective_cfi/tests/manual_tests/test_dude.sh
similarity index 100%
rename from tests/manual_tests/test_dude.sh
rename to selective_cfi/tests/manual_tests/test_dude.sh
diff --git a/tests/manual_tests/test_fib.sh b/selective_cfi/tests/manual_tests/test_fib.sh
similarity index 100%
rename from tests/manual_tests/test_fib.sh
rename to selective_cfi/tests/manual_tests/test_fib.sh
diff --git a/tests/manual_tests/test_foo.sh b/selective_cfi/tests/manual_tests/test_foo.sh
similarity index 100%
rename from tests/manual_tests/test_foo.sh
rename to selective_cfi/tests/manual_tests/test_foo.sh
diff --git a/tests/manual_tests/test_libc.sh b/selective_cfi/tests/manual_tests/test_libc.sh
similarity index 100%
rename from tests/manual_tests/test_libc.sh
rename to selective_cfi/tests/manual_tests/test_libc.sh
diff --git a/tests/manual_tests/test_pow.sh b/selective_cfi/tests/manual_tests/test_pow.sh
similarity index 100%
rename from tests/manual_tests/test_pow.sh
rename to selective_cfi/tests/manual_tests/test_pow.sh
diff --git a/tests/manual_tests/test_spec.sh b/selective_cfi/tests/manual_tests/test_spec.sh
similarity index 100%
rename from tests/manual_tests/test_spec.sh
rename to selective_cfi/tests/manual_tests/test_spec.sh
diff --git a/zest_cfi_runtime/SConscript b/selective_cfi/zest_cfi_runtime/SConscript
similarity index 100%
rename from zest_cfi_runtime/SConscript
rename to selective_cfi/zest_cfi_runtime/SConscript
diff --git a/zest_cfi_runtime/SConscript32 b/selective_cfi/zest_cfi_runtime/SConscript32
similarity index 100%
rename from zest_cfi_runtime/SConscript32
rename to selective_cfi/zest_cfi_runtime/SConscript32
diff --git a/zest_cfi_runtime/SConscript64 b/selective_cfi/zest_cfi_runtime/SConscript64
similarity index 100%
rename from zest_cfi_runtime/SConscript64
rename to selective_cfi/zest_cfi_runtime/SConscript64
diff --git a/zest_cfi_runtime/SConstruct b/selective_cfi/zest_cfi_runtime/SConstruct
similarity index 100%
rename from zest_cfi_runtime/SConstruct
rename to selective_cfi/zest_cfi_runtime/SConstruct
diff --git a/zest_cfi_runtime/dispatch.c b/selective_cfi/zest_cfi_runtime/dispatch.c
similarity index 100%
rename from zest_cfi_runtime/dispatch.c
rename to selective_cfi/zest_cfi_runtime/dispatch.c
diff --git a/zest_cfi_runtime/dl_iterate.c b/selective_cfi/zest_cfi_runtime/dl_iterate.c
similarity index 100%
rename from zest_cfi_runtime/dl_iterate.c
rename to selective_cfi/zest_cfi_runtime/dl_iterate.c
diff --git a/zest_cfi_runtime/ldsodefs.h b/selective_cfi/zest_cfi_runtime/ldsodefs.h
similarity index 100%
rename from zest_cfi_runtime/ldsodefs.h
rename to selective_cfi/zest_cfi_runtime/ldsodefs.h
diff --git a/zest_cfi_runtime/zest_dispatch64.s b/selective_cfi/zest_cfi_runtime/zest_dispatch64.s
similarity index 100%
rename from zest_cfi_runtime/zest_dispatch64.s
rename to selective_cfi/zest_cfi_runtime/zest_dispatch64.s