Move module loading to Modules class