restructure routing