Separating to common and client
Adding server files
Merge pull request #7 from cleandart/feature/hierarchy

Feature/hierarchy
Mergeing with master