UploadFile changed

-capsulization for UploadFile prepared, needs redesign of
deleteFile(...) method
-little code tidying up