restructuring in order to decompose into subrepos