Removed submodules
Added back in sob module contents, but only as non-submodules