Add number of package
Fix import & Add EXIT_CONFIRM state
Modify grammar