Clean up desktop template files
Make S3 bucket upload capability to be target-based
Update build machine Makefile