Merge r221218 - Rename TestWebKitAPI/Tests/WebKit2 to WebKit followin…

…g Source directory rename. Rubber-stamped by Brady Eidson. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/PlatformGTK.cmake: * TestWebKitAPI/PlatformWin.cmake: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebKit: Copied from TestWebKitAPI/Tests/WebKit2. * TestWebKitAPI/Tests/WebKit2: Removed. * TestWebKitAPI/Tests/WebKit2/18-characters.html: Removed. * TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/Ahem.ttf: Removed. * TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/CookieManager.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DeferredViewInWindowStateChange.mm: Removed. * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DidRemoveFrameFromHiearchyInPageCache.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DidRemoveFrameFromHiearchyInPageCache_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/EnvironmentUtilitiesTest.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/EventModifiers.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/Find.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/FindMatches.mm: Removed. * TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/FrameHandle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/Geolocation.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/GetUserMediaNavigation.mm: Removed. * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/LimitTitleSize.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/MediaStreamTrackDetached.mm: Removed. * TestWebKitAPI/Tests/WebKit2/MenuTypesForMouseEvents.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ModalAlertsSPI.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/NavigationClientDefaultCrypto.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/NetworkProcessCrashWithPendingConnection.mm: Removed. * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/PageGroup.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm: Removed. * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/PendingAPIRequestURL.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ProcessDidTerminate.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ProvisionalURLAfterWillSendRequestCallback.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ProvisionalURLAfterWillSendRequestCallback_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ResponsivenessTimer.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/RestoreSessionState.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/RestoreSessionStateWithoutNavigation.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ShouldKeepCurrentBackForwardListItemInList.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad_bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/UserMedia.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/UserMessage.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/UserMessage_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/ViewportSizeForViewportUnits.mm: Removed. * TestWebKitAPI/Tests/WebKit2/WKBackForwardList.mm: Removed. * TestWebKitAPI/Tests/WebKit2/WKBundleFileHandle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKBundleFileHandle_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKPageConfiguration.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKPageCopySessionStateWithFiltering.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKPageIsPlayingAudio.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKRetainPtr.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKString.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WKThumbnailView.mm: Removed. * TestWebKitAPI/Tests/WebKit2/WKURL.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WebArchive.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WebArchive_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WebCoreStatisticsWithNoWebProcess.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WillLoad.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/all-content-in-one-iframe.html: Removed. * TestWebKitAPI/Tests/WebKit2/associate-form-controls.html: Removed. * TestWebKitAPI/Tests/WebKit2/auto-submitting-form.html: Removed. * TestWebKitAPI/Tests/WebKit2/autoplay-check-frame.html: Removed. * TestWebKitAPI/Tests/WebKit2/autoplay-check-in-iframe.html: Removed. * TestWebKitAPI/Tests/WebKit2/autoplay-check.html: Removed. * TestWebKitAPI/Tests/WebKit2/autoplay-inherits-gesture-from-document.html: Removed. * TestWebKitAPI/Tests/WebKit2/autoplay-muted-with-controls.html: Removed. * TestWebKitAPI/Tests/WebKit2/autoplay-no-audio-check.html: Removed. * TestWebKitAPI/Tests/WebKit2/autoplay-with-controls.html: Removed. * TestWebKitAPI/Tests/WebKit2/autoplay-zero-volume-check.html: Removed. * TestWebKitAPI/Tests/WebKit2/bundle-file.html: Removed. * TestWebKitAPI/Tests/WebKit2/chinese-character-with-image.html: Removed. * TestWebKitAPI/Tests/WebKit2/close-from-within-create-page.html: Removed. * TestWebKitAPI/Tests/WebKit2/closed-shadow-tree-test.html: Removed. * TestWebKitAPI/Tests/WebKit2/cocoa: Removed. * TestWebKitAPI/Tests/WebKit2/cocoa/WeakObjCPtr.mm: Removed. * TestWebKitAPI/Tests/WebKit2/contentBlockerCheck.html: Removed. * TestWebKitAPI/Tests/WebKit2/custom-protocol-sync-xhr.html: Removed. * TestWebKitAPI/Tests/WebKit2/encrypted.pdf: Removed. * TestWebKitAPI/Tests/WebKit2/enumerateMediaDevices.html: Removed. * TestWebKitAPI/Tests/WebKit2/execCopy.html: Removed. * TestWebKitAPI/Tests/WebKit2/file-with-anchor.html: Removed. * TestWebKitAPI/Tests/WebKit2/file-with-mse.html: Removed. * TestWebKitAPI/Tests/WebKit2/file-with-video.html: Removed. * TestWebKitAPI/Tests/WebKit2/find.html: Removed. * TestWebKitAPI/Tests/WebKit2/findRanges.html: Removed. * TestWebKitAPI/Tests/WebKit2/geolocationGetCurrentPosition.html: Removed. * TestWebKitAPI/Tests/WebKit2/geolocationGetCurrentPositionWithHighAccuracy.html: Removed. * TestWebKitAPI/Tests/WebKit2/geolocationWatchPosition.html: Removed. * TestWebKitAPI/Tests/WebKit2/geolocationWatchPositionWithHighAccuracy.html: Removed. * TestWebKitAPI/Tests/WebKit2/getUserMedia.html: Removed. * TestWebKitAPI/Tests/WebKit2/gtk: Removed. * TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/icon.png: Removed. * TestWebKitAPI/Tests/WebKit2/input-focus-blur.html: Removed. * TestWebKitAPI/Tests/WebKit2/js-autoplay-audio.html: Removed. * TestWebKitAPI/Tests/WebKit2/js-play-with-controls.html: Removed. * TestWebKitAPI/Tests/WebKit2/large-red-square-image.html: Removed. * TestWebKitAPI/Tests/WebKit2/link-with-download-attribute-with-slashes.html: Removed. * TestWebKitAPI/Tests/WebKit2/link-with-download-attribute.html: Removed. * TestWebKitAPI/Tests/WebKit2/link-with-title.html: Removed. * TestWebKitAPI/Tests/WebKit2/lots-of-iframes.html: Removed. * TestWebKitAPI/Tests/WebKit2/lots-of-images.html: Removed. * TestWebKitAPI/Tests/WebKit2/lots-of-text-vertical-lr.html: Removed. * TestWebKitAPI/Tests/WebKit2/lots-of-text.html: Removed. * TestWebKitAPI/Tests/WebKit2/mac: Removed. * TestWebKitAPI/Tests/WebKit2/mac/AttributedSubstringForProposedRangeWithImage.mm: Removed. * TestWebKitAPI/Tests/WebKit2/mac/ContextMenuDownload.mm: Removed. * TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm: Removed. * TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm: Removed. * TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor_Bundle.mm: Removed. * TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/mac/InjectedBundleAppleEvent.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/mac/InjectedBundleAppleEvent_Bundle.cpp: Removed. * TestWebKitAPI/Tests/WebKit2/mac/RestoreStateAfterTermination.mm: Removed. * TestWebKitAPI/Tests/WebKit2/many-iframes.html: Removed. * TestWebKitAPI/Tests/WebKit2/mediastreamtrack-detached.html: Removed. * TestWebKitAPI/Tests/WebKit2/modal-alerts-in-new-about-blank-window.html: Removed. * TestWebKitAPI/Tests/WebKit2/mouse-button-listener.html: Removed. * TestWebKitAPI/Tests/WebKit2/mouse-move-listener.html: Removed. * TestWebKitAPI/Tests/WebKit2/navigation-client-default-crypto.html: Removed. * TestWebKitAPI/Tests/WebKit2/no-autoplay-with-controls.html: Removed. * TestWebKitAPI/Tests/WebKit2/open-and-close-window.html: Removed. * TestWebKitAPI/Tests/WebKit2/push-state.html: Removed. * TestWebKitAPI/Tests/WebKit2/set-long-title.html: Removed. * TestWebKitAPI/Tests/WebKit2/should-open-external-schemes.html: Removed. * TestWebKitAPI/Tests/WebKit2/simple-accelerated-compositing.html: Removed. * TestWebKitAPI/Tests/WebKit2/simple-form.html: Removed. * TestWebKitAPI/Tests/WebKit2/simple-iframe.html: Removed. * TestWebKitAPI/Tests/WebKit2/simple-tall.html: Removed. * TestWebKitAPI/Tests/WebKit2/simple.html: Removed. * TestWebKitAPI/Tests/WebKit2/simple2.html: Removed. * TestWebKitAPI/Tests/WebKit2/simple3.html: Removed. * TestWebKitAPI/Tests/WebKit2/spacebar-scrolling.html: Removed. * TestWebKitAPI/Tests/WebKit2/test-mse.mp4: Removed. * TestWebKitAPI/Tests/WebKit2/test-without-audio-track.mp4: Removed. * TestWebKitAPI/Tests/WebKit2/test.mp4: Removed. * TestWebKitAPI/Tests/WebKit2/test.pdf: Removed. * TestWebKitAPI/Tests/WebKit2/webfont.html: Removed.
WebKit · Sep 2, 2017 · 858edc9 · 858edc9
1 parent c45e209
commit 858edc9
Show file tree

Hide file tree

Showing 207 changed files with 302 additions and 84 deletions.
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt
@@ -128,30 +128,30 @@ if (ENABLE_WEBKIT)
         ${TESTWEBKITAPI_DIR}/InjectedBundleController.cpp
         ${TESTWEBKITAPI_DIR}/InjectedBundleMain.cpp
         ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/CanHandleRequest_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ParentFrame_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ProvisionalURLAfterWillSendRequestCallback_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/TextFieldDidBeginAndEndEditing_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMessage_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillLoad_Bundle.cpp
