Removed unneeded data directory
Cleaned up CMakeLists.txt, also use build types