Refactoing: Cell has been moved to domain package