added sitemap and refactored