rearranged router and routes