refactored due to split off server component
Merge pull request #6 from zelgerj/master

refactoring due to server component split off