Refine code structure by add ASearch in search package