restructured layout of modules