Reorganized for modern packaging