ReStructure with more modules