Started on rules package schema redesign