changed errors in uploader

Furthermore i merged upload and uploader so no need for uploader
anymore.