- cleanup of cmake scripts and better seperation of files