Some reworking of dependencies and site generation