[Task] Reorganize package