Updated structure.
Updated structure.