Migrated controls to module loader.
Fixed bugs with module loader migrations.