Refactoring property files