Reorganize things more rationally and so that more code is shared.
Attach a file by drag & drop or click to upload
