Re-organized module loading.