parameterized urls
moved all urls into separate class
reordering puppet resources