Removed unnecesary SubModules
Neatened CMakeLists.txt