last package strutucture fixes