Reorganize the modules