[IMP] pkgs refactoring