re-org the pkgs: fixing #5