Some corporate refactoring.