Fix build process
Rearrange assets to by in more consistent order