Moved service implementations to a separate package