Merge pull request #162 from DavidVorick/upload

Major Changes to Client
cotinue working on UploadFile
organizational stuff
change MerkleCollapse to a standalone function