Updated folderstructure in cmake file