The great API reorganization