Major saNanny Refactoring

brickoderequested to merge
(removed):nursery-dev into pregmod-master

Should be a lot easier to maintain now, hopefully.

Merge request reports