My suggestion is as such. Get rid of ALL on foot specific material, replace them with ship mats, and let the ship mats be shared between both. And replace the mats that are in place at ground sites with the ship mats, raw, manufactured, and encoded. The higher the defense of the location, the higher grade material you can get.