diff --git a/chaiscript/chaiscript.hpp b/include/chaiscript/chaiscript.hpp
similarity index 100%
rename from chaiscript/chaiscript.hpp
rename to include/chaiscript/chaiscript.hpp
diff --git a/chaiscript/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp
similarity index 100%
rename from chaiscript/chaiscript_engine.hpp
rename to include/chaiscript/language/chaiscript_engine.hpp
diff --git a/chaiscript/chaiscript_eval.hpp b/include/chaiscript/language/chaiscript_eval.hpp
similarity index 100%
rename from chaiscript/chaiscript_eval.hpp
rename to include/chaiscript/language/chaiscript_eval.hpp
diff --git a/chaiscript/chaiscript_parser.hpp b/include/chaiscript/language/chaiscript_parser.hpp
similarity index 100%
rename from chaiscript/chaiscript_parser.hpp
rename to include/chaiscript/language/chaiscript_parser.hpp
diff --git a/chaiscript/chaiscript_prelude.hpp b/include/chaiscript/language/chaiscript_prelude.hpp
similarity index 100%
rename from chaiscript/chaiscript_prelude.hpp
rename to include/chaiscript/language/chaiscript_prelude.hpp
diff --git a/chaiscript/callbacktest.cpp b/src/callbacktest.cpp
similarity index 100%
rename from chaiscript/callbacktest.cpp
rename to src/callbacktest.cpp
diff --git a/chaiscript/main.cpp b/src/main.cpp
similarity index 100%
rename from chaiscript/main.cpp
rename to src/main.cpp
diff --git a/chaiscript/sensors.cpp b/src/sensors.cpp
similarity index 100%
rename from chaiscript/sensors.cpp
rename to src/sensors.cpp