Reorganization into categories.