Structure changes

Routing structure changes