fixing cmake files and file location code