- Work on the command
- reorganize the packages