Final bit of tidying up.

Some tidying work done on the system, including some additional
comments, removal of a deprecated file, and inclusion of the upload
directory.