restructured submodules