File Operations Refactoring in Progress