fixing some bugs from renaming

- fixed include of service which changed its include path due to rename of package
- fixed include paths in package to be consistent