update for branching and subpackages