Channel Sorting

Hello,

i have TVheadend as Front and Backand with dual Tuner card

Works good and switching times are ok approx. 2 sec depending SD or HD

I am used to my Dreambox Enigma2 DM8000 with my channel lists in diffrent bouquets
Example:

Bouquet "HD+" with all my german HD programs
"Free to air" with all my free to air programs
....

and so on

in total list i have about 2300 channels and it annoys me extremly to search in that list
is there an way to sort all those programs in subcategories in xbmc or tvheadend ?

best would be to have an external program to organize them with drag and drop

Sincerly