[gentoo-catalyst] rewrite-on-master patches

[Brian Dolbec]

These are the first 4 of the entire rewrite-on-master branch.
Patch number 3 is to adapt Dylans changes to my newly rebased patch set.
These are applied before the initial restructuring.