Moving module loading into the controller