updated namespaces because it still don't autoload