change router to singleton
0.1.5