restructuring assets
fix routing