fixed shock upload
updated names
renamed files
Fixed minor errors after test
Merge pull request #4 from pranjan77/master

Minor fixes after test