Modified the moduleloader to be a bit nicer.