Converted structure to 2.0 layout