The great refactoring continues.