Reorganize and 2 new armors