Moved some classes from Services to Services.Interfaces