reorganized some packaging