further work for package renaming