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 branch 'refactor'
Fixed setup command (without taxonomy though)
Merge pull request #52 from inspiran/master

Fixed setup command