diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIActivityIndicatorViewTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIActivityIndicatorViewTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIActivityIndicatorViewTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIActivityIndicatorViewTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIButtonTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIButtonTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIButtonTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIButtonTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIControlTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIControlTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIControlTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIControlTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIDatePickerTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIDatePickerTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIDatePickerTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIDatePickerTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIGestureRecognizerTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIGestureRecognizerTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIGestureRecognizerTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIGestureRecognizerTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIImageViewTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIImageViewTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIImageViewTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIImageViewTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UILabelTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UILabelTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UILabelTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UILabelTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIPageControlTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIPageControlTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIPageControlTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIPageControlTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIProgressViewTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIProgressViewTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIProgressViewTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIProgressViewTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIRefreshControlTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIRefreshControlTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIRefreshControlTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIRefreshControlTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UISegmentedControlTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UISegmentedControlTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UISegmentedControlTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UISegmentedControlTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UISliderTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UISliderTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UISliderTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UISliderTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIStepperTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIStepperTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIStepperTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIStepperTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UISwitchTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UISwitchTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UISwitchTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UISwitchTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UITextFieldTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UITextFieldTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UITextFieldTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UITextFieldTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UITextViewTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UITextViewTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UITextViewTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UITextViewTests.swift
diff --git a/Tests/CombineUITests/UIKit/BindingsTests/UIViewTests.swift b/Tests/CombineUITests/UIKitTests/BindingsTests/UIViewTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/BindingsTests/UIViewTests.swift
rename to Tests/CombineUITests/UIKitTests/BindingsTests/UIViewTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlTests.swift b/Tests/CombineUITests/UIKitTests/ControlTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlsTests/ButtonTests.swift b/Tests/CombineUITests/UIKitTests/ControlsTests/ButtonTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlsTests/ButtonTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlsTests/ButtonTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlsTests/DatePickerTests.swift b/Tests/CombineUITests/UIKitTests/ControlsTests/DatePickerTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlsTests/DatePickerTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlsTests/DatePickerTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlsTests/PageControlTests.swift b/Tests/CombineUITests/UIKitTests/ControlsTests/PageControlTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlsTests/PageControlTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlsTests/PageControlTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlsTests/RefreshControlTests.swift b/Tests/CombineUITests/UIKitTests/ControlsTests/RefreshControlTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlsTests/RefreshControlTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlsTests/RefreshControlTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlsTests/SegmentedControlTests.swift b/Tests/CombineUITests/UIKitTests/ControlsTests/SegmentedControlTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlsTests/SegmentedControlTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlsTests/SegmentedControlTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlsTests/SliderTests.swift b/Tests/CombineUITests/UIKitTests/ControlsTests/SliderTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlsTests/SliderTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlsTests/SliderTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlsTests/StepperTests.swift b/Tests/CombineUITests/UIKitTests/ControlsTests/StepperTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlsTests/StepperTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlsTests/StepperTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlsTests/SwitchTests.swift b/Tests/CombineUITests/UIKitTests/ControlsTests/SwitchTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlsTests/SwitchTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlsTests/SwitchTests.swift
diff --git a/Tests/CombineUITests/UIKit/ControlsTests/TextFieldTests.swift b/Tests/CombineUITests/UIKitTests/ControlsTests/TextFieldTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ControlsTests/TextFieldTests.swift
rename to Tests/CombineUITests/UIKitTests/ControlsTests/TextFieldTests.swift
diff --git a/Tests/CombineUITests/UIKit/GestureRecognizerTests.swift b/Tests/CombineUITests/UIKitTests/GestureRecognizerTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/GestureRecognizerTests.swift
rename to Tests/CombineUITests/UIKitTests/GestureRecognizerTests.swift
diff --git a/Tests/CombineUITests/UIKit/Support/ControlTarget.swift b/Tests/CombineUITests/UIKitTests/Support/ControlTarget.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/Support/ControlTarget.swift
rename to Tests/CombineUITests/UIKitTests/Support/ControlTarget.swift
diff --git a/Tests/CombineUITests/UIKit/Support/GestureRecognizerTarget.swift b/Tests/CombineUITests/UIKitTests/Support/GestureRecognizerTarget.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/Support/GestureRecognizerTarget.swift
rename to Tests/CombineUITests/UIKitTests/Support/GestureRecognizerTarget.swift
diff --git a/Tests/CombineUITests/UIKit/ViewControllerTests.swift b/Tests/CombineUITests/UIKitTests/ViewControllerTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ViewControllerTests.swift
rename to Tests/CombineUITests/UIKitTests/ViewControllerTests.swift
diff --git a/Tests/CombineUITests/UIKit/ViewsTests/ScrollViewTests.swift b/Tests/CombineUITests/UIKitTests/ViewsTests/ScrollViewTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ViewsTests/ScrollViewTests.swift
rename to Tests/CombineUITests/UIKitTests/ViewsTests/ScrollViewTests.swift
diff --git a/Tests/CombineUITests/UIKit/ViewsTests/SearchBarTests.swift b/Tests/CombineUITests/UIKitTests/ViewsTests/SearchBarTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ViewsTests/SearchBarTests.swift
rename to Tests/CombineUITests/UIKitTests/ViewsTests/SearchBarTests.swift
diff --git a/Tests/CombineUITests/UIKit/ViewsTests/TextViewTests.swift b/Tests/CombineUITests/UIKitTests/ViewsTests/TextViewTests.swift
similarity index 100%
rename from Tests/CombineUITests/UIKit/ViewsTests/TextViewTests.swift
rename to Tests/CombineUITests/UIKitTests/ViewsTests/TextViewTests.swift