renamed files and changed cmakelists accordingly