Removing ocaml and opam packages
Adding silver surfer package
Rearranging more packages
Moving coreutils package into main site.pp
Adding mail environment packages

and generally reorganising