Housekeeping

- Updated configs
- Moved upload stuff into Upload class folder