Fixed bug in sitemap mapping.
Changed package structure. More encapsulation everywhere!