- cleanup of cmake scripts and proper organizing of files