Folder reshuffle
updated cmake