restructuring of router