Cleaner loading of module files