structure changes, namespace, router