File Class refactoring