[refac] extract into package