Restructure MainContent to mostly copy Vector's structure

Change-Id: Ie77b8f93abb23365e714660bfa1b97f3456f8327