Refactoring Move&Rename sources