Move the autoload calls into the class so they're namespaced properly