Rework structure, add *path-routing