xts5: Flatten Xt3 directory more

22 files changed, 60 insertions, 60 deletions

diff --git a/xts5/Xt3/CompositeWidget/CompositeWidget.m b/xts5/Xt3/CompositeWidget.m
index 7dce04db..972db596 100644
--- a/xts5/Xt3/CompositeWidget/CompositeWidget.m
+++ b/xts5/Xt3/CompositeWidget.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >>#
 >># Project: VSW5
 >>#
->># File: xts/Xt3/CompositeWidget/CompositeWidget.m
+>># File: xts/Xt3/CompositeWidget.m
 >>#
 >># Description:
 >>#	 Tests for Composite widget data structures
diff --git a/xts5/Xt3/ConstraintWidget/ConstraintWidget.m b/xts5/Xt3/ConstraintWidget.m
index 52370594..6dd19537 100644
--- a/xts5/Xt3/ConstraintWidget/ConstraintWidget.m
+++ b/xts5/Xt3/ConstraintWidget.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/ConstraintWidget/ConstraintWidget.m
+>># File: xts/Xt3/ConstraintWidget.m
 >># 
 >># Description:
 >>#	Tests for Constraint widget data structures
diff --git a/xts5/Xt3/CoreWidget/CoreWidget.m b/xts5/Xt3/CoreWidget.m
index fad3dbc8..ee896c25 100644
--- a/xts5/Xt3/CoreWidget/CoreWidget.m
+++ b/xts5/Xt3/CoreWidget.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/CoreWidget/CoreWidget.m
+>># File: xts/Xt3/CoreWidget.m
 >># 
 >># Description:
 >>#	Tests for Core widget data structures
diff --git a/xts5/Xt3/DataTypes/DataTypes.m b/xts5/Xt3/DataTypes.m
index d6b413cb..37b70907 100644
--- a/xts5/Xt3/DataTypes/DataTypes.m
+++ b/xts5/Xt3/DataTypes.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/DataTypes/DataTypes.m
+>># File: xts/Xt3/DataTypes.m
 >># 
 >># Description:
 >>#	Tests for Intrinsics datatypes
diff --git a/xts5/Xt3/XtClass/XtClass.m b/xts5/Xt3/XtClass.m
index 94a9724f..cac12a86 100644
--- a/xts5/Xt3/XtClass/XtClass.m
+++ b/xts5/Xt3/XtClass.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtClass/XtClass.m
+>># File: xts/Xt3/XtClass.m
 >># 
 >># Description:
 >>#	Tests for XtClass
diff --git a/xts5/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass.m b/xts5/Xt3/XtInitializeWidgetClass.m
index 1b12fa03..d2466210 100644
--- a/xts5/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass.m
+++ b/xts5/Xt3/XtInitializeWidgetClass.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass.m
+>># File: xts/Xt3/XtInitializeWidgetClass.m
 >># 
 >># Description:
 >>#	Tests for XtInitializeWidgetClass()
diff --git a/xts5/Xt3/XtIsApplicationShell/XtIsApplicationShell.m b/xts5/Xt3/XtIsApplicationShell.m
index b721a357..a1b39486 100644
--- a/xts5/Xt3/XtIsApplicationShell/XtIsApplicationShell.m
+++ b/xts5/Xt3/XtIsApplicationShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsApplicationShell/XtIsApplicationShell.m
+>># File: xts/Xt3/XtIsApplicationShell.m
 >># 
 >># Description:
 >>#	Tests for XtIsApplicationShell()
diff --git a/xts5/Xt3/XtIsComposite/XtIsComposite.m b/xts5/Xt3/XtIsComposite.m
index 6e786922..098092df 100644
--- a/xts5/Xt3/XtIsComposite/XtIsComposite.m
+++ b/xts5/Xt3/XtIsComposite.m
@@ -26,7 +26,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsComposite/XtIsComposite.m
+>># File: xts/Xt3/XtIsComposite.m
 >># 
 >># Description:
 >>#	Tests for XtIsComposite()
diff --git a/xts5/Xt3/XtIsConstraint/XtIsConstraint.m b/xts5/Xt3/XtIsConstraint.m
index cc268c58..56acdece 100644
--- a/xts5/Xt3/XtIsConstraint/XtIsConstraint.m
+++ b/xts5/Xt3/XtIsConstraint.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsConstraint/XtIsConstraint.m
+>># File: xts/Xt3/XtIsConstraint.m
 >># 
 >># Description:
 >>#	Tests for XtIsConstraint()
