Revert "More structure"
Merge pull request #22 from nixolas1/revert-21-more-structure

Revert "More structure"