Removed some annoying submodules.
Moved cmake files up.