Refactoring

PR to the correct location :-)

A raft of changes to the cookbook. Check the commit log.