moved puppet tasks into their more appropriate puppets
Merge pull request #5 from JulianBurz/feature-modular-modules

moved puppet tasks into their more appropriate puppets