Moved services API layer to services