Separated uploader from reporter.

Modified uploader and reporter to work.