Move includes into correct directory
Added CMake files