ADD: Changes to source filenames and using cmake instead of just make