Clean-up

Removed clones, added submodules