Clean up macrostructure/router