Changed CMakeFiles.txt by adding and removing the appropriate source
files.

Some interface and linking issues have to be resolved.