Refactoring of IndexSitemap and Sitemap classes