added namespace and changed autoload