Cleaning up desktop template files
Make S3 bucket upload capability to be target-based