refactoring: rebuild source tree