Mass reorginization to follow format.