package organization changes