Proper directory/module structure
Merge pull request #1 from kyllingstad/master

Proper directory/module structure