diff --git a/xts5/Xt3/XtIsObject/XtIsObject.m b/xts5/Xt3/XtIsObject.m
index 6866f584..c2b48945 100644
--- a/xts5/Xt3/XtIsObject/XtIsObject.m
+++ b/xts5/Xt3/XtIsObject.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsObject/XtIsObject.m
+>># File: xts/Xt3/XtIsObject.m
 >># 
 >># Description:
 >>#	Tests for XtIsObject
diff --git a/xts5/Xt3/XtIsOverrideShell/XtIsOverrideShell.m b/xts5/Xt3/XtIsOverrideShell.m
index 93c99698..36659d56 100644
--- a/xts5/Xt3/XtIsOverrideShell/XtIsOverrideShell.m
+++ b/xts5/Xt3/XtIsOverrideShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsOverrideShell/XtIsOverrideShell.m
+>># File: xts/Xt3/XtIsOverrideShell.m
 >># 
 >># Description:
 >>#	Tests for XtIsOverrideShell()
diff --git a/xts5/Xt3/XtIsRectObject/XtIsRectObject.m b/xts5/Xt3/XtIsRectObject.m
index 2fde14a7..96eaa52b 100644
--- a/xts5/Xt3/XtIsRectObject/XtIsRectObject.m
+++ b/xts5/Xt3/XtIsRectObject.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsRectObject/XtIsRectObject.m
+>># File: xts/Xt3/XtIsRectObject.m
 >># 
 >># Description:
 >>#	Tests for XtIsRectObj
diff --git a/xts5/Xt3/XtIsShell/XtIsShell.m b/xts5/Xt3/XtIsShell.m
index 27ed7709..bea5bf96 100644
--- a/xts5/Xt3/XtIsShell/XtIsShell.m
+++ b/xts5/Xt3/XtIsShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsShell/XtIsShell.m
+>># File: xts/Xt3/XtIsShell.m
 >># 
 >># Description:
 >>#	Tests for XtIsShell()
diff --git a/xts5/Xt3/XtIsSubclass/XtIsSubclass.m b/xts5/Xt3/XtIsSubclass.m
index a749a638..21c18986 100644
--- a/xts5/Xt3/XtIsSubclass/XtIsSubclass.m
+++ b/xts5/Xt3/XtIsSubclass.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsSubclass/XtIsSubclass.m
+>># File: xts/Xt3/XtIsSubclass.m
 >># 
 >># Description:
 >>#	Tests for XtIsSubclass()
diff --git a/xts5/Xt3/XtIsTopLevelShell/XtIsTopLevelShell.m b/xts5/Xt3/XtIsTopLevelShell.m
index 68549abe..656d75c4 100644
--- a/xts5/Xt3/XtIsTopLevelShell/XtIsTopLevelShell.m
+++ b/xts5/Xt3/XtIsTopLevelShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsTopLevelShell/XtIsTopLevelShell.m
+>># File: xts/Xt3/XtIsTopLevelShell.m
 >># 
 >># Description:
 >>#	Tests for XtIsTopLevelShell(w)
diff --git a/xts5/Xt3/XtIsTransientShell/XtIsTransientShell.m b/xts5/Xt3/XtIsTransientShell.m
index f8a36b33..28f9480f 100644
--- a/xts5/Xt3/XtIsTransientShell/XtIsTransientShell.m
+++ b/xts5/Xt3/XtIsTransientShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsTransientShell/XtIsTransientShell.m
+>># File: xts/Xt3/XtIsTransientShell.m
 >># 
 >># Description:
 >>#	Tests for XtIsTransientShell()
diff --git a/xts5/Xt3/XtIsVendorShell/XtIsVendorShell.m b/xts5/Xt3/XtIsVendorShell.m
index 6756045b..322825d8 100644
--- a/xts5/Xt3/XtIsVendorShell/XtIsVendorShell.m
+++ b/xts5/Xt3/XtIsVendorShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsVendorShell/XtIsVendorShell.m
+>># File: xts/Xt3/XtIsVendorShell.m
 >># 
 >># Description:
 >>#	Tests for XtIsVendorShell()
diff --git a/xts5/Xt3/XtIsWMShell/XtIsWMShell.m b/xts5/Xt3/XtIsWMShell.m
index c47fc047..ccc63f33 100644
--- a/xts5/Xt3/XtIsWMShell/XtIsWMShell.m
+++ b/xts5/Xt3/XtIsWMShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsWMShell/XtIsWMShell.m
+>># File: xts/Xt3/XtIsWMShell.m
 >># 
 >># Description:
 >>#	Tests for XtIsWMShell
