Rearrange some asset templates [ci skip]