reorganization
Use static class instead of global router