refact package