changed some file names, removed some includes and stuff in CMakelists