Standard source tree refactoring