More texture moves / refactors

Armor textures