Moved file structure one more time. CMake should now work