diff --git a/headers/COPYING b/COPYING
similarity index 100%
rename from headers/COPYING
rename to COPYING
diff --git a/headers/Makefile b/Makefile
similarity index 100%
rename from headers/Makefile
rename to Makefile
diff --git a/headers/README b/README
similarity index 100%
rename from headers/README
rename to README
diff --git a/headers/cpp/__init__.py b/cpp/__init__.py
similarity index 100%
rename from headers/cpp/__init__.py
rename to cpp/__init__.py
diff --git a/headers/cpp/ast.py b/cpp/ast.py
similarity index 100%
rename from headers/cpp/ast.py
rename to cpp/ast.py
diff --git a/headers/cpp/ast_test.py b/cpp/ast_test.py
similarity index 100%
rename from headers/cpp/ast_test.py
rename to cpp/ast_test.py
diff --git a/headers/cpp/find_warnings.py b/cpp/find_warnings.py
similarity index 100%
rename from headers/cpp/find_warnings.py
rename to cpp/find_warnings.py
diff --git a/headers/cpp/functions.py b/cpp/functions.py
similarity index 100%
rename from headers/cpp/functions.py
rename to cpp/functions.py
diff --git a/headers/cpp/headers.py b/cpp/headers.py
similarity index 100%
rename from headers/cpp/headers.py
rename to cpp/headers.py
diff --git a/headers/cpp/keywords.py b/cpp/keywords.py
similarity index 100%
rename from headers/cpp/keywords.py
rename to cpp/keywords.py
diff --git a/headers/cpp/methods.py b/cpp/methods.py
similarity index 100%
rename from headers/cpp/methods.py
rename to cpp/methods.py
diff --git a/headers/cpp/metrics.py b/cpp/metrics.py
similarity index 100%
rename from headers/cpp/metrics.py
rename to cpp/metrics.py
diff --git a/headers/cpp/nonvirtual_dtors.py b/cpp/nonvirtual_dtors.py
similarity index 100%
rename from headers/cpp/nonvirtual_dtors.py
rename to cpp/nonvirtual_dtors.py
diff --git a/headers/cpp/schema-create.sql b/cpp/schema-create.sql
similarity index 100%
rename from headers/cpp/schema-create.sql
rename to cpp/schema-create.sql
diff --git a/headers/cpp/schema-drop.sql b/cpp/schema-drop.sql
similarity index 100%
rename from headers/cpp/schema-drop.sql
rename to cpp/schema-drop.sql
diff --git a/headers/cpp/static_data.py b/cpp/static_data.py
similarity index 100%
rename from headers/cpp/static_data.py
rename to cpp/static_data.py
diff --git a/headers/cpp/store_db.py b/cpp/store_db.py
similarity index 100%
rename from headers/cpp/store_db.py
rename to cpp/store_db.py
diff --git a/headers/cpp/symbols.py b/cpp/symbols.py
similarity index 100%
rename from headers/cpp/symbols.py
rename to cpp/symbols.py
diff --git a/headers/cpp/symbols_test.py b/cpp/symbols_test.py
similarity index 100%
rename from headers/cpp/symbols_test.py
rename to cpp/symbols_test.py
diff --git a/headers/cpp/tokenize.py b/cpp/tokenize.py
similarity index 100%
rename from headers/cpp/tokenize.py
rename to cpp/tokenize.py
diff --git a/headers/cpp/tokenize_test.py b/cpp/tokenize_test.py
similarity index 100%
rename from headers/cpp/tokenize_test.py
rename to cpp/tokenize_test.py
diff --git a/headers/cpp/types.py b/cpp/types.py
similarity index 100%
rename from headers/cpp/types.py
rename to cpp/types.py
diff --git a/headers/cpp/utils.py b/cpp/utils.py
similarity index 100%
rename from headers/cpp/utils.py
rename to cpp/utils.py
diff --git a/headers/run.sh b/run.sh
similarity index 100%
rename from headers/run.sh
rename to run.sh
diff --git a/headers/runtests.py b/runtests.py
similarity index 100%
rename from headers/runtests.py
rename to runtests.py
diff --git a/headers/test/bar.h b/test/bar.h
similarity index 100%
rename from headers/test/bar.h
rename to test/bar.h
diff --git a/headers/test/define/d1.cc b/test/define/d1.cc
similarity index 100%
rename from headers/test/define/d1.cc
rename to test/define/d1.cc
diff --git a/headers/test/define/d1.expected b/test/define/d1.expected
similarity index 100%
rename from headers/test/define/d1.expected
rename to test/define/d1.expected
diff --git a/headers/test/define/d1.h b/test/define/d1.h
similarity index 100%
rename from headers/test/define/d1.h
rename to test/define/d1.h
diff --git a/headers/test/define/d2.cc b/test/define/d2.cc
similarity index 100%
rename from headers/test/define/d2.cc
rename to test/define/d2.cc
diff --git a/headers/test/define/d2.expected b/test/define/d2.expected
similarity index 100%
rename from headers/test/define/d2.expected
rename to test/define/d2.expected
diff --git a/headers/test/define/d3.cc b/test/define/d3.cc
similarity index 100%
rename from headers/test/define/d3.cc
rename to test/define/d3.cc
diff --git a/headers/test/define/d3.expected b/test/define/d3.expected
similarity index 100%
rename from headers/test/define/d3.expected
rename to test/define/d3.expected
diff --git a/headers/test/define/d3.h b/test/define/d3.h
similarity index 100%
rename from headers/test/define/d3.h
rename to test/define/d3.h
diff --git a/headers/test/define/d4-used.h b/test/define/d4-used.h
similarity index 100%
rename from headers/test/define/d4-used.h
rename to test/define/d4-used.h
diff --git a/headers/test/define/d4.expected b/test/define/d4.expected
similarity index 100%
rename from headers/test/define/d4.expected
rename to test/define/d4.expected
diff --git a/headers/test/define/d4.h b/test/define/d4.h
similarity index 100%
rename from headers/test/define/d4.h
rename to test/define/d4.h
diff --git a/headers/test/define/d5.expected b/test/define/d5.expected
similarity index 100%
rename from headers/test/define/d5.expected
rename to test/define/d5.expected
diff --git a/headers/test/define/d5.h b/test/define/d5.h
similarity index 100%
rename from headers/test/define/d5.h
rename to test/define/d5.h
diff --git a/headers/test/define/d6.expected b/test/define/d6.expected
similarity index 100%
rename from headers/test/define/d6.expected
rename to test/define/d6.expected
diff --git a/headers/test/define/d6.h b/test/define/d6.h
similarity index 100%
rename from headers/test/define/d6.h
rename to test/define/d6.h
diff --git a/headers/test/define/d7.expected b/test/define/d7.expected
similarity index 100%
rename from headers/test/define/d7.expected
rename to test/define/d7.expected
diff --git a/headers/test/define/d7.h b/test/define/d7.h
similarity index 100%
rename from headers/test/define/d7.h
rename to test/define/d7.h
diff --git a/headers/test/define/d8.expected b/test/define/d8.expected
similarity index 100%
rename from headers/test/define/d8.expected
rename to test/define/d8.expected
diff --git a/headers/test/define/d8.h b/test/define/d8.h
similarity index 100%
rename from headers/test/define/d8.h
rename to test/define/d8.h
diff --git a/headers/test/define/other_defined1.h b/test/define/other_defined1.h
similarity index 100%
rename from headers/test/define/other_defined1.h
rename to test/define/other_defined1.h
diff --git a/headers/test/foo.h b/test/foo.h
similarity index 100%
rename from headers/test/foo.h
rename to test/foo.h
diff --git a/headers/test/foo.h.expected b/test/foo.h.expected
similarity index 100%
rename from headers/test/foo.h.expected
rename to test/foo.h.expected
diff --git a/headers/test/foo.h.expected-warnings b/test/foo.h.expected-warnings
similarity index 100%
rename from headers/test/foo.h.expected-warnings
rename to test/foo.h.expected-warnings
diff --git a/headers/test/need-class.h b/test/need-class.h
similarity index 100%
rename from headers/test/need-class.h
rename to test/need-class.h
diff --git a/headers/test/need-class.h.expected-warnings b/test/need-class.h.expected-warnings
similarity index 100%
rename from headers/test/need-class.h.expected-warnings
rename to test/need-class.h.expected-warnings
diff --git a/headers/test/not-used.h b/test/not-used.h
similarity index 100%
rename from headers/test/not-used.h
rename to test/not-used.h
diff --git a/headers/test/something1.h b/test/something1.h
similarity index 100%
rename from headers/test/something1.h
rename to test/something1.h
diff --git a/headers/test/xss_module.h b/test/xss_module.h
similarity index 100%
rename from headers/test/xss_module.h
rename to test/xss_module.h