Moved service input classes into the service classes.