Refactor contexts to own class
Merge pull request #1 from juhokallio/refactor/context-class

Refactor contexts to own class