Router restructuring