Reorg

Reorganized some classes, and began implementing file upload execution