improve - refactor class package, remove concrete class from api package