build system cleanup and directory cleanup
fixed include paths and more cmakelist file cleanup