XML update for better categorizing

Update to the xml to use categories more in line with standard Mendix categories