Merge pull request #94 from norzechowicz/refactoring

ResourceContext refactoring
Moved context with builders to more proper namespace
Remove unused use statements