1. CLEANUP: Reordering of modules.
2. FIXED: Various fixes while finalizing the rewrite.