Moved services to services package
Merge branch 'develop' of github.com:skltp/av into develop