Update categories for the attributes to better separate their functionality.
Merge pull request #1 from Rvthof/master

XML update for better categorizing