Refactor the org.crsh.command package