changed autoload to broader namespace