Update package for new structure