More source tree refactoring.