Refactoring source files