Reorganizing into hopefully something that puppet can work with.