Adjusted service names
Merge pull request #49 from inspiran/refactor

Adjusted service names
Adjusted naming of collections
Merge pull request #50 from inspiran/refactor

Adjusted naming of collections
Merge pull request #51 from inspiran/master

refactor to master
Merge branch 'refactor'
Fixed setup command (without taxonomy though)