Restructure categories and automate