Updated the module versions and rearanged the modules.