Move helpers/setup into partial
Merge pull request #160 from guardian/oja-move-setup

Move helpers/setup into partial