Refactoring sources