Add some hierarchy to the source files
Merge pull request #3 from jeroenk/reorg

Add some hierarchy to the source files