Refactoring FileInfo entity