Refactoring files factory
Refactoring files factory