Cleaned out submodules.
Readded submodules properly.