Switching to autoload and namespaces