mostly small changes to move to a module based strucutre such that you can add more hosts at a later date
