wrapper class rather than id
Use cached json as basis for sitemap rather than out directory
Re-org some internals