Moved Service to own package