Restructuration of services classes.