Restructured the traversal step classes for better groupings.