some package organization changes