Module structure proposal
Merge pull request #1 from guardian/modules

Module structure proposal