Initial draft commit of single request file upload with various fixes and code clean-up
Removed renamed file