Reorganized things and updated references.