Made elements primary data for categories
categories
Moved defs