added cmake build system; cleanup