Reworked directory structure, updated CMakeLists.txt