restructure
restructure submodules