Reorg: Rearrange upload code

Create uploads directory
Move everything into that directory

Change-Id: I2760d9e2ac3745c727e47c01d240dc039a3541dc
Hygiene: Use consistent upload module naming

Follow editing naming convention

Change-Id: I441fa8ac018ad7a4f61df21ce4d2ce31bdabd806
Merge changes I441fa8ac,I2760d9e2

* changes:
  Hygiene: Use consistent upload module naming
  Reorg: Rearrange upload code