Removed uri from file but added UriAware interface for files that know their uris