Improve DataStore: enable pritty print for the JAXB XML Marshaller
Restructure packages