rename package and add FirstCommonParent