Major cleanup and organizational changes