Added new files to cmakelists to build properly