Reorganizing structure of directory and correcting CMake config