Restructure defs.