Significant refactor which will break all dependent plugins but should make the package ordering more logical.