fixed router namespace. added template objects