Reorganized weapon config