Moved broadly applicable modules out to site.pp