More changes to autoloading, config and instantiation.