Added separate CMakeLists.txt build files for each sub folder. Fixed some includes.