Improve naming and structure and minor clean up.
Merge pull request #6 from maartendraijer/develop

Improve naming and structure and minor clean up.