Renamed upload/upload.coffee, still thinking of a good naming scheme for things.