Upload

Changed structure.
Everything is in upload now. Partially done. Now know what I'm doing.