diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Data/Environment/EnvironmentValuesTests.swift b/Tests/OpenSwiftUICompatibilityTests/Data/Environment/EnvironmentValuesTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Data/Environment/EnvironmentValuesTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/Data/Environment/EnvironmentValuesTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Data/State/StateTests.swift b/Tests/OpenSwiftUICompatibilityTests/Data/State/StateTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Data/State/StateTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/Data/State/StateTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Graphics/Color/ColorResolvedTests.swift b/Tests/OpenSwiftUICompatibilityTests/Graphics/Color/ColorResolvedTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Graphics/Color/ColorResolvedTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/Graphics/Color/ColorResolvedTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Graphics/Color/ModifiedColorTests.swift b/Tests/OpenSwiftUICompatibilityTests/Graphics/Color/ModifiedColorTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Graphics/Color/ModifiedColorTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/Graphics/Color/ModifiedColorTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Graphics/Color/RGBColorSpaceTests.swift b/Tests/OpenSwiftUICompatibilityTests/Graphics/Color/RGBColorSpaceTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Graphics/Color/RGBColorSpaceTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/Graphics/Color/RGBColorSpaceTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUI/Integration/PlatformHostingControllerTests.swift b/Tests/OpenSwiftUICompatibilityTests/Integration/PlatformHostingControllerTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUI/Integration/PlatformHostingControllerTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/Integration/PlatformHostingControllerTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Layout/Geometry/AngleTests.swift b/Tests/OpenSwiftUICompatibilityTests/Layout/Geometry/AngleTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Layout/Geometry/AngleTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/Layout/Geometry/AngleTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Layout/Geometry/AxisTests.swift b/Tests/OpenSwiftUICompatibilityTests/Layout/Geometry/AxisTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Layout/Geometry/AxisTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/Layout/Geometry/AxisTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Modifier/ViewModifier/AppearanceActionModifierTests.swift b/Tests/OpenSwiftUICompatibilityTests/Modifier/ViewModifier/AppearanceActionModifierTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Modifier/ViewModifier/AppearanceActionModifierTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/Modifier/ViewModifier/AppearanceActionModifierTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/View/AnyViewTests.swift b/Tests/OpenSwiftUICompatibilityTests/View/AnyViewTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/View/AnyViewTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/View/AnyViewTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUI/View/Debug/ChangedBodyPropertyTests.swift b/Tests/OpenSwiftUICompatibilityTests/View/Debug/ChangedBodyPropertyTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUI/View/Debug/ChangedBodyPropertyTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/View/Debug/ChangedBodyPropertyTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/View/IdentifiedView/IdentifiedViewProxyTests.swift b/Tests/OpenSwiftUICompatibilityTests/View/IdentifiedView/IdentifiedViewProxyTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/View/IdentifiedView/IdentifiedViewProxyTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/View/IdentifiedView/IdentifiedViewProxyTests.swift
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/View/IdentifiedView/IdentifiedViewTreeTests.swift b/Tests/OpenSwiftUICompatibilityTests/View/IdentifiedView/IdentifiedViewTreeTests.swift
similarity index 100%
rename from Tests/OpenSwiftUICompatibilityTests/SwiftUICore/View/IdentifiedView/IdentifiedViewTreeTests.swift
rename to Tests/OpenSwiftUICompatibilityTests/View/IdentifiedView/IdentifiedViewTreeTests.swift