Objects in xml

Storing objects in the XML wherever it makes sense at this point. Since preferences and user data gets potentially merged, due to multiple specification I decided not to fiddle with this at this point. It is also not obvious to me that it would be advantages to push the merge code into the respective objects or complete the merge on the objects rather than the raw data.

Next, remove all _legacy calls from XMLInfo ;)