-        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DidAssociateFormControls_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionBasic_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionNoCache_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DocumentStartUserScriptAlertCrash_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/HitTestResultNodeHandle_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleBasic_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleFrameHitTest_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadCanceledNoServerRedirectCallback_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/MouseMoveAfterCrash_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayout_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ParentFrame_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ResponsivenessTimerDoesntFireEarly_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ShouldGoToBackForwardListItem_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/TextFieldDidBeginAndEndEditing_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/UserMessage_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WillLoad_Bundle.cpp
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WillSendSubmitEvent_Bundle.cpp
     )
 
     target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})

diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
@@ -69,57 +69,57 @@ list(APPEND TestJavaScriptCore_LIBRARIES
 )
 
 add_executable(TestWebKit2
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/AboutBlankLoad.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/CanHandleRequest.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/CookieManager.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionBasic.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionNoCache.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DownloadDecideDestinationCrash.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/EnumerateMediaDevices.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/EvaluateJavaScript.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/FailedLoad.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/Find.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ForceRepaint.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/FrameMIMETypeHTML.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/FrameMIMETypePNG.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/Geolocation.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/HitTestResultNodeHandle.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleBasic.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleFrameHitTest.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadPageOnCrash.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/MouseMoveAfterCrash.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PageLoadBasic.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ParentFrame.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PendingAPIRequestURL.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PreventEmptyUserAgent.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ProvisionalURLAfterWillSendRequestCallback.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ReloadPageAfterCrash.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ResizeWindowAfterCrash.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMedia.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMessage.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPageCopySessionStateWithFiltering.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPreferences.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKRetainPtr.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKString.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKStringJSString.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKURL.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/gtk/InputMethodFilter.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/AboutBlankLoad.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/CookieManager.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionBasic.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionNoCache.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/DownloadDecideDestinationCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/EnumerateMediaDevices.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/EvaluateJavaScript.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/FailedLoad.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/Find.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ForceRepaint.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/FrameMIMETypeHTML.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/FrameMIMETypePNG.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/Geolocation.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/HitTestResultNodeHandle.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleBasic.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleFrameHitTest.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadPageOnCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/MouseMoveAfterCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PageLoadBasic.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ParentFrame.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PendingAPIRequestURL.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PreventEmptyUserAgent.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ReloadPageAfterCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ResizeWindowAfterCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/RestoreSessionStateContainingFormData.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ShouldGoToBackForwardListItem.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/UserMedia.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/UserMessage.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WillSendSubmitEvent.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKPreferences.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKRetainPtr.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKString.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKStringJSString.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKURL.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit/gtk/InputMethodFilter.cpp
 )
 
 target_link_libraries(TestWebKit2 ${test_webkit2_api_LIBRARIES})

diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
@@ -148,8 +148,8 @@ set(test_webkit_LIBRARIES
 add_library(TestWebKitLib SHARED
     ${test_main_SOURCES}
     ${TESTWEBKITAPI_DIR}/TestsController.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit/win/ScaleWebView.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WebKit/win/WebViewDestruction.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKitLegacy/win/ScaleWebView.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKitLegacy/win/WebViewDestruction.cpp
     ${TESTWEBKITAPI_DIR}/win/HostWindow.cpp
 )
 

diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
@@ -1040,7 +1040,7 @@
 		1CAD1F851E5CE7DA00AF2C2C /* FontCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontCache.cpp; sourceTree = "<group>"; };
 		1CB9BC371A67482300FE5678 /* WeakPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WeakPtr.cpp; sourceTree = "<group>"; };
 		1CF0D3781BBF2F3D00B4EF54 /* WKRetainPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKRetainPtr.cpp; sourceTree = "<group>"; };
-		1F83571A1D3FFB0E00E3967B /* WKBackForwardList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKBackForwardList.mm; path = Tests/WebKit2/WKBackForwardList.mm; sourceTree = SOURCE_ROOT; };
+		1F83571A1D3FFB0E00E3967B /* WKBackForwardList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKBackForwardList.mm; path = Tests/WebKit/WKBackForwardList.mm; sourceTree = SOURCE_ROOT; };
 		260BA5781B1D2E7B004FA07C /* DFACombiner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DFACombiner.cpp; sourceTree = "<group>"; };
 		260BA57A1B1D2EE2004FA07C /* DFAHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DFAHelpers.h; sourceTree = "<group>"; };
 		261516D515B0E60500A2C201 /* SetAndUpdateCacheModel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SetAndUpdateCacheModel.mm; sourceTree = "<group>"; };
@@ -1071,12 +1071,12 @@
 		29AB8AA2164C7A9300D49BEC /* TestBrowsingContextLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestBrowsingContextLoadDelegate.mm; sourceTree = "<group>"; };
 		29AB8AA3164C7A9300D49BEC /* TestBrowsingContextLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestBrowsingContextLoadDelegate.h; sourceTree = "<group>"; };
 		2D00065D1C1F58940088E6A7 /* WKPDFViewResizeCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPDFViewResizeCrash.mm; sourceTree = "<group>"; };
-		2D1646E11D1862CD00015A1A /* DeferredViewInWindowStateChange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DeferredViewInWindowStateChange.mm; path = WebKit2/DeferredViewInWindowStateChange.mm; sourceTree = "<group>"; };
+		2D1646E11D1862CD00015A1A /* DeferredViewInWindowStateChange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DeferredViewInWindowStateChange.mm; path = WebKit/DeferredViewInWindowStateChange.mm; sourceTree = "<group>"; };
 		2D1C04A51D76298B000A6816 /* TestNavigationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestNavigationDelegate.h; path = cocoa/TestNavigationDelegate.h; sourceTree = "<group>"; };
 		2D1C04A61D76298B000A6816 /* TestNavigationDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TestNavigationDelegate.mm; path = cocoa/TestNavigationDelegate.mm; sourceTree = "<group>"; };
 		2D1FE0AF1AD465C1006CD9E6 /* FixedLayoutSize.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FixedLayoutSize.mm; sourceTree = "<group>"; };
 		2D21FE581F04642800B58E7D /* WKPDFViewStablePresentationUpdateCallback.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPDFViewStablePresentationUpdateCallback.mm; sourceTree = "<group>"; };
-		2D4CF8BC1D8360CC0001CE8D /* WKThumbnailView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKThumbnailView.mm; path = WebKit2/WKThumbnailView.mm; sourceTree = "<group>"; };
+		2D4CF8BC1D8360CC0001CE8D /* WKThumbnailView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKThumbnailView.mm; path = WebKit/WKThumbnailView.mm; sourceTree = "<group>"; };
 		2D51A0C51C8BF00400765C45 /* DOMHTMLVideoElementWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLVideoElementWrapper.mm; sourceTree = "<group>"; };
 		2D640B5417875DFF00BFAF99 /* ScrollPinningBehaviors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollPinningBehaviors.cpp; sourceTree = "<group>"; };
 		2D8104CB1BEC13E70020DA46 /* FindInPage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FindInPage.mm; sourceTree = "<group>"; };
@@ -1431,7 +1431,7 @@
 		9984FACD1CFFB038008D198C /* editable-body.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "editable-body.html"; sourceTree = "<group>"; };
 		9B0786A21C58830F00D159E3 /* InjectedBundleMakeAllShadowRootsOpen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleMakeAllShadowRootsOpen.cpp; sourceTree = "<group>"; };
 		9B0786A41C5885C300D159E3 /* InjectedBundleMakeAllShadowRootsOpen_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleMakeAllShadowRootsOpen_Bundle.cpp; sourceTree = "<group>"; };
-		9B19CD9E1F06DFE3000548DD /* NetworkProcessCrashWithPendingConnection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessCrashWithPendingConnection.mm; path = WebKit2/NetworkProcessCrashWithPendingConnection.mm; sourceTree = "<group>"; };
+		9B19CD9E1F06DFE3000548DD /* NetworkProcessCrashWithPendingConnection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessCrashWithPendingConnection.mm; path = WebKit/NetworkProcessCrashWithPendingConnection.mm; sourceTree = "<group>"; };
 		9B26FC6B159D061000CC3765 /* HTMLFormCollectionNamedItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HTMLFormCollectionNamedItem.mm; sourceTree = "<group>"; };
 		9B26FCB4159D15E700CC3765 /* HTMLFormCollectionNamedItem.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = HTMLFormCollectionNamedItem.html; sourceTree = "<group>"; };
 		9B270FED1DDC25FD002D53F3 /* closed-shadow-tree-test.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "closed-shadow-tree-test.html"; sourceTree = "<group>"; };
@@ -2266,7 +2266,7 @@
 			path = Configurations;
 			sourceTree = "<group>";
 		};
-		BC9096411255616000083756 /* WebKit2 */ = {
+		BC9096411255616000083756 /* WebKit */ = {
 			isa = PBXGroup;
 			children = (
 				0F139E741A423A4600F590F5 /* cocoa */,
@@ -2389,7 +2389,7 @@
 				BC90995D12567BC100083756 /* WKString.cpp */,
 				BC9099931256ACF100083756 /* WKStringJSString.cpp */,
 			);
-			path = WebKit2;
+			path = WebKit;
 			sourceTree = "<group>";
 		};
 		BC9096461255618900083756 /* WTF */ = {
@@ -2569,7 +2569,7 @@
 				C08587F913FEC39B001EF4E5 /* TestWebKitAPI */,
 				440A1D3614A01000008A66F2 /* WebCore */,
 				CDC8E4981BC728AE00594FEC /* WebKitLegacy */,
-				BC9096411255616000083756 /* WebKit2 */,
+				BC9096411255616000083756 /* WebKit */,
 				1ABC3DEC1899BE55004F0626 /* WebKit2 Cocoa */,
 				BC3C4C6F14575B1D0025FB62 /* WebKit2 Objective-C */,
 				BC9096461255618900083756 /* WTF */,

diff --git a/...ebKitAPI/Tests/WebKit2/18-characters.html → ...WebKitAPI/Tests/WebKit/18-characters.html b/...ebKitAPI/Tests/WebKit2/18-characters.html → ...WebKitAPI/Tests/WebKit/18-characters.html
diff --git a/...ebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp → ...WebKitAPI/Tests/WebKit/AboutBlankLoad.cpp b/...ebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp → ...WebKitAPI/Tests/WebKit/AboutBlankLoad.cpp
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/Ahem.ttf → Tools/TestWebKitAPI/Tests/WebKit/Ahem.ttf b/Tools/TestWebKitAPI/Tests/WebKit2/Ahem.ttf → Tools/TestWebKitAPI/Tests/WebKit/Ahem.ttf
diff --git a/...KitAPI/Tests/WebKit2/CanHandleRequest.cpp → ...bKitAPI/Tests/WebKit/CanHandleRequest.cpp b/...KitAPI/Tests/WebKit2/CanHandleRequest.cpp → ...bKitAPI/Tests/WebKit/CanHandleRequest.cpp
diff --git a/...Tests/WebKit2/CanHandleRequest_Bundle.cpp → .../Tests/WebKit/CanHandleRequest_Bundle.cpp b/...Tests/WebKit2/CanHandleRequest_Bundle.cpp → .../Tests/WebKit/CanHandleRequest_Bundle.cpp
diff --git a/...sts/WebKit2/CloseFromWithinCreatePage.cpp → ...ests/WebKit/CloseFromWithinCreatePage.cpp b/...sts/WebKit2/CloseFromWithinCreatePage.cpp → ...ests/WebKit/CloseFromWithinCreatePage.cpp
diff --git a/...tAPI/Tests/WebKit2/CloseThenTerminate.cpp → ...itAPI/Tests/WebKit/CloseThenTerminate.cpp b/...tAPI/Tests/WebKit2/CloseThenTerminate.cpp → ...itAPI/Tests/WebKit/CloseThenTerminate.cpp
diff --git a/...WebKitAPI/Tests/WebKit2/CookieManager.cpp → ...tWebKitAPI/Tests/WebKit/CookieManager.cpp b/...WebKitAPI/Tests/WebKit2/CookieManager.cpp → ...tWebKitAPI/Tests/WebKit/CookieManager.cpp
diff --git a/...Tests/WebKit2/DOMWindowExtensionBasic.cpp → .../Tests/WebKit/DOMWindowExtensionBasic.cpp b/...Tests/WebKit2/DOMWindowExtensionBasic.cpp → .../Tests/WebKit/DOMWindowExtensionBasic.cpp
diff --git a/...ebKit2/DOMWindowExtensionBasic_Bundle.cpp → ...WebKit/DOMWindowExtensionBasic_Bundle.cpp b/...ebKit2/DOMWindowExtensionBasic_Bundle.cpp → ...WebKit/DOMWindowExtensionBasic_Bundle.cpp
diff --git a/...sts/WebKit2/DOMWindowExtensionNoCache.cpp → ...ests/WebKit/DOMWindowExtensionNoCache.cpp b/...sts/WebKit2/DOMWindowExtensionNoCache.cpp → ...ests/WebKit/DOMWindowExtensionNoCache.cpp
diff --git a/...Kit2/DOMWindowExtensionNoCache_Bundle.cpp → ...bKit/DOMWindowExtensionNoCache_Bundle.cpp b/...Kit2/DOMWindowExtensionNoCache_Bundle.cpp → ...bKit/DOMWindowExtensionNoCache_Bundle.cpp
diff --git a/...ebKit2/DeferredViewInWindowStateChange.mm → ...WebKit/DeferredViewInWindowStateChange.mm b/...ebKit2/DeferredViewInWindowStateChange.mm → ...WebKit/DeferredViewInWindowStateChange.mm
diff --git a/...ests/WebKit2/DidAssociateFormControls.cpp → ...Tests/WebKit/DidAssociateFormControls.cpp b/...ests/WebKit2/DidAssociateFormControls.cpp → ...Tests/WebKit/DidAssociateFormControls.cpp
diff --git a/...bKit2/DidAssociateFormControls_Bundle.cpp → ...ebKit/DidAssociateFormControls_Bundle.cpp b/...bKit2/DidAssociateFormControls_Bundle.cpp → ...ebKit/DidAssociateFormControls_Bundle.cpp
diff --git a/...API/Tests/WebKit2/DidNotHandleKeyDown.cpp → ...tAPI/Tests/WebKit/DidNotHandleKeyDown.cpp b/...API/Tests/WebKit2/DidNotHandleKeyDown.cpp → ...tAPI/Tests/WebKit/DidNotHandleKeyDown.cpp
diff --git a/...DidRemoveFrameFromHiearchyInPageCache.cpp → ...DidRemoveFrameFromHiearchyInPageCache.cpp b/...DidRemoveFrameFromHiearchyInPageCache.cpp → ...DidRemoveFrameFromHiearchyInPageCache.cpp
diff --git a/...veFrameFromHiearchyInPageCache_Bundle.cpp → ...veFrameFromHiearchyInPageCache_Bundle.cpp b/...veFrameFromHiearchyInPageCache_Bundle.cpp → ...veFrameFromHiearchyInPageCache_Bundle.cpp
diff --git a/...it2/DocumentStartUserScriptAlertCrash.cpp → ...Kit/DocumentStartUserScriptAlertCrash.cpp b/...it2/DocumentStartUserScriptAlertCrash.cpp → ...Kit/DocumentStartUserScriptAlertCrash.cpp
diff --git a/...umentStartUserScriptAlertCrash_Bundle.cpp → ...umentStartUserScriptAlertCrash_Bundle.cpp b/...umentStartUserScriptAlertCrash_Bundle.cpp → ...umentStartUserScriptAlertCrash_Bundle.cpp
diff --git a/...ebKit2/DownloadDecideDestinationCrash.cpp → ...WebKit/DownloadDecideDestinationCrash.cpp b/...ebKit2/DownloadDecideDestinationCrash.cpp → ...WebKit/DownloadDecideDestinationCrash.cpp
diff --git a/...I/Tests/WebKit2/EnumerateMediaDevices.cpp → ...PI/Tests/WebKit/EnumerateMediaDevices.cpp b/...I/Tests/WebKit2/EnumerateMediaDevices.cpp → ...PI/Tests/WebKit/EnumerateMediaDevices.cpp
diff --git a/...ests/WebKit2/EnvironmentUtilitiesTest.cpp → ...Tests/WebKit/EnvironmentUtilitiesTest.cpp b/...ests/WebKit2/EnvironmentUtilitiesTest.cpp → ...Tests/WebKit/EnvironmentUtilitiesTest.cpp
diff --git a/...eralSessionPushStateNoHistoryCallback.cpp → ...eralSessionPushStateNoHistoryCallback.cpp b/...eralSessionPushStateNoHistoryCallback.cpp → ...eralSessionPushStateNoHistoryCallback.cpp
diff --git a/...tAPI/Tests/WebKit2/EvaluateJavaScript.cpp → ...itAPI/Tests/WebKit/EvaluateJavaScript.cpp b/...tAPI/Tests/WebKit2/EvaluateJavaScript.cpp → ...itAPI/Tests/WebKit/EvaluateJavaScript.cpp
diff --git a/...ebKitAPI/Tests/WebKit2/EventModifiers.cpp → ...WebKitAPI/Tests/WebKit/EventModifiers.cpp b/...ebKitAPI/Tests/WebKit2/EventModifiers.cpp → ...WebKitAPI/Tests/WebKit/EventModifiers.cpp
diff --git a/...estWebKitAPI/Tests/WebKit2/FailedLoad.cpp → ...TestWebKitAPI/Tests/WebKit/FailedLoad.cpp b/...estWebKitAPI/Tests/WebKit2/FailedLoad.cpp → ...TestWebKitAPI/Tests/WebKit/FailedLoad.cpp
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp → Tools/TestWebKitAPI/Tests/WebKit/Find.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp → Tools/TestWebKitAPI/Tests/WebKit/Find.cpp
diff --git a/...estWebKitAPI/Tests/WebKit2/FindMatches.mm → ...TestWebKitAPI/Tests/WebKit/FindMatches.mm b/...estWebKitAPI/Tests/WebKit2/FindMatches.mm → ...TestWebKitAPI/Tests/WebKit/FindMatches.mm
diff --git a/...tWebKitAPI/Tests/WebKit2/ForceRepaint.cpp → ...stWebKitAPI/Tests/WebKit/ForceRepaint.cpp b/...tWebKitAPI/Tests/WebKit2/ForceRepaint.cpp → ...stWebKitAPI/Tests/WebKit/ForceRepaint.cpp
diff --git a/...stWebKitAPI/Tests/WebKit2/FrameHandle.cpp → ...estWebKitAPI/Tests/WebKit/FrameHandle.cpp b/...stWebKitAPI/Tests/WebKit2/FrameHandle.cpp → ...estWebKitAPI/Tests/WebKit/FrameHandle.cpp
diff --git a/...itAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp → ...KitAPI/Tests/WebKit/FrameMIMETypeHTML.cpp b/...itAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp → ...KitAPI/Tests/WebKit/FrameMIMETypeHTML.cpp
diff --git a/...KitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp → ...bKitAPI/Tests/WebKit/FrameMIMETypePNG.cpp b/...KitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp → ...bKitAPI/Tests/WebKit/FrameMIMETypePNG.cpp
diff --git a/...stWebKitAPI/Tests/WebKit2/Geolocation.cpp → ...estWebKitAPI/Tests/WebKit/Geolocation.cpp b/...stWebKitAPI/Tests/WebKit2/Geolocation.cpp → ...estWebKitAPI/Tests/WebKit/Geolocation.cpp
diff --git a/...dBundleInitializationUserDataCallback.cpp → ...dBundleInitializationUserDataCallback.cpp b/...dBundleInitializationUserDataCallback.cpp → ...dBundleInitializationUserDataCallback.cpp
diff --git a/...InitializationUserDataCallback_Bundle.cpp → ...InitializationUserDataCallback_Bundle.cpp b/...InitializationUserDataCallback_Bundle.cpp → ...InitializationUserDataCallback_Bundle.cpp
diff --git a/...I/Tests/WebKit2/GetUserMediaNavigation.mm → ...PI/Tests/WebKit/GetUserMediaNavigation.mm b/...I/Tests/WebKit2/GetUserMediaNavigation.mm → ...PI/Tests/WebKit/GetUserMediaNavigation.mm
diff --git a/...Tests/WebKit2/HitTestResultNodeHandle.cpp → .../Tests/WebKit/HitTestResultNodeHandle.cpp b/...Tests/WebKit2/HitTestResultNodeHandle.cpp → .../Tests/WebKit/HitTestResultNodeHandle.cpp
diff --git a/...ebKit2/HitTestResultNodeHandle_Bundle.cpp → ...WebKit/HitTestResultNodeHandle_Bundle.cpp b/...ebKit2/HitTestResultNodeHandle_Bundle.cpp → ...WebKit/HitTestResultNodeHandle_Bundle.cpp
diff --git a/...API/Tests/WebKit2/InjectedBundleBasic.cpp → ...tAPI/Tests/WebKit/InjectedBundleBasic.cpp b/...API/Tests/WebKit2/InjectedBundleBasic.cpp → ...tAPI/Tests/WebKit/InjectedBundleBasic.cpp
diff --git a/...ts/WebKit2/InjectedBundleBasic_Bundle.cpp → ...sts/WebKit/InjectedBundleBasic_Bundle.cpp b/...ts/WebKit2/InjectedBundleBasic_Bundle.cpp → ...sts/WebKit/InjectedBundleBasic_Bundle.cpp
diff --git a/...ts/WebKit2/InjectedBundleFrameHitTest.cpp → ...sts/WebKit/InjectedBundleFrameHitTest.cpp b/...ts/WebKit2/InjectedBundleFrameHitTest.cpp → ...sts/WebKit/InjectedBundleFrameHitTest.cpp
diff --git a/...it2/InjectedBundleFrameHitTest_Bundle.cpp → ...Kit/InjectedBundleFrameHitTest_Bundle.cpp b/...it2/InjectedBundleFrameHitTest_Bundle.cpp → ...Kit/InjectedBundleFrameHitTest_Bundle.cpp
diff --git a/...dleInitializationUserDataCallbackWins.cpp → ...dleInitializationUserDataCallbackWins.cpp b/...dleInitializationUserDataCallbackWins.cpp → ...dleInitializationUserDataCallbackWins.cpp
diff --git a/...ializationUserDataCallbackWins_Bundle.cpp → ...ializationUserDataCallbackWins_Bundle.cpp b/...ializationUserDataCallbackWins_Bundle.cpp → ...ializationUserDataCallbackWins_Bundle.cpp
diff --git a/.../InjectedBundleMakeAllShadowRootsOpen.cpp → .../InjectedBundleMakeAllShadowRootsOpen.cpp b/.../InjectedBundleMakeAllShadowRootsOpen.cpp → .../InjectedBundleMakeAllShadowRootsOpen.cpp
diff --git a/...edBundleMakeAllShadowRootsOpen_Bundle.cpp → ...edBundleMakeAllShadowRootsOpen_Bundle.cpp b/...edBundleMakeAllShadowRootsOpen_Bundle.cpp → ...edBundleMakeAllShadowRootsOpen_Bundle.cpp
diff --git a/...LayoutMilestonesWithAllContentInFrame.cpp → ...LayoutMilestonesWithAllContentInFrame.cpp b/...LayoutMilestonesWithAllContentInFrame.cpp → ...LayoutMilestonesWithAllContentInFrame.cpp
diff --git a/...ebKitAPI/Tests/WebKit2/LimitTitleSize.cpp → ...WebKitAPI/Tests/WebKit/LimitTitleSize.cpp b/...ebKitAPI/Tests/WebKit2/LimitTitleSize.cpp → ...WebKitAPI/Tests/WebKit/LimitTitleSize.cpp
diff --git a/...lternateHTMLStringWithNonDirectoryURL.cpp → ...lternateHTMLStringWithNonDirectoryURL.cpp b/...lternateHTMLStringWithNonDirectoryURL.cpp → ...lternateHTMLStringWithNonDirectoryURL.cpp
diff --git a/.../LoadCanceledNoServerRedirectCallback.cpp → .../LoadCanceledNoServerRedirectCallback.cpp b/.../LoadCanceledNoServerRedirectCallback.cpp → .../LoadCanceledNoServerRedirectCallback.cpp
diff --git a/...nceledNoServerRedirectCallback_Bundle.cpp → ...nceledNoServerRedirectCallback_Bundle.cpp b/...nceledNoServerRedirectCallback_Bundle.cpp → ...nceledNoServerRedirectCallback_Bundle.cpp
diff --git a/...bKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp → ...ebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp b/...bKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp → ...ebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp
diff --git a/...Tests/WebKit2/MediaStreamTrackDetached.mm → .../Tests/WebKit/MediaStreamTrackDetached.mm b/...Tests/WebKit2/MediaStreamTrackDetached.mm → .../Tests/WebKit/MediaStreamTrackDetached.mm
diff --git a/...Tests/WebKit2/MenuTypesForMouseEvents.cpp → .../Tests/WebKit/MenuTypesForMouseEvents.cpp b/...Tests/WebKit2/MenuTypesForMouseEvents.cpp → .../Tests/WebKit/MenuTypesForMouseEvents.cpp
diff --git a/...ebKitAPI/Tests/WebKit2/ModalAlertsSPI.cpp → ...WebKitAPI/Tests/WebKit/ModalAlertsSPI.cpp b/...ebKitAPI/Tests/WebKit2/ModalAlertsSPI.cpp → ...WebKitAPI/Tests/WebKit/ModalAlertsSPI.cpp
diff --git a/...API/Tests/WebKit2/MouseMoveAfterCrash.cpp → ...tAPI/Tests/WebKit/MouseMoveAfterCrash.cpp b/...API/Tests/WebKit2/MouseMoveAfterCrash.cpp → ...tAPI/Tests/WebKit/MouseMoveAfterCrash.cpp
diff --git a/...ts/WebKit2/MouseMoveAfterCrash_Bundle.cpp → ...sts/WebKit/MouseMoveAfterCrash_Bundle.cpp b/...ts/WebKit2/MouseMoveAfterCrash_Bundle.cpp → ...sts/WebKit/MouseMoveAfterCrash_Bundle.cpp
diff --git a/...WebKit2/NavigationClientDefaultCrypto.cpp → .../WebKit/NavigationClientDefaultCrypto.cpp b/...WebKit2/NavigationClientDefaultCrypto.cpp → .../WebKit/NavigationClientDefaultCrypto.cpp
diff --git a/...tworkProcessCrashWithPendingConnection.mm → ...tworkProcessCrashWithPendingConnection.mm b/...tworkProcessCrashWithPendingConnection.mm → ...tworkProcessCrashWithPendingConnection.mm
diff --git a/...ebKit2/NewFirstVisuallyNonEmptyLayout.cpp → ...WebKit/NewFirstVisuallyNonEmptyLayout.cpp b/...ebKit2/NewFirstVisuallyNonEmptyLayout.cpp → ...WebKit/NewFirstVisuallyNonEmptyLayout.cpp
diff --git a/...2/NewFirstVisuallyNonEmptyLayoutFails.cpp → ...t/NewFirstVisuallyNonEmptyLayoutFails.cpp b/...2/NewFirstVisuallyNonEmptyLayoutFails.cpp → ...t/NewFirstVisuallyNonEmptyLayoutFails.cpp
diff --git a/...rstVisuallyNonEmptyLayoutFails_Bundle.cpp → ...rstVisuallyNonEmptyLayoutFails_Bundle.cpp b/...rstVisuallyNonEmptyLayoutFails_Bundle.cpp → ...rstVisuallyNonEmptyLayoutFails_Bundle.cpp
diff --git a/...wFirstVisuallyNonEmptyLayoutForImages.cpp → ...wFirstVisuallyNonEmptyLayoutForImages.cpp b/...wFirstVisuallyNonEmptyLayoutForImages.cpp → ...wFirstVisuallyNonEmptyLayoutForImages.cpp
diff --git a/...isuallyNonEmptyLayoutForImages_Bundle.cpp → ...isuallyNonEmptyLayoutForImages_Bundle.cpp b/...isuallyNonEmptyLayoutForImages_Bundle.cpp → ...isuallyNonEmptyLayoutForImages_Bundle.cpp
diff --git a/.../NewFirstVisuallyNonEmptyLayoutFrames.cpp → .../NewFirstVisuallyNonEmptyLayoutFrames.cpp b/.../NewFirstVisuallyNonEmptyLayoutFrames.cpp → .../NewFirstVisuallyNonEmptyLayoutFrames.cpp
diff --git a/...stVisuallyNonEmptyLayoutFrames_Bundle.cpp → ...stVisuallyNonEmptyLayoutFrames_Bundle.cpp b/...stVisuallyNonEmptyLayoutFrames_Bundle.cpp → ...stVisuallyNonEmptyLayoutFrames_Bundle.cpp
diff --git a/...NewFirstVisuallyNonEmptyLayout_Bundle.cpp → ...NewFirstVisuallyNonEmptyLayout_Bundle.cpp b/...NewFirstVisuallyNonEmptyLayout_Bundle.cpp → ...NewFirstVisuallyNonEmptyLayout_Bundle.cpp
diff --git a/...TestWebKitAPI/Tests/WebKit2/PageGroup.cpp → .../TestWebKitAPI/Tests/WebKit/PageGroup.cpp b/...TestWebKitAPI/Tests/WebKit2/PageGroup.cpp → .../TestWebKitAPI/Tests/WebKit/PageGroup.cpp
diff --git a/...WebKitAPI/Tests/WebKit2/PageLoadBasic.cpp → ...tWebKitAPI/Tests/WebKit/PageLoadBasic.cpp b/...WebKitAPI/Tests/WebKit2/PageLoadBasic.cpp → ...tWebKitAPI/Tests/WebKit/PageLoadBasic.cpp
diff --git a/...adDidChangeLocationWithinPageForFrame.cpp → ...adDidChangeLocationWithinPageForFrame.cpp b/...adDidChangeLocationWithinPageForFrame.cpp → ...adDidChangeLocationWithinPageForFrame.cpp
diff --git a/...stWebKitAPI/Tests/WebKit2/ParentFrame.cpp → ...estWebKitAPI/Tests/WebKit/ParentFrame.cpp b/...stWebKitAPI/Tests/WebKit2/ParentFrame.cpp → ...estWebKitAPI/Tests/WebKit/ParentFrame.cpp
diff --git a/...tAPI/Tests/WebKit2/ParentFrame_Bundle.cpp → ...itAPI/Tests/WebKit/ParentFrame_Bundle.cpp b/...tAPI/Tests/WebKit2/ParentFrame_Bundle.cpp → ...itAPI/Tests/WebKit/ParentFrame_Bundle.cpp
diff --git a/.../Tests/WebKit2/PasteboardNotifications.mm → ...I/Tests/WebKit/PasteboardNotifications.mm b/.../Tests/WebKit2/PasteboardNotifications.mm → ...I/Tests/WebKit/PasteboardNotifications.mm
diff --git a/...ebKit2/PasteboardNotifications_Bundle.cpp → ...WebKit/PasteboardNotifications_Bundle.cpp b/...ebKit2/PasteboardNotifications_Bundle.cpp → ...WebKit/PasteboardNotifications_Bundle.cpp
diff --git a/...PI/Tests/WebKit2/PendingAPIRequestURL.cpp → ...API/Tests/WebKit/PendingAPIRequestURL.cpp b/...PI/Tests/WebKit2/PendingAPIRequestURL.cpp → ...API/Tests/WebKit/PendingAPIRequestURL.cpp
diff --git a/...I/Tests/WebKit2/PreventEmptyUserAgent.cpp → ...PI/Tests/WebKit/PreventEmptyUserAgent.cpp b/...I/Tests/WebKit2/PreventEmptyUserAgent.cpp → ...PI/Tests/WebKit/PreventEmptyUserAgent.cpp
diff --git a/...ateBrowsingPushStateNoHistoryCallback.cpp → ...ateBrowsingPushStateNoHistoryCallback.cpp b/...ateBrowsingPushStateNoHistoryCallback.cpp → ...ateBrowsingPushStateNoHistoryCallback.cpp
diff --git a/...API/Tests/WebKit2/ProcessDidTerminate.cpp → ...tAPI/Tests/WebKit/ProcessDidTerminate.cpp b/...API/Tests/WebKit2/ProcessDidTerminate.cpp → ...tAPI/Tests/WebKit/ProcessDidTerminate.cpp
diff --git a/...sionalURLAfterWillSendRequestCallback.cpp → ...sionalURLAfterWillSendRequestCallback.cpp b/...sionalURLAfterWillSendRequestCallback.cpp → ...sionalURLAfterWillSendRequestCallback.cpp
diff --git a/...RLAfterWillSendRequestCallback_Bundle.cpp → ...RLAfterWillSendRequestCallback_Bundle.cpp b/...RLAfterWillSendRequestCallback_Bundle.cpp → ...RLAfterWillSendRequestCallback_Bundle.cpp
diff --git a/...PI/Tests/WebKit2/ReloadPageAfterCrash.cpp → ...API/Tests/WebKit/ReloadPageAfterCrash.cpp b/...PI/Tests/WebKit2/ReloadPageAfterCrash.cpp → ...API/Tests/WebKit/ReloadPageAfterCrash.cpp
diff --git a/...WebKit2/ResizeReversePaginatedWebView.cpp → .../WebKit/ResizeReversePaginatedWebView.cpp b/...WebKit2/ResizeReversePaginatedWebView.cpp → .../WebKit/ResizeReversePaginatedWebView.cpp
diff --git a/.../Tests/WebKit2/ResizeWindowAfterCrash.cpp → ...I/Tests/WebKit/ResizeWindowAfterCrash.cpp b/.../Tests/WebKit2/ResizeWindowAfterCrash.cpp → ...I/Tests/WebKit/ResizeWindowAfterCrash.cpp
diff --git a/...API/Tests/WebKit2/ResponsivenessTimer.cpp → ...tAPI/Tests/WebKit/ResponsivenessTimer.cpp b/...API/Tests/WebKit2/ResponsivenessTimer.cpp → ...tAPI/Tests/WebKit/ResponsivenessTimer.cpp
diff --git a/...t2/ResponsivenessTimerDoesntFireEarly.cpp → ...it/ResponsivenessTimerDoesntFireEarly.cpp b/...t2/ResponsivenessTimerDoesntFireEarly.cpp → ...it/ResponsivenessTimerDoesntFireEarly.cpp
diff --git a/...onsivenessTimerDoesntFireEarly_Bundle.cpp → ...onsivenessTimerDoesntFireEarly_Bundle.cpp b/...onsivenessTimerDoesntFireEarly_Bundle.cpp → ...onsivenessTimerDoesntFireEarly_Bundle.cpp
diff --git a/...API/Tests/WebKit2/RestoreSessionState.cpp → ...tAPI/Tests/WebKit/RestoreSessionState.cpp b/...API/Tests/WebKit2/RestoreSessionState.cpp → ...tAPI/Tests/WebKit/RestoreSessionState.cpp
diff --git a/...RestoreSessionStateContainingFormData.cpp → ...RestoreSessionStateContainingFormData.cpp b/...RestoreSessionStateContainingFormData.cpp → ...RestoreSessionStateContainingFormData.cpp
diff --git a/.../RestoreSessionStateWithoutNavigation.cpp → .../RestoreSessionStateWithoutNavigation.cpp b/.../RestoreSessionStateWithoutNavigation.cpp → .../RestoreSessionStateWithoutNavigation.cpp
diff --git a/.../Tests/WebKit2/ScrollPinningBehaviors.cpp → ...I/Tests/WebKit/ScrollPinningBehaviors.cpp b/.../Tests/WebKit2/ScrollPinningBehaviors.cpp → ...I/Tests/WebKit/ScrollPinningBehaviors.cpp
diff --git a/...WebKit2/ShouldGoToBackForwardListItem.cpp → .../WebKit/ShouldGoToBackForwardListItem.cpp b/...WebKit2/ShouldGoToBackForwardListItem.cpp → .../WebKit/ShouldGoToBackForwardListItem.cpp
diff --git a/.../ShouldGoToBackForwardListItem_Bundle.cpp → .../ShouldGoToBackForwardListItem_Bundle.cpp b/.../ShouldGoToBackForwardListItem_Bundle.cpp → .../ShouldGoToBackForwardListItem_Bundle.cpp
diff --git a/...dKeepCurrentBackForwardListItemInList.cpp → ...dKeepCurrentBackForwardListItemInList.cpp b/...dKeepCurrentBackForwardListItemInList.cpp → ...dKeepCurrentBackForwardListItemInList.cpp
diff --git a/...itAPI/Tests/WebKit2/SpacebarScrolling.cpp → ...KitAPI/Tests/WebKit/SpacebarScrolling.cpp b/...itAPI/Tests/WebKit2/SpacebarScrolling.cpp → ...KitAPI/Tests/WebKit/SpacebarScrolling.cpp
diff --git a/...opLoadingDuringDidFailProvisionalLoad.cpp → ...opLoadingDuringDidFailProvisionalLoad.cpp b/...opLoadingDuringDidFailProvisionalLoad.cpp → ...opLoadingDuringDidFailProvisionalLoad.cpp
diff --git a/...ngDuringDidFailProvisionalLoad_bundle.cpp → ...ngDuringDidFailProvisionalLoad_bundle.cpp b/...ngDuringDidFailProvisionalLoad_bundle.cpp → ...ngDuringDidFailProvisionalLoad_bundle.cpp
diff --git a/...ebKitAPI/Tests/WebKit2/TerminateTwice.cpp → ...WebKitAPI/Tests/WebKit/TerminateTwice.cpp b/...ebKitAPI/Tests/WebKit2/TerminateTwice.cpp → ...WebKitAPI/Tests/WebKit/TerminateTwice.cpp
diff --git a/...ebKit2/TextFieldDidBeginAndEndEditing.cpp → ...WebKit/TextFieldDidBeginAndEndEditing.cpp b/...ebKit2/TextFieldDidBeginAndEndEditing.cpp → ...WebKit/TextFieldDidBeginAndEndEditing.cpp
diff --git a/...TextFieldDidBeginAndEndEditing_Bundle.cpp → ...TextFieldDidBeginAndEndEditing_Bundle.cpp b/...TextFieldDidBeginAndEndEditing_Bundle.cpp → ...TextFieldDidBeginAndEndEditing_Bundle.cpp
diff --git a/...TestWebKitAPI/Tests/WebKit2/UserMedia.cpp → .../TestWebKitAPI/Tests/WebKit/UserMedia.cpp b/...TestWebKitAPI/Tests/WebKit2/UserMedia.cpp → .../TestWebKitAPI/Tests/WebKit/UserMedia.cpp
diff --git a/...stWebKitAPI/Tests/WebKit2/UserMessage.cpp → ...estWebKitAPI/Tests/WebKit/UserMessage.cpp b/...stWebKitAPI/Tests/WebKit2/UserMessage.cpp → ...estWebKitAPI/Tests/WebKit/UserMessage.cpp
diff --git a/...tAPI/Tests/WebKit2/UserMessage_Bundle.cpp → ...itAPI/Tests/WebKit/UserMessage_Bundle.cpp b/...tAPI/Tests/WebKit2/UserMessage_Bundle.cpp → ...itAPI/Tests/WebKit/UserMessage_Bundle.cpp
diff --git a/...s/WebKit2/ViewportSizeForViewportUnits.mm → ...ts/WebKit/ViewportSizeForViewportUnits.mm b/...s/WebKit2/ViewportSizeForViewportUnits.mm → ...ts/WebKit/ViewportSizeForViewportUnits.mm
diff --git a/...KitAPI/Tests/WebKit2/WKBackForwardList.mm → ...bKitAPI/Tests/WebKit/WKBackForwardList.mm b/...KitAPI/Tests/WebKit2/WKBackForwardList.mm → ...bKitAPI/Tests/WebKit/WKBackForwardList.mm
diff --git a/...tAPI/Tests/WebKit2/WKBundleFileHandle.cpp → ...itAPI/Tests/WebKit/WKBundleFileHandle.cpp b/...tAPI/Tests/WebKit2/WKBundleFileHandle.cpp → ...itAPI/Tests/WebKit/WKBundleFileHandle.cpp
diff --git a/...sts/WebKit2/WKBundleFileHandle_Bundle.cpp → ...ests/WebKit/WKBundleFileHandle_Bundle.cpp b/...sts/WebKit2/WKBundleFileHandle_Bundle.cpp → ...ests/WebKit/WKBundleFileHandle_Bundle.cpp
diff --git a/...sts/WebKit2/WKImageCreateCGImageCrash.cpp → ...ests/WebKit/WKImageCreateCGImageCrash.cpp b/...sts/WebKit2/WKImageCreateCGImageCrash.cpp → ...ests/WebKit/WKImageCreateCGImageCrash.cpp
diff --git a/...API/Tests/WebKit2/WKPageConfiguration.cpp → ...tAPI/Tests/WebKit/WKPageConfiguration.cpp b/...API/Tests/WebKit2/WKPageConfiguration.cpp → ...tAPI/Tests/WebKit/WKPageConfiguration.cpp
diff --git a/...2/WKPageCopySessionStateWithFiltering.cpp → ...t/WKPageCopySessionStateWithFiltering.cpp b/...2/WKPageCopySessionStateWithFiltering.cpp → ...t/WKPageCopySessionStateWithFiltering.cpp
diff --git a/...s/WebKit2/WKPageGetScaleFactorNotZero.cpp → ...ts/WebKit/WKPageGetScaleFactorNotZero.cpp b/...s/WebKit2/WKPageGetScaleFactorNotZero.cpp → ...ts/WebKit/WKPageGetScaleFactorNotZero.cpp
diff --git a/...PI/Tests/WebKit2/WKPageIsPlayingAudio.cpp → ...API/Tests/WebKit/WKPageIsPlayingAudio.cpp b/...PI/Tests/WebKit2/WKPageIsPlayingAudio.cpp → ...API/Tests/WebKit/WKPageIsPlayingAudio.cpp
diff --git a/...WebKitAPI/Tests/WebKit2/WKPreferences.cpp → ...tWebKitAPI/Tests/WebKit/WKPreferences.cpp b/...WebKitAPI/Tests/WebKit2/WKPreferences.cpp → ...tWebKitAPI/Tests/WebKit/WKPreferences.cpp
diff --git a/...stWebKitAPI/Tests/WebKit2/WKRetainPtr.cpp → ...estWebKitAPI/Tests/WebKit/WKRetainPtr.cpp b/...stWebKitAPI/Tests/WebKit2/WKRetainPtr.cpp → ...estWebKitAPI/Tests/WebKit/WKRetainPtr.cpp
diff --git a/.../TestWebKitAPI/Tests/WebKit2/WKString.cpp → ...s/TestWebKitAPI/Tests/WebKit/WKString.cpp b/.../TestWebKitAPI/Tests/WebKit2/WKString.cpp → ...s/TestWebKitAPI/Tests/WebKit/WKString.cpp
diff --git a/...KitAPI/Tests/WebKit2/WKStringJSString.cpp → ...bKitAPI/Tests/WebKit/WKStringJSString.cpp b/...KitAPI/Tests/WebKit2/WKStringJSString.cpp → ...bKitAPI/Tests/WebKit/WKStringJSString.cpp
diff --git a/...ebKitAPI/Tests/WebKit2/WKThumbnailView.mm → ...WebKitAPI/Tests/WebKit/WKThumbnailView.mm b/...ebKitAPI/Tests/WebKit2/WKThumbnailView.mm → ...WebKitAPI/Tests/WebKit/WKThumbnailView.mm
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/WKURL.cpp → Tools/TestWebKitAPI/Tests/WebKit/WKURL.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/WKURL.cpp → Tools/TestWebKitAPI/Tests/WebKit/WKURL.cpp
diff --git a/...estWebKitAPI/Tests/WebKit2/WebArchive.cpp → ...TestWebKitAPI/Tests/WebKit/WebArchive.cpp b/...estWebKitAPI/Tests/WebKit2/WebArchive.cpp → ...TestWebKitAPI/Tests/WebKit/WebArchive.cpp
diff --git a/...itAPI/Tests/WebKit2/WebArchive_Bundle.cpp → ...KitAPI/Tests/WebKit/WebArchive_Bundle.cpp b/...itAPI/Tests/WebKit2/WebArchive_Bundle.cpp → ...KitAPI/Tests/WebKit/WebArchive_Bundle.cpp
diff --git a/...it2/WebCoreStatisticsWithNoWebProcess.cpp → ...Kit/WebCoreStatisticsWithNoWebProcess.cpp b/...it2/WebCoreStatisticsWithNoWebProcess.cpp → ...Kit/WebCoreStatisticsWithNoWebProcess.cpp
diff --git a/.../TestWebKitAPI/Tests/WebKit2/WillLoad.cpp → ...s/TestWebKitAPI/Tests/WebKit/WillLoad.cpp b/.../TestWebKitAPI/Tests/WebKit2/WillLoad.cpp → ...s/TestWebKitAPI/Tests/WebKit/WillLoad.cpp
diff --git a/...bKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp → ...ebKitAPI/Tests/WebKit/WillLoad_Bundle.cpp b/...bKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp → ...ebKitAPI/Tests/WebKit/WillLoad_Bundle.cpp
diff --git a/...API/Tests/WebKit2/WillSendSubmitEvent.cpp → ...tAPI/Tests/WebKit/WillSendSubmitEvent.cpp b/...API/Tests/WebKit2/WillSendSubmitEvent.cpp → ...tAPI/Tests/WebKit/WillSendSubmitEvent.cpp
diff --git a/...ts/WebKit2/WillSendSubmitEvent_Bundle.cpp → ...sts/WebKit/WillSendSubmitEvent_Bundle.cpp b/...ts/WebKit2/WillSendSubmitEvent_Bundle.cpp → ...sts/WebKit/WillSendSubmitEvent_Bundle.cpp
diff --git a/...ts/WebKit2/all-content-in-one-iframe.html → ...sts/WebKit/all-content-in-one-iframe.html b/...ts/WebKit2/all-content-in-one-iframe.html → ...sts/WebKit/all-content-in-one-iframe.html
diff --git a/...ests/WebKit2/associate-form-controls.html → ...Tests/WebKit/associate-form-controls.html b/...ests/WebKit2/associate-form-controls.html → ...Tests/WebKit/associate-form-controls.html
diff --git a/...I/Tests/WebKit2/auto-submitting-form.html → ...PI/Tests/WebKit/auto-submitting-form.html b/...I/Tests/WebKit2/auto-submitting-form.html → ...PI/Tests/WebKit/auto-submitting-form.html
diff --git a/...I/Tests/WebKit2/autoplay-check-frame.html → ...PI/Tests/WebKit/autoplay-check-frame.html b/...I/Tests/WebKit2/autoplay-check-frame.html → ...PI/Tests/WebKit/autoplay-check-frame.html
diff --git a/...sts/WebKit2/autoplay-check-in-iframe.html → ...ests/WebKit/autoplay-check-in-iframe.html b/...sts/WebKit2/autoplay-check-in-iframe.html → ...ests/WebKit/autoplay-check-in-iframe.html
diff --git a/...bKitAPI/Tests/WebKit2/autoplay-check.html → ...ebKitAPI/Tests/WebKit/autoplay-check.html b/...bKitAPI/Tests/WebKit2/autoplay-check.html → ...ebKitAPI/Tests/WebKit/autoplay-check.html
diff --git a/...oplay-inherits-gesture-from-document.html → ...oplay-inherits-gesture-from-document.html b/...oplay-inherits-gesture-from-document.html → ...oplay-inherits-gesture-from-document.html
diff --git a/...WebKit2/autoplay-muted-with-controls.html → .../WebKit/autoplay-muted-with-controls.html b/...WebKit2/autoplay-muted-with-controls.html → .../WebKit/autoplay-muted-with-controls.html
diff --git a/...ests/WebKit2/autoplay-no-audio-check.html → ...Tests/WebKit/autoplay-no-audio-check.html b/...ests/WebKit2/autoplay-no-audio-check.html → ...Tests/WebKit/autoplay-no-audio-check.html
diff --git a/...Tests/WebKit2/autoplay-with-controls.html → .../Tests/WebKit/autoplay-with-controls.html b/...Tests/WebKit2/autoplay-with-controls.html → .../Tests/WebKit/autoplay-with-controls.html
diff --git a/...s/WebKit2/autoplay-zero-volume-check.html → ...ts/WebKit/autoplay-zero-volume-check.html b/...s/WebKit2/autoplay-zero-volume-check.html → ...ts/WebKit/autoplay-zero-volume-check.html
diff --git a/...tWebKitAPI/Tests/WebKit2/bundle-file.html → ...stWebKitAPI/Tests/WebKit/bundle-file.html b/...tWebKitAPI/Tests/WebKit2/bundle-file.html → ...stWebKitAPI/Tests/WebKit/bundle-file.html
diff --git a/...WebKit2/chinese-character-with-image.html → .../WebKit/chinese-character-with-image.html b/...WebKit2/chinese-character-with-image.html → .../WebKit/chinese-character-with-image.html
diff --git a/...ebKit2/close-from-within-create-page.html → ...WebKit/close-from-within-create-page.html b/...ebKit2/close-from-within-create-page.html → ...WebKit/close-from-within-create-page.html
diff --git a/...ests/WebKit2/closed-shadow-tree-test.html → ...Tests/WebKit/closed-shadow-tree-test.html b/...ests/WebKit2/closed-shadow-tree-test.html → ...Tests/WebKit/closed-shadow-tree-test.html
diff --git a/...KitAPI/Tests/WebKit2/cocoa/WeakObjCPtr.mm → ...bKitAPI/Tests/WebKit/cocoa/WeakObjCPtr.mm b/...KitAPI/Tests/WebKit2/cocoa/WeakObjCPtr.mm → ...bKitAPI/Tests/WebKit/cocoa/WeakObjCPtr.mm
diff --git a/...PI/Tests/WebKit2/contentBlockerCheck.html → ...API/Tests/WebKit/contentBlockerCheck.html b/...PI/Tests/WebKit2/contentBlockerCheck.html → ...API/Tests/WebKit/contentBlockerCheck.html
diff --git a/...sts/WebKit2/custom-protocol-sync-xhr.html → ...ests/WebKit/custom-protocol-sync-xhr.html b/...sts/WebKit2/custom-protocol-sync-xhr.html → ...ests/WebKit/custom-protocol-sync-xhr.html
diff --git a/...TestWebKitAPI/Tests/WebKit2/encrypted.pdf → .../TestWebKitAPI/Tests/WebKit/encrypted.pdf b/...TestWebKitAPI/Tests/WebKit2/encrypted.pdf → .../TestWebKitAPI/Tests/WebKit/encrypted.pdf
diff --git a/.../Tests/WebKit2/enumerateMediaDevices.html → ...I/Tests/WebKit/enumerateMediaDevices.html b/.../Tests/WebKit2/enumerateMediaDevices.html → ...I/Tests/WebKit/enumerateMediaDevices.html
diff --git a/...TestWebKitAPI/Tests/WebKit2/execCopy.html → .../TestWebKitAPI/Tests/WebKit/execCopy.html b/...TestWebKitAPI/Tests/WebKit2/execCopy.html → .../TestWebKitAPI/Tests/WebKit/execCopy.html
diff --git a/...itAPI/Tests/WebKit2/file-with-anchor.html → ...KitAPI/Tests/WebKit/file-with-anchor.html b/...itAPI/Tests/WebKit2/file-with-anchor.html → ...KitAPI/Tests/WebKit/file-with-anchor.html
diff --git a/...ebKitAPI/Tests/WebKit2/file-with-mse.html → ...WebKitAPI/Tests/WebKit/file-with-mse.html b/...ebKitAPI/Tests/WebKit2/file-with-mse.html → ...WebKitAPI/Tests/WebKit/file-with-mse.html
diff --git a/...KitAPI/Tests/WebKit2/file-with-video.html → ...bKitAPI/Tests/WebKit/file-with-video.html b/...KitAPI/Tests/WebKit2/file-with-video.html → ...bKitAPI/Tests/WebKit/file-with-video.html
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/find.html → Tools/TestWebKitAPI/Tests/WebKit/find.html b/Tools/TestWebKitAPI/Tests/WebKit2/find.html → Tools/TestWebKitAPI/Tests/WebKit/find.html
diff --git a/...stWebKitAPI/Tests/WebKit2/findRanges.html → ...estWebKitAPI/Tests/WebKit/findRanges.html b/...stWebKitAPI/Tests/WebKit2/findRanges.html → ...estWebKitAPI/Tests/WebKit/findRanges.html
diff --git a/...ebKit2/geolocationGetCurrentPosition.html → ...WebKit/geolocationGetCurrentPosition.html b/...ebKit2/geolocationGetCurrentPosition.html → ...WebKit/geolocationGetCurrentPosition.html
diff --git a/...onGetCurrentPositionWithHighAccuracy.html → ...onGetCurrentPositionWithHighAccuracy.html b/...onGetCurrentPositionWithHighAccuracy.html → ...onGetCurrentPositionWithHighAccuracy.html
diff --git a/...sts/WebKit2/geolocationWatchPosition.html → ...ests/WebKit/geolocationWatchPosition.html b/...sts/WebKit2/geolocationWatchPosition.html → ...ests/WebKit/geolocationWatchPosition.html
diff --git a/...ocationWatchPositionWithHighAccuracy.html → ...ocationWatchPositionWithHighAccuracy.html b/...ocationWatchPositionWithHighAccuracy.html → ...ocationWatchPositionWithHighAccuracy.html
diff --git a/...WebKitAPI/Tests/WebKit2/getUserMedia.html → ...tWebKitAPI/Tests/WebKit/getUserMedia.html b/...WebKitAPI/Tests/WebKit2/getUserMedia.html → ...tWebKitAPI/Tests/WebKit/getUserMedia.html
diff --git a/...I/Tests/WebKit2/gtk/InputMethodFilter.cpp → ...PI/Tests/WebKit/gtk/InputMethodFilter.cpp b/...I/Tests/WebKit2/gtk/InputMethodFilter.cpp → ...PI/Tests/WebKit/gtk/InputMethodFilter.cpp
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/icon.png → Tools/TestWebKitAPI/Tests/WebKit/icon.png b/Tools/TestWebKitAPI/Tests/WebKit2/icon.png → Tools/TestWebKitAPI/Tests/WebKit/icon.png
diff --git a/...itAPI/Tests/WebKit2/input-focus-blur.html → ...KitAPI/Tests/WebKit/input-focus-blur.html b/...itAPI/Tests/WebKit2/input-focus-blur.html → ...KitAPI/Tests/WebKit/input-focus-blur.html
diff --git a/...tAPI/Tests/WebKit2/js-autoplay-audio.html → ...itAPI/Tests/WebKit/js-autoplay-audio.html b/...tAPI/Tests/WebKit2/js-autoplay-audio.html → ...itAPI/Tests/WebKit/js-autoplay-audio.html
diff --git a/.../Tests/WebKit2/js-play-with-controls.html → ...I/Tests/WebKit/js-play-with-controls.html b/.../Tests/WebKit2/js-play-with-controls.html → ...I/Tests/WebKit/js-play-with-controls.html
diff --git a/...Tests/WebKit2/large-red-square-image.html → .../Tests/WebKit/large-red-square-image.html b/...Tests/WebKit2/large-red-square-image.html → .../Tests/WebKit/large-red-square-image.html
diff --git a/...with-download-attribute-with-slashes.html → ...with-download-attribute-with-slashes.html b/...with-download-attribute-with-slashes.html → ...with-download-attribute-with-slashes.html
diff --git a/...WebKit2/link-with-download-attribute.html → .../WebKit/link-with-download-attribute.html b/...WebKit2/link-with-download-attribute.html → .../WebKit/link-with-download-attribute.html
diff --git a/...KitAPI/Tests/WebKit2/link-with-title.html → ...bKitAPI/Tests/WebKit/link-with-title.html b/...KitAPI/Tests/WebKit2/link-with-title.html → ...bKitAPI/Tests/WebKit/link-with-title.html
diff --git a/...KitAPI/Tests/WebKit2/lots-of-iframes.html → ...bKitAPI/Tests/WebKit/lots-of-iframes.html b/...KitAPI/Tests/WebKit2/lots-of-iframes.html → ...bKitAPI/Tests/WebKit/lots-of-iframes.html
diff --git a/...bKitAPI/Tests/WebKit2/lots-of-images.html → ...ebKitAPI/Tests/WebKit/lots-of-images.html b/...bKitAPI/Tests/WebKit2/lots-of-images.html → ...ebKitAPI/Tests/WebKit/lots-of-images.html
diff --git a/...sts/WebKit2/lots-of-text-vertical-lr.html → ...ests/WebKit/lots-of-text-vertical-lr.html b/...sts/WebKit2/lots-of-text-vertical-lr.html → ...ests/WebKit/lots-of-text-vertical-lr.html
diff --git a/...WebKitAPI/Tests/WebKit2/lots-of-text.html → ...tWebKitAPI/Tests/WebKit/lots-of-text.html b/...WebKitAPI/Tests/WebKit2/lots-of-text.html → ...tWebKitAPI/Tests/WebKit/lots-of-text.html
diff --git a/...utedSubstringForProposedRangeWithImage.mm → ...utedSubstringForProposedRangeWithImage.mm b/...utedSubstringForProposedRangeWithImage.mm → ...utedSubstringForProposedRangeWithImage.mm
diff --git a/.../Tests/WebKit2/mac/ContextMenuDownload.mm → ...I/Tests/WebKit/mac/ContextMenuDownload.mm b/.../Tests/WebKit2/mac/ContextMenuDownload.mm → ...I/Tests/WebKit/mac/ContextMenuDownload.mm
diff --git a/...itAPI/Tests/WebKit2/mac/EditorCommands.mm → ...KitAPI/Tests/WebKit/mac/EditorCommands.mm b/...itAPI/Tests/WebKit2/mac/EditorCommands.mm → ...KitAPI/Tests/WebKit/mac/EditorCommands.mm
diff --git a/...ests/WebKit2/mac/GetBackingScaleFactor.mm → ...Tests/WebKit/mac/GetBackingScaleFactor.mm b/...ests/WebKit2/mac/GetBackingScaleFactor.mm → ...Tests/WebKit/mac/GetBackingScaleFactor.mm
diff --git a/...bKit2/mac/GetBackingScaleFactor_Bundle.mm → ...ebKit/mac/GetBackingScaleFactor_Bundle.mm b/...bKit2/mac/GetBackingScaleFactor_Bundle.mm → ...ebKit/mac/GetBackingScaleFactor_Bundle.mm
diff --git a/...2/mac/GetPIDAfterAbortedProcessLaunch.cpp → ...t/mac/GetPIDAfterAbortedProcessLaunch.cpp b/...2/mac/GetPIDAfterAbortedProcessLaunch.cpp → ...t/mac/GetPIDAfterAbortedProcessLaunch.cpp
diff --git a/.../WebKit2/mac/InjectedBundleAppleEvent.cpp → ...s/WebKit/mac/InjectedBundleAppleEvent.cpp b/.../WebKit2/mac/InjectedBundleAppleEvent.cpp → ...s/WebKit/mac/InjectedBundleAppleEvent.cpp
diff --git a/...2/mac/InjectedBundleAppleEvent_Bundle.cpp → ...t/mac/InjectedBundleAppleEvent_Bundle.cpp b/...2/mac/InjectedBundleAppleEvent_Bundle.cpp → ...t/mac/InjectedBundleAppleEvent_Bundle.cpp
diff --git a/...bKit2/mac/RestoreStateAfterTermination.mm → ...ebKit/mac/RestoreStateAfterTermination.mm b/...bKit2/mac/RestoreStateAfterTermination.mm → ...ebKit/mac/RestoreStateAfterTermination.mm
diff --git a/...WebKitAPI/Tests/WebKit2/many-iframes.html → ...tWebKitAPI/Tests/WebKit/many-iframes.html b/...WebKitAPI/Tests/WebKit2/many-iframes.html → ...tWebKitAPI/Tests/WebKit/many-iframes.html
diff --git a/...ts/WebKit2/mediastreamtrack-detached.html → ...sts/WebKit/mediastreamtrack-detached.html b/...ts/WebKit2/mediastreamtrack-detached.html → ...sts/WebKit/mediastreamtrack-detached.html
diff --git a/...dal-alerts-in-new-about-blank-window.html → ...dal-alerts-in-new-about-blank-window.html b/...dal-alerts-in-new-about-blank-window.html → ...dal-alerts-in-new-about-blank-window.html
diff --git a/.../Tests/WebKit2/mouse-button-listener.html → ...I/Tests/WebKit/mouse-button-listener.html b/.../Tests/WebKit2/mouse-button-listener.html → ...I/Tests/WebKit/mouse-button-listener.html
diff --git a/...PI/Tests/WebKit2/mouse-move-listener.html → ...API/Tests/WebKit/mouse-move-listener.html b/...PI/Tests/WebKit2/mouse-move-listener.html → ...API/Tests/WebKit/mouse-move-listener.html
diff --git a/...it2/navigation-client-default-crypto.html → ...Kit/navigation-client-default-crypto.html b/...it2/navigation-client-default-crypto.html → ...Kit/navigation-client-default-crypto.html
diff --git a/...ts/WebKit2/no-autoplay-with-controls.html → ...sts/WebKit/no-autoplay-with-controls.html b/...ts/WebKit2/no-autoplay-with-controls.html → ...sts/WebKit/no-autoplay-with-controls.html
diff --git a/.../Tests/WebKit2/open-and-close-window.html → ...I/Tests/WebKit/open-and-close-window.html b/.../Tests/WebKit2/open-and-close-window.html → ...I/Tests/WebKit/open-and-close-window.html
diff --git a/...stWebKitAPI/Tests/WebKit2/push-state.html → ...estWebKitAPI/Tests/WebKit/push-state.html b/...stWebKitAPI/Tests/WebKit2/push-state.html → ...estWebKitAPI/Tests/WebKit/push-state.html
diff --git a/...bKitAPI/Tests/WebKit2/set-long-title.html → ...ebKitAPI/Tests/WebKit/set-long-title.html b/...bKitAPI/Tests/WebKit2/set-long-title.html → ...ebKitAPI/Tests/WebKit/set-long-title.html
diff --git a/...WebKit2/should-open-external-schemes.html → .../WebKit/should-open-external-schemes.html b/...WebKit2/should-open-external-schemes.html → .../WebKit/should-open-external-schemes.html
diff --git a/...bKit2/simple-accelerated-compositing.html → ...ebKit/simple-accelerated-compositing.html b/...bKit2/simple-accelerated-compositing.html → ...ebKit/simple-accelerated-compositing.html
diff --git a/...tWebKitAPI/Tests/WebKit2/simple-form.html → ...stWebKitAPI/Tests/WebKit/simple-form.html b/...tWebKitAPI/Tests/WebKit2/simple-form.html → ...stWebKitAPI/Tests/WebKit/simple-form.html
diff --git a/...ebKitAPI/Tests/WebKit2/simple-iframe.html → ...WebKitAPI/Tests/WebKit/simple-iframe.html b/...ebKitAPI/Tests/WebKit2/simple-iframe.html → ...WebKitAPI/Tests/WebKit/simple-iframe.html
diff --git a/...tWebKitAPI/Tests/WebKit2/simple-tall.html → ...stWebKitAPI/Tests/WebKit/simple-tall.html b/...tWebKitAPI/Tests/WebKit2/simple-tall.html → ...stWebKitAPI/Tests/WebKit/simple-tall.html
diff --git a/...s/TestWebKitAPI/Tests/WebKit2/simple.html → Tools/TestWebKitAPI/Tests/WebKit/simple.html b/...s/TestWebKitAPI/Tests/WebKit2/simple.html → Tools/TestWebKitAPI/Tests/WebKit/simple.html
diff --git a/.../TestWebKitAPI/Tests/WebKit2/simple2.html → ...s/TestWebKitAPI/Tests/WebKit/simple2.html b/.../TestWebKitAPI/Tests/WebKit2/simple2.html → ...s/TestWebKitAPI/Tests/WebKit/simple2.html
diff --git a/.../TestWebKitAPI/Tests/WebKit2/simple3.html → ...s/TestWebKitAPI/Tests/WebKit/simple3.html b/.../TestWebKitAPI/Tests/WebKit2/simple3.html → ...s/TestWebKitAPI/Tests/WebKit/simple3.html
diff --git a/...API/Tests/WebKit2/spacebar-scrolling.html → ...tAPI/Tests/WebKit/spacebar-scrolling.html b/...API/Tests/WebKit2/spacebar-scrolling.html → ...tAPI/Tests/WebKit/spacebar-scrolling.html
diff --git a/.../TestWebKitAPI/Tests/WebKit2/test-mse.mp4 → ...s/TestWebKitAPI/Tests/WebKit/test-mse.mp4 b/.../TestWebKitAPI/Tests/WebKit2/test-mse.mp4 → ...s/TestWebKitAPI/Tests/WebKit/test-mse.mp4
diff --git a/...ests/WebKit2/test-without-audio-track.mp4 → ...Tests/WebKit/test-without-audio-track.mp4 b/...ests/WebKit2/test-without-audio-track.mp4 → ...Tests/WebKit/test-without-audio-track.mp4
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/test.mp4 → Tools/TestWebKitAPI/Tests/WebKit/test.mp4 b/Tools/TestWebKitAPI/Tests/WebKit2/test.mp4 → Tools/TestWebKitAPI/Tests/WebKit/test.mp4
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/test.pdf → Tools/TestWebKitAPI/Tests/WebKit/test.pdf b/Tools/TestWebKitAPI/Tests/WebKit2/test.pdf → Tools/TestWebKitAPI/Tests/WebKit/test.pdf
diff --git a/.../TestWebKitAPI/Tests/WebKit2/webfont.html → ...s/TestWebKitAPI/Tests/WebKit/webfont.html b/.../TestWebKitAPI/Tests/WebKit2/webfont.html → ...s/TestWebKitAPI/Tests/WebKit/webfont.html