changed routes and namespace