restructure of modules in suite