Adding cmake build, move stuff around