Moving things around, and changing class names.