Update for new asset structure.
Merge pull request #643 from rjackson/use_new_asset_structure

Update for new asset structure.