Adding new files to cmake

Moved files themselves to the proper directory
Added them to cmake
Moving includes n stuff around