Refactore Routing and Change Namespace