More File Refactoring