Reorganize states
Removed xbmc
Reorg states into desktop group
More reorg