Autoloader modifications and namespace change