CLEANUP: Reordering of modules.