Ugly-ness.
Adding submodules back with new name