Upgrading is just uploading changed files as is. You don't need to create new folder, etc... Just unzip and upload all files.

If you changed templates, you should make same change in the changed templates, so take a note of changes when you modify the templates.