Switch to a more modular approach to load modules