new package organization and package renaming