Massive changes to structure & styles