Switch assets to new scratch buckets tr e jkf i hdp [WIP]

@mguymon, work in progress for switching assets to new buckets.