Fix DefaultSiteGenerator to generate the files correctly and in the correct places