Final touches for module migration.