#5 Updated cmakelist and file names.