Farm production uploads

Renamed UploadFactory to Upload as its reused for both factories and
farms