diff --git a/xts5/Xt3/XtIsWidget/XtIsWidget.m b/xts5/Xt3/XtIsWidget.m
index 88a29002..800db40e 100644
--- a/xts5/Xt3/XtIsWidget/XtIsWidget.m
+++ b/xts5/Xt3/XtIsWidget.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtIsWidget/XtIsWidget.m
+>># File: xts/Xt3/XtIsWidget.m
 >># 
 >># Description:
 >>#	Tests for XtIsWidget
diff --git a/xts5/Xt3/XtSuperClass/XtSuperClass.m b/xts5/Xt3/XtSuperClass.m
index d9e66aec..6d9a9ed2 100644
--- a/xts5/Xt3/XtSuperClass/XtSuperClass.m
+++ b/xts5/Xt3/XtSuperClass.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt3/XtSuperClass/XtSuperClass.m
+>># File: xts/Xt3/XtSuperClass.m
 >># 
 >># Description:
 >>#	Tests for XtSuperClass
diff --git a/xts5/scenarios/Xt3_scen b/xts5/scenarios/Xt3_scen
index d09c29fd..1a4d7678 100644
--- a/xts5/scenarios/Xt3_scen
+++ b/xts5/scenarios/Xt3_scen
@@ -58,44 +58,44 @@
 #
 
 	"VSW5TESTSUITE CASE DataTypes 9"
-	/Xt3/DataTypes/DataTypes
+	/Xt3/DataTypes
 	"VSW5TESTSUITE CASE CoreWidget 9"
-	/Xt3/CoreWidget/CoreWidget
+	/Xt3/CoreWidget
 	"VSW5TESTSUITE CASE CompositeWidget 11"
-	/Xt3/CompositeWidget/CompositeWidget
+	/Xt3/CompositeWidget
 	"VSW5TESTSUITE CASE ConstraintWidget 11"
-	/Xt3/ConstraintWidget/ConstraintWidget
+	/Xt3/ConstraintWidget
 	"VSW5TESTSUITE CASE XtClass 1"
-	/Xt3/XtClass/XtClass
+	/Xt3/XtClass
 	"VSW5TESTSUITE CASE XtSuperClass 1"
-	/Xt3/XtSuperClass/XtSuperClass
+	/Xt3/XtSuperClass
 	"VSW5TESTSUITE CASE XtIsSubclass 2"
-	/Xt3/XtIsSubclass/XtIsSubclass
+	/Xt3/XtIsSubclass
 	"VSW5TESTSUITE CASE XtIsObject 2"
-	/Xt3/XtIsObject/XtIsObject
+	/Xt3/XtIsObject
 	"VSW5TESTSUITE CASE XtIsRectObj 2"
-	/Xt3/XtIsRectObject/XtIsRectObject
+	/Xt3/XtIsRectObject
 	"VSW5TESTSUITE CASE XtIsWidget 2"
-	/Xt3/XtIsWidget/XtIsWidget
+	/Xt3/XtIsWidget
 	"VSW5TESTSUITE CASE XtIsComposite 2"
-	/Xt3/XtIsComposite/XtIsComposite
+	/Xt3/XtIsComposite
 	"VSW5TESTSUITE CASE XtIsConstraint 2"
-	/Xt3/XtIsConstraint/XtIsConstraint
+	/Xt3/XtIsConstraint
 	"VSW5TESTSUITE CASE XtIsShell 2"
-	/Xt3/XtIsShell/XtIsShell
+	/Xt3/XtIsShell
 	"VSW5TESTSUITE CASE XtIsOverrideShell 2"
-	/Xt3/XtIsOverrideShell/XtIsOverrideShell
+	/Xt3/XtIsOverrideShell
 	"VSW5TESTSUITE CASE XtIsWMShell 2"
-	/Xt3/XtIsWMShell/XtIsWMShell
+	/Xt3/XtIsWMShell
 	"VSW5TESTSUITE CASE XtIsVendorShell 2"
-	/Xt3/XtIsVendorShell/XtIsVendorShell
+	/Xt3/XtIsVendorShell
 	"VSW5TESTSUITE CASE XtIsTransientShell 2"
-	/Xt3/XtIsTransientShell/XtIsTransientShell
+	/Xt3/XtIsTransientShell
 	"VSW5TESTSUITE CASE XtIsTopLevelShell 2"
-	/Xt3/XtIsTopLevelShell/XtIsTopLevelShell
+	/Xt3/XtIsTopLevelShell
 	"VSW5TESTSUITE CASE XtIsApplicationShell 2"
-	/Xt3/XtIsApplicationShell/XtIsApplicationShell
+	/Xt3/XtIsApplicationShell
 	"VSW5TESTSUITE CASE XtCheckSubclass 3"
 	/Xt3/XtCheckSubclass/XtCheckSubclass
 	"VSW5TESTSUITE CASE XtInitializeWidgetClass 2"
-	/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass
+	/Xt3/XtInitializeWidgetClass
diff --git a/xts5/tet_scen b/xts5/tet_scen
index 2b9541a9..07fdcea7 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -3594,79 +3594,79 @@ pWarpPointer
 
 XtDataTypes
 	"VSW5TESTSUITE CASE DataTypes 9"
-	/Xt3/DataTypes/DataTypes
+	/Xt3/DataTypes
 
 CoreWidget
 	"VSW5TESTSUITE CASE CoreWidget 9"
-	/Xt3/CoreWidget/CoreWidget
+	/Xt3/CoreWidget
 
 CompositeWidget
 	"VSW5TESTSUITE CASE CompositeWidget 11"
-	/Xt3/CompositeWidget/CompositeWidget
+	/Xt3/CompositeWidget
 
 ConstraintWidget
 	"VSW5TESTSUITE CASE ConstraintWidget 11"
-	/Xt3/ConstraintWidget/ConstraintWidget
+	/Xt3/ConstraintWidget
 
 XtClass
 	"VSW5TESTSUITE CASE XtClass 1"
-	/Xt3/XtClass/XtClass
+	/Xt3/XtClass
 
 XtSuperClass
 	"VSW5TESTSUITE CASE XtSuperClass 1"
-	/Xt3/XtSuperClass/XtSuperClass
+	/Xt3/XtSuperClass
 
 XtIsSubclass
 	"VSW5TESTSUITE CASE XtIsSubclass 2"
-	/Xt3/XtIsSubclass/XtIsSubclass
+	/Xt3/XtIsSubclass
 
 XtIsObject
 	"VSW5TESTSUITE CASE XtIsObject 2"
-	/Xt3/XtIsObject/XtIsObject
+	/Xt3/XtIsObject
 
 XtIsRectObj
 	"VSW5TESTSUITE CASE XtIsRectObj 2"
-	/Xt3/XtIsRectObject/XtIsRectObject
+	/Xt3/XtIsRectObject
 
 XtIsWidget
 	"VSW5TESTSUITE CASE XtIsWidget 2"
-	/Xt3/XtIsWidget/XtIsWidget
+	/Xt3/XtIsWidget
 
 XtIsComposite
 	"VSW5TESTSUITE CASE XtIsComposite 2"
-	/Xt3/XtIsComposite/XtIsComposite
+	/Xt3/XtIsComposite
 
 XtIsConstraint
 	"VSW5TESTSUITE CASE XtIsConstraint 2"
-	/Xt3/XtIsConstraint/XtIsConstraint
+	/Xt3/XtIsConstraint
 
 XtIsShell
 	"VSW5TESTSUITE CASE XtIsShell 2"
-	/Xt3/XtIsShell/XtIsShell
+	/Xt3/XtIsShell
 
 XtIsOverrideShell
 	"VSW5TESTSUITE CASE XtIsOverrideShell 2"
-	/Xt3/XtIsOverrideShell/XtIsOverrideShell
+	/Xt3/XtIsOverrideShell
 
 XtIsWMShell
 	"VSW5TESTSUITE CASE XtIsWMShell 2"
-	/Xt3/XtIsWMShell/XtIsWMShell
+	/Xt3/XtIsWMShell
 
 XtIsVendorShell
 	"VSW5TESTSUITE CASE XtIsVendorShell 2"
-	/Xt3/XtIsVendorShell/XtIsVendorShell
+	/Xt3/XtIsVendorShell
 
 XtIsTransientShell
 	"VSW5TESTSUITE CASE XtIsTransientShell 2"
-	/Xt3/XtIsTransientShell/XtIsTransientShell
+	/Xt3/XtIsTransientShell
 
 XtIsTopLevelShell
 	"VSW5TESTSUITE CASE XtIsTopLevelShell 2"
-	/Xt3/XtIsTopLevelShell/XtIsTopLevelShell
+	/Xt3/XtIsTopLevelShell
 
 XtIsApplicationShell
 	"VSW5TESTSUITE CASE XtIsApplicationShell 2"
-	/Xt3/XtIsApplicationShell/XtIsApplicationShell
+	/Xt3/XtIsApplicationShell
 
 XtCheckSubclass
 	"VSW5TESTSUITE CASE XtCheckSubclass 3"
@@ -3674,7 +3674,7 @@ XtCheckSubclass
 
 XtInitializeWidgetClass
 	"VSW5TESTSUITE CASE XtInitializeWidgetClass 2"
-	/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass
+	/Xt3/XtInitializeWidgetClass
 
 #Discrete tests for Xt Chapter 4