Structure changes.

Added structure changes.