better organized packages for puppet