Moved context with builders to more proper namespace
Remove unused use statements
Merge pull request #97 from norzechowicz/refactoring

Refactoring