File Class refactoring (WIP)

WIP