Restructured project to work with CMake