remove entity/files/ dir name from rel path in entity/control

Collection control file does not include the 'files/' directory
name in paths, but Entity did.  Changed for consistency,
and so that the subdir name could be turned into a setting
in future without too much disruption.