Assets all live in the same directory now
Remove staging-assets directory
Update assets after merge conflict