CLEANUP: Finalized the reordering of modules.