Complete Service component refactor.
Merge branch 'feature/service-refeactor' into develop