Moved files around so that puppet config files can be initialised in one go