refactoring federation files