Start working on CMake build - move some files to subdirectories