Reorganized toolkit to just use code subcategory