Fill out the file upload for existing and new files.
Move marshalers to util directory.