refact lazy move package