Moved stuff around and implemented a sitemap