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

refactoring due to server component split off