Update for std::os cleaning and file -> fs/File