Reorganization, getting superfish working again.