Adding class re-organizations