first stage of refactoring server side model
Merge pull request #65 from AllTheDucks/refactor-server-model

first stage of refactoring server side model