Changed Commons layout, added some data models with XML serialization