restructured the file system for cmake