services structure reorganized