The great refactoring.