Reorganized cmake.
Renamed subdirectories.
Slight update.