Split crafting logic into it's own helper file
Fixed some more unit names to be consistent with their kits