Cleared source tree for refactoring