refactored the used cmake file
added missing files
just include the libs no need for a subdir
Merge branch 'master' into CMakeRefactor
merged master
libs to newests