move puppet stuff into /puppet
use puppet config from puphpet