Moved EJB classes to service package