Sort fields into fieldsets for each step