Remove interfaces for Service related components - only maintain a single class per component