Router reorganization