Subdivision in sub-package and some fix