re-organized back into one list, with category field.  removed remaining unsorted entries.