Rationalised the use of modules and loaders for the Sitemap, but still
have tests failures to resolve (5 errors, 22 failures).  Also now
requires the use of com.googe.inject instead of java.inject, the former
has an 'optional' parameter, the latter does not