Adding submodules back in better place.