reorganized imports uploads.scala