Structural changes

Structural changes