reorganize code layout (move download and upload into one prominent area)
rename a method