Rework so that sources are under a subcategory and other categories are across sources
: