Moving File class to separate file