Move assembling modules into index.js
Rearrange saving code
Merge pull request #34 from alphagov/refactor/saving-code

Refactor/saving code