Changed namespace and moved around resources in routes