Fixed overwritten commit
Fixed overwritten commits

And changed file paths for uploading to the server