diff --git a/CMakeLists.txt b/CMakeLists.txt
index 196935241bb..b4a9b8b9d03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ include_directories(Userland/Libraries)
 include_directories(.)
 
 add_subdirectory(Meta/Lagom)
-add_subdirectory(DevTools/IPCCompiler)
+add_subdirectory(Userland/DevTools/IPCCompiler)
 add_subdirectory(Userland/Libraries/LibWeb/CodeGenerators)
 add_subdirectory(AK/Tests)
 add_subdirectory(Userland/Libraries/LibRegex/Tests)
@@ -146,5 +146,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland)
 add_subdirectory(AK)
 add_subdirectory(Kernel)
 add_subdirectory(Services)
-add_subdirectory(DevTools)
 add_subdirectory(Userland)
diff --git a/Userland/CMakeLists.txt b/Userland/CMakeLists.txt
index 8d83e2237ed..f99c8daaa9d 100644
--- a/Userland/CMakeLists.txt
+++ b/Userland/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(Applications)
 add_subdirectory(Demos)
+add_subdirectory(DevTools)
 add_subdirectory(DynamicLoader)
 add_subdirectory(Games)
 add_subdirectory(Libraries)
diff --git a/DevTools/CMakeLists.txt b/Userland/DevTools/CMakeLists.txt
similarity index 100%
rename from DevTools/CMakeLists.txt
rename to Userland/DevTools/CMakeLists.txt
diff --git a/DevTools/HackStudio/AutoCompleteResponse.h b/Userland/DevTools/HackStudio/AutoCompleteResponse.h
similarity index 100%
rename from DevTools/HackStudio/AutoCompleteResponse.h
rename to Userland/DevTools/HackStudio/AutoCompleteResponse.h
diff --git a/DevTools/HackStudio/CMakeLists.txt b/Userland/DevTools/HackStudio/CMakeLists.txt
similarity index 100%
rename from DevTools/HackStudio/CMakeLists.txt
rename to Userland/DevTools/HackStudio/CMakeLists.txt
diff --git a/DevTools/HackStudio/CodeDocument.cpp b/Userland/DevTools/HackStudio/CodeDocument.cpp
similarity index 100%
rename from DevTools/HackStudio/CodeDocument.cpp
rename to Userland/DevTools/HackStudio/CodeDocument.cpp
diff --git a/DevTools/HackStudio/CodeDocument.h b/Userland/DevTools/HackStudio/CodeDocument.h
similarity index 100%
rename from DevTools/HackStudio/CodeDocument.h
rename to Userland/DevTools/HackStudio/CodeDocument.h
diff --git a/DevTools/HackStudio/CursorTool.cpp b/Userland/DevTools/HackStudio/CursorTool.cpp
similarity index 100%
rename from DevTools/HackStudio/CursorTool.cpp
rename to Userland/DevTools/HackStudio/CursorTool.cpp
diff --git a/DevTools/HackStudio/CursorTool.h b/Userland/DevTools/HackStudio/CursorTool.h
similarity index 100%
rename from DevTools/HackStudio/CursorTool.h
rename to Userland/DevTools/HackStudio/CursorTool.h
diff --git a/DevTools/HackStudio/Debugger/BacktraceModel.cpp b/Userland/DevTools/HackStudio/Debugger/BacktraceModel.cpp
similarity index 100%
rename from DevTools/HackStudio/Debugger/BacktraceModel.cpp
rename to Userland/DevTools/HackStudio/Debugger/BacktraceModel.cpp
diff --git a/DevTools/HackStudio/Debugger/BacktraceModel.h b/Userland/DevTools/HackStudio/Debugger/BacktraceModel.h
similarity index 100%
rename from DevTools/HackStudio/Debugger/BacktraceModel.h
rename to Userland/DevTools/HackStudio/Debugger/BacktraceModel.h
diff --git a/DevTools/HackStudio/Debugger/BreakpointCallback.h b/Userland/DevTools/HackStudio/Debugger/BreakpointCallback.h
similarity index 100%
rename from DevTools/HackStudio/Debugger/BreakpointCallback.h
rename to Userland/DevTools/HackStudio/Debugger/BreakpointCallback.h
diff --git a/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp
similarity index 100%
rename from DevTools/HackStudio/Debugger/DebugInfoWidget.cpp
rename to Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp
diff --git a/DevTools/HackStudio/Debugger/DebugInfoWidget.h b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h
similarity index 100%
rename from DevTools/HackStudio/Debugger/DebugInfoWidget.h
rename to Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h
diff --git a/DevTools/HackStudio/Debugger/Debugger.cpp b/Userland/DevTools/HackStudio/Debugger/Debugger.cpp
similarity index 100%
rename from DevTools/HackStudio/Debugger/Debugger.cpp
rename to Userland/DevTools/HackStudio/Debugger/Debugger.cpp
diff --git a/DevTools/HackStudio/Debugger/Debugger.h b/Userland/DevTools/HackStudio/Debugger/Debugger.h
similarity index 100%
rename from DevTools/HackStudio/Debugger/Debugger.h
rename to Userland/DevTools/HackStudio/Debugger/Debugger.h
diff --git a/DevTools/HackStudio/Debugger/DisassemblyModel.cpp b/Userland/DevTools/HackStudio/Debugger/DisassemblyModel.cpp
similarity index 100%
rename from DevTools/HackStudio/Debugger/DisassemblyModel.cpp
rename to Userland/DevTools/HackStudio/Debugger/DisassemblyModel.cpp
diff --git a/DevTools/HackStudio/Debugger/DisassemblyModel.h b/Userland/DevTools/HackStudio/Debugger/DisassemblyModel.h
similarity index 100%
rename from DevTools/HackStudio/Debugger/DisassemblyModel.h
rename to Userland/DevTools/HackStudio/Debugger/DisassemblyModel.h
diff --git a/DevTools/HackStudio/Debugger/DisassemblyWidget.cpp b/Userland/DevTools/HackStudio/Debugger/DisassemblyWidget.cpp
similarity index 100%
rename from DevTools/HackStudio/Debugger/DisassemblyWidget.cpp
rename to Userland/DevTools/HackStudio/Debugger/DisassemblyWidget.cpp
diff --git a/DevTools/HackStudio/Debugger/DisassemblyWidget.h b/Userland/DevTools/HackStudio/Debugger/DisassemblyWidget.h
similarity index 100%
rename from DevTools/HackStudio/Debugger/DisassemblyWidget.h
rename to Userland/DevTools/HackStudio/Debugger/DisassemblyWidget.h
diff --git a/DevTools/HackStudio/Debugger/RegistersModel.cpp b/Userland/DevTools/HackStudio/Debugger/RegistersModel.cpp
similarity index 100%
rename from DevTools/HackStudio/Debugger/RegistersModel.cpp
rename to Userland/DevTools/HackStudio/Debugger/RegistersModel.cpp
diff --git a/DevTools/HackStudio/Debugger/RegistersModel.h b/Userland/DevTools/HackStudio/Debugger/RegistersModel.h
similarity index 100%
rename from DevTools/HackStudio/Debugger/RegistersModel.h
rename to Userland/DevTools/HackStudio/Debugger/RegistersModel.h
diff --git a/DevTools/HackStudio/Debugger/VariablesModel.cpp b/Userland/DevTools/HackStudio/Debugger/VariablesModel.cpp
similarity index 100%
rename from DevTools/HackStudio/Debugger/VariablesModel.cpp
rename to Userland/DevTools/HackStudio/Debugger/VariablesModel.cpp
diff --git a/DevTools/HackStudio/Debugger/VariablesModel.h b/Userland/DevTools/HackStudio/Debugger/VariablesModel.h
similarity index 100%
rename from DevTools/HackStudio/Debugger/VariablesModel.h
rename to Userland/DevTools/HackStudio/Debugger/VariablesModel.h
diff --git a/DevTools/HackStudio/Editor.cpp b/Userland/DevTools/HackStudio/Editor.cpp
similarity index 100%
rename from DevTools/HackStudio/Editor.cpp
rename to Userland/DevTools/HackStudio/Editor.cpp
diff --git a/DevTools/HackStudio/Editor.h b/Userland/DevTools/HackStudio/Editor.h
similarity index 100%
rename from DevTools/HackStudio/Editor.h
rename to Userland/DevTools/HackStudio/Editor.h
diff --git a/DevTools/HackStudio/EditorWrapper.cpp b/Userland/DevTools/HackStudio/EditorWrapper.cpp
similarity index 100%
rename from DevTools/HackStudio/EditorWrapper.cpp
rename to Userland/DevTools/HackStudio/EditorWrapper.cpp
diff --git a/DevTools/HackStudio/EditorWrapper.h b/Userland/DevTools/HackStudio/EditorWrapper.h
similarity index 100%
rename from DevTools/HackStudio/EditorWrapper.h
rename to Userland/DevTools/HackStudio/EditorWrapper.h
diff --git a/DevTools/HackStudio/FindInFilesWidget.cpp b/Userland/DevTools/HackStudio/FindInFilesWidget.cpp
similarity index 100%
rename from DevTools/HackStudio/FindInFilesWidget.cpp
rename to Userland/DevTools/HackStudio/FindInFilesWidget.cpp
diff --git a/DevTools/HackStudio/FindInFilesWidget.h b/Userland/DevTools/HackStudio/FindInFilesWidget.h
similarity index 100%
rename from DevTools/HackStudio/FindInFilesWidget.h
rename to Userland/DevTools/HackStudio/FindInFilesWidget.h
diff --git a/DevTools/HackStudio/FormEditorWidget.cpp b/Userland/DevTools/HackStudio/FormEditorWidget.cpp
similarity index 100%
rename from DevTools/HackStudio/FormEditorWidget.cpp
rename to Userland/DevTools/HackStudio/FormEditorWidget.cpp
diff --git a/DevTools/HackStudio/FormEditorWidget.h b/Userland/DevTools/HackStudio/FormEditorWidget.h
similarity index 100%
rename from DevTools/HackStudio/FormEditorWidget.h
rename to Userland/DevTools/HackStudio/FormEditorWidget.h
diff --git a/DevTools/HackStudio/FormWidget.cpp b/Userland/DevTools/HackStudio/FormWidget.cpp
similarity index 100%
rename from DevTools/HackStudio/FormWidget.cpp
rename to Userland/DevTools/HackStudio/FormWidget.cpp
diff --git a/DevTools/HackStudio/FormWidget.h b/Userland/DevTools/HackStudio/FormWidget.h
similarity index 100%
rename from DevTools/HackStudio/FormWidget.h
rename to Userland/DevTools/HackStudio/FormWidget.h
diff --git a/DevTools/HackStudio/Git/DiffViewer.cpp b/Userland/DevTools/HackStudio/Git/DiffViewer.cpp
similarity index 100%
rename from DevTools/HackStudio/Git/DiffViewer.cpp
rename to Userland/DevTools/HackStudio/Git/DiffViewer.cpp
diff --git a/DevTools/HackStudio/Git/DiffViewer.h b/Userland/DevTools/HackStudio/Git/DiffViewer.h
similarity index 100%
rename from DevTools/HackStudio/Git/DiffViewer.h
rename to Userland/DevTools/HackStudio/Git/DiffViewer.h
diff --git a/DevTools/HackStudio/Git/GitFilesModel.cpp b/Userland/DevTools/HackStudio/Git/GitFilesModel.cpp
similarity index 100%
rename from DevTools/HackStudio/Git/GitFilesModel.cpp
rename to Userland/DevTools/HackStudio/Git/GitFilesModel.cpp
diff --git a/DevTools/HackStudio/Git/GitFilesModel.h b/Userland/DevTools/HackStudio/Git/GitFilesModel.h
similarity index 100%
rename from DevTools/HackStudio/Git/GitFilesModel.h
rename to Userland/DevTools/HackStudio/Git/GitFilesModel.h
diff --git a/DevTools/HackStudio/Git/GitFilesView.cpp b/Userland/DevTools/HackStudio/Git/GitFilesView.cpp
similarity index 100%
rename from DevTools/HackStudio/Git/GitFilesView.cpp
rename to Userland/DevTools/HackStudio/Git/GitFilesView.cpp
diff --git a/DevTools/HackStudio/Git/GitFilesView.h b/Userland/DevTools/HackStudio/Git/GitFilesView.h
similarity index 100%
rename from DevTools/HackStudio/Git/GitFilesView.h
rename to Userland/DevTools/HackStudio/Git/GitFilesView.h
diff --git a/DevTools/HackStudio/Git/GitRepo.cpp b/Userland/DevTools/HackStudio/Git/GitRepo.cpp
similarity index 100%
rename from DevTools/HackStudio/Git/GitRepo.cpp
rename to Userland/DevTools/HackStudio/Git/GitRepo.cpp
diff --git a/DevTools/HackStudio/Git/GitRepo.h b/Userland/DevTools/HackStudio/Git/GitRepo.h
similarity index 100%
rename from DevTools/HackStudio/Git/GitRepo.h
rename to Userland/DevTools/HackStudio/Git/GitRepo.h
diff --git a/DevTools/HackStudio/Git/GitWidget.cpp b/Userland/DevTools/HackStudio/Git/GitWidget.cpp
similarity index 100%
rename from DevTools/HackStudio/Git/GitWidget.cpp
rename to Userland/DevTools/HackStudio/Git/GitWidget.cpp
diff --git a/DevTools/HackStudio/Git/GitWidget.h b/Userland/DevTools/HackStudio/Git/GitWidget.h
similarity index 100%
rename from DevTools/HackStudio/Git/GitWidget.h
rename to Userland/DevTools/HackStudio/Git/GitWidget.h
diff --git a/DevTools/HackStudio/HackStudio.h b/Userland/DevTools/HackStudio/HackStudio.h
similarity index 100%
rename from DevTools/HackStudio/HackStudio.h
rename to Userland/DevTools/HackStudio/HackStudio.h
diff --git a/DevTools/HackStudio/HackStudioWidget.cpp b/Userland/DevTools/HackStudio/HackStudioWidget.cpp
similarity index 100%
rename from DevTools/HackStudio/HackStudioWidget.cpp
rename to Userland/DevTools/HackStudio/HackStudioWidget.cpp
diff --git a/DevTools/HackStudio/HackStudioWidget.h b/Userland/DevTools/HackStudio/HackStudioWidget.h
similarity index 100%
rename from DevTools/HackStudio/HackStudioWidget.h
rename to Userland/DevTools/HackStudio/HackStudioWidget.h
diff --git a/DevTools/HackStudio/Language.h b/Userland/DevTools/HackStudio/Language.h
similarity index 100%
rename from DevTools/HackStudio/Language.h
rename to Userland/DevTools/HackStudio/Language.h
diff --git a/DevTools/HackStudio/LanguageClient.cpp b/Userland/DevTools/HackStudio/LanguageClient.cpp
similarity index 100%
rename from DevTools/HackStudio/LanguageClient.cpp
rename to Userland/DevTools/HackStudio/LanguageClient.cpp
diff --git a/DevTools/HackStudio/LanguageClient.h b/Userland/DevTools/HackStudio/LanguageClient.h
similarity index 100%
rename from DevTools/HackStudio/LanguageClient.h
rename to Userland/DevTools/HackStudio/LanguageClient.h
diff --git a/DevTools/HackStudio/LanguageClients/CMakeLists.txt b/Userland/DevTools/HackStudio/LanguageClients/CMakeLists.txt
similarity index 100%
rename from DevTools/HackStudio/LanguageClients/CMakeLists.txt
rename to Userland/DevTools/HackStudio/LanguageClients/CMakeLists.txt
diff --git a/DevTools/HackStudio/LanguageClients/ServerConnections.h b/Userland/DevTools/HackStudio/LanguageClients/ServerConnections.h
similarity index 100%
rename from DevTools/HackStudio/LanguageClients/ServerConnections.h
rename to Userland/DevTools/HackStudio/LanguageClients/ServerConnections.h
diff --git a/DevTools/HackStudio/LanguageServers/CMakeLists.txt b/Userland/DevTools/HackStudio/LanguageServers/CMakeLists.txt
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/CMakeLists.txt
rename to Userland/DevTools/HackStudio/LanguageServers/CMakeLists.txt
diff --git a/DevTools/HackStudio/LanguageServers/Cpp/AutoComplete.cpp b/Userland/DevTools/HackStudio/LanguageServers/Cpp/AutoComplete.cpp
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Cpp/AutoComplete.cpp
rename to Userland/DevTools/HackStudio/LanguageServers/Cpp/AutoComplete.cpp
diff --git a/DevTools/HackStudio/LanguageServers/Cpp/AutoComplete.h b/Userland/DevTools/HackStudio/LanguageServers/Cpp/AutoComplete.h
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Cpp/AutoComplete.h
rename to Userland/DevTools/HackStudio/LanguageServers/Cpp/AutoComplete.h
diff --git a/DevTools/HackStudio/LanguageServers/Cpp/CMakeLists.txt b/Userland/DevTools/HackStudio/LanguageServers/Cpp/CMakeLists.txt
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Cpp/CMakeLists.txt
rename to Userland/DevTools/HackStudio/LanguageServers/Cpp/CMakeLists.txt
diff --git a/DevTools/HackStudio/LanguageServers/Cpp/ClientConnection.cpp b/Userland/DevTools/HackStudio/LanguageServers/Cpp/ClientConnection.cpp
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Cpp/ClientConnection.cpp
rename to Userland/DevTools/HackStudio/LanguageServers/Cpp/ClientConnection.cpp
diff --git a/DevTools/HackStudio/LanguageServers/Cpp/ClientConnection.h b/Userland/DevTools/HackStudio/LanguageServers/Cpp/ClientConnection.h
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Cpp/ClientConnection.h
rename to Userland/DevTools/HackStudio/LanguageServers/Cpp/ClientConnection.h
diff --git a/DevTools/HackStudio/LanguageServers/Cpp/main.cpp b/Userland/DevTools/HackStudio/LanguageServers/Cpp/main.cpp
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Cpp/main.cpp
rename to Userland/DevTools/HackStudio/LanguageServers/Cpp/main.cpp
diff --git a/DevTools/HackStudio/LanguageServers/LanguageClient.ipc b/Userland/DevTools/HackStudio/LanguageServers/LanguageClient.ipc
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/LanguageClient.ipc
rename to Userland/DevTools/HackStudio/LanguageServers/LanguageClient.ipc
diff --git a/DevTools/HackStudio/LanguageServers/LanguageServer.ipc b/Userland/DevTools/HackStudio/LanguageServers/LanguageServer.ipc
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/LanguageServer.ipc
rename to Userland/DevTools/HackStudio/LanguageServers/LanguageServer.ipc
diff --git a/DevTools/HackStudio/LanguageServers/Shell/AutoComplete.cpp b/Userland/DevTools/HackStudio/LanguageServers/Shell/AutoComplete.cpp
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Shell/AutoComplete.cpp
rename to Userland/DevTools/HackStudio/LanguageServers/Shell/AutoComplete.cpp
diff --git a/DevTools/HackStudio/LanguageServers/Shell/AutoComplete.h b/Userland/DevTools/HackStudio/LanguageServers/Shell/AutoComplete.h
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Shell/AutoComplete.h
rename to Userland/DevTools/HackStudio/LanguageServers/Shell/AutoComplete.h
diff --git a/DevTools/HackStudio/LanguageServers/Shell/CMakeLists.txt b/Userland/DevTools/HackStudio/LanguageServers/Shell/CMakeLists.txt
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Shell/CMakeLists.txt
rename to Userland/DevTools/HackStudio/LanguageServers/Shell/CMakeLists.txt
diff --git a/DevTools/HackStudio/LanguageServers/Shell/ClientConnection.cpp b/Userland/DevTools/HackStudio/LanguageServers/Shell/ClientConnection.cpp
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Shell/ClientConnection.cpp
rename to Userland/DevTools/HackStudio/LanguageServers/Shell/ClientConnection.cpp
diff --git a/DevTools/HackStudio/LanguageServers/Shell/ClientConnection.h b/Userland/DevTools/HackStudio/LanguageServers/Shell/ClientConnection.h
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Shell/ClientConnection.h
rename to Userland/DevTools/HackStudio/LanguageServers/Shell/ClientConnection.h
diff --git a/DevTools/HackStudio/LanguageServers/Shell/main.cpp b/Userland/DevTools/HackStudio/LanguageServers/Shell/main.cpp
similarity index 100%
rename from DevTools/HackStudio/LanguageServers/Shell/main.cpp
rename to Userland/DevTools/HackStudio/LanguageServers/Shell/main.cpp
diff --git a/DevTools/HackStudio/Locator.cpp b/Userland/DevTools/HackStudio/Locator.cpp
similarity index 100%
rename from DevTools/HackStudio/Locator.cpp
rename to Userland/DevTools/HackStudio/Locator.cpp
diff --git a/DevTools/HackStudio/Locator.h b/Userland/DevTools/HackStudio/Locator.h
similarity index 100%
rename from DevTools/HackStudio/Locator.h
rename to Userland/DevTools/HackStudio/Locator.h
diff --git a/DevTools/HackStudio/Project.cpp b/Userland/DevTools/HackStudio/Project.cpp
similarity index 100%
rename from DevTools/HackStudio/Project.cpp
rename to Userland/DevTools/HackStudio/Project.cpp
diff --git a/DevTools/HackStudio/Project.h b/Userland/DevTools/HackStudio/Project.h
similarity index 100%
rename from DevTools/HackStudio/Project.h
rename to Userland/DevTools/HackStudio/Project.h
diff --git a/DevTools/HackStudio/ProjectFile.cpp b/Userland/DevTools/HackStudio/ProjectFile.cpp
similarity index 100%
rename from DevTools/HackStudio/ProjectFile.cpp
rename to Userland/DevTools/HackStudio/ProjectFile.cpp
diff --git a/DevTools/HackStudio/ProjectFile.h b/Userland/DevTools/HackStudio/ProjectFile.h
similarity index 100%
rename from DevTools/HackStudio/ProjectFile.h
rename to Userland/DevTools/HackStudio/ProjectFile.h
diff --git a/DevTools/HackStudio/TerminalWrapper.cpp b/Userland/DevTools/HackStudio/TerminalWrapper.cpp
similarity index 100%
rename from DevTools/HackStudio/TerminalWrapper.cpp
rename to Userland/DevTools/HackStudio/TerminalWrapper.cpp
diff --git a/DevTools/HackStudio/TerminalWrapper.h b/Userland/DevTools/HackStudio/TerminalWrapper.h
similarity index 100%
rename from DevTools/HackStudio/TerminalWrapper.h
rename to Userland/DevTools/HackStudio/TerminalWrapper.h
diff --git a/DevTools/HackStudio/Tool.h b/Userland/DevTools/HackStudio/Tool.h
similarity index 100%
rename from DevTools/HackStudio/Tool.h
rename to Userland/DevTools/HackStudio/Tool.h
diff --git a/DevTools/HackStudio/WidgetTool.cpp b/Userland/DevTools/HackStudio/WidgetTool.cpp
similarity index 100%
rename from DevTools/HackStudio/WidgetTool.cpp
rename to Userland/DevTools/HackStudio/WidgetTool.cpp
diff --git a/DevTools/HackStudio/WidgetTool.h b/Userland/DevTools/HackStudio/WidgetTool.h
similarity index 100%
rename from DevTools/HackStudio/WidgetTool.h
rename to Userland/DevTools/HackStudio/WidgetTool.h
diff --git a/DevTools/HackStudio/WidgetTreeModel.cpp b/Userland/DevTools/HackStudio/WidgetTreeModel.cpp
similarity index 100%
rename from DevTools/HackStudio/WidgetTreeModel.cpp
rename to Userland/DevTools/HackStudio/WidgetTreeModel.cpp
diff --git a/DevTools/HackStudio/WidgetTreeModel.h b/Userland/DevTools/HackStudio/WidgetTreeModel.h
similarity index 100%
rename from DevTools/HackStudio/WidgetTreeModel.h
rename to Userland/DevTools/HackStudio/WidgetTreeModel.h
diff --git a/DevTools/HackStudio/main.cpp b/Userland/DevTools/HackStudio/main.cpp
similarity index 100%
rename from DevTools/HackStudio/main.cpp
rename to Userland/DevTools/HackStudio/main.cpp
diff --git a/DevTools/IPCCompiler/CMakeLists.txt b/Userland/DevTools/IPCCompiler/CMakeLists.txt
similarity index 100%
rename from DevTools/IPCCompiler/CMakeLists.txt
rename to Userland/DevTools/IPCCompiler/CMakeLists.txt
diff --git a/DevTools/IPCCompiler/main.cpp b/Userland/DevTools/IPCCompiler/main.cpp
similarity index 100%
rename from DevTools/IPCCompiler/main.cpp
rename to Userland/DevTools/IPCCompiler/main.cpp
diff --git a/DevTools/Inspector/CMakeLists.txt b/Userland/DevTools/Inspector/CMakeLists.txt
similarity index 100%
rename from DevTools/Inspector/CMakeLists.txt
rename to Userland/DevTools/Inspector/CMakeLists.txt
diff --git a/DevTools/Inspector/RemoteObject.cpp b/Userland/DevTools/Inspector/RemoteObject.cpp
similarity index 100%
rename from DevTools/Inspector/RemoteObject.cpp
rename to Userland/DevTools/Inspector/RemoteObject.cpp
diff --git a/DevTools/Inspector/RemoteObject.h b/Userland/DevTools/Inspector/RemoteObject.h
similarity index 100%
rename from DevTools/Inspector/RemoteObject.h
rename to Userland/DevTools/Inspector/RemoteObject.h
diff --git a/DevTools/Inspector/RemoteObjectGraphModel.cpp b/Userland/DevTools/Inspector/RemoteObjectGraphModel.cpp
similarity index 100%
rename from DevTools/Inspector/RemoteObjectGraphModel.cpp
rename to Userland/DevTools/Inspector/RemoteObjectGraphModel.cpp
diff --git a/DevTools/Inspector/RemoteObjectGraphModel.h b/Userland/DevTools/Inspector/RemoteObjectGraphModel.h
similarity index 100%
rename from DevTools/Inspector/RemoteObjectGraphModel.h
rename to Userland/DevTools/Inspector/RemoteObjectGraphModel.h
diff --git a/DevTools/Inspector/RemoteObjectPropertyModel.cpp b/Userland/DevTools/Inspector/RemoteObjectPropertyModel.cpp
similarity index 100%
rename from DevTools/Inspector/RemoteObjectPropertyModel.cpp
rename to Userland/DevTools/Inspector/RemoteObjectPropertyModel.cpp
diff --git a/DevTools/Inspector/RemoteObjectPropertyModel.h b/Userland/DevTools/Inspector/RemoteObjectPropertyModel.h
similarity index 100%
rename from DevTools/Inspector/RemoteObjectPropertyModel.h
rename to Userland/DevTools/Inspector/RemoteObjectPropertyModel.h
diff --git a/DevTools/Inspector/RemoteProcess.cpp b/Userland/DevTools/Inspector/RemoteProcess.cpp
similarity index 100%
rename from DevTools/Inspector/RemoteProcess.cpp
rename to Userland/DevTools/Inspector/RemoteProcess.cpp
diff --git a/DevTools/Inspector/RemoteProcess.h b/Userland/DevTools/Inspector/RemoteProcess.h
similarity index 100%
rename from DevTools/Inspector/RemoteProcess.h
rename to Userland/DevTools/Inspector/RemoteProcess.h
diff --git a/DevTools/Inspector/main.cpp b/Userland/DevTools/Inspector/main.cpp
similarity index 100%
rename from DevTools/Inspector/main.cpp
rename to Userland/DevTools/Inspector/main.cpp
diff --git a/DevTools/Playground/CMakeLists.txt b/Userland/DevTools/Playground/CMakeLists.txt
similarity index 100%
rename from DevTools/Playground/CMakeLists.txt
rename to Userland/DevTools/Playground/CMakeLists.txt
diff --git a/DevTools/Playground/main.cpp b/Userland/DevTools/Playground/main.cpp
similarity index 100%
rename from DevTools/Playground/main.cpp
rename to Userland/DevTools/Playground/main.cpp
diff --git a/DevTools/Profiler/CMakeLists.txt b/Userland/DevTools/Profiler/CMakeLists.txt
similarity index 100%
rename from DevTools/Profiler/CMakeLists.txt
rename to Userland/DevTools/Profiler/CMakeLists.txt
diff --git a/DevTools/Profiler/DisassemblyModel.cpp b/Userland/DevTools/Profiler/DisassemblyModel.cpp
similarity index 100%
rename from DevTools/Profiler/DisassemblyModel.cpp
rename to Userland/DevTools/Profiler/DisassemblyModel.cpp
diff --git a/DevTools/Profiler/DisassemblyModel.h b/Userland/DevTools/Profiler/DisassemblyModel.h
similarity index 100%
rename from DevTools/Profiler/DisassemblyModel.h
rename to Userland/DevTools/Profiler/DisassemblyModel.h
diff --git a/DevTools/Profiler/Profile.cpp b/Userland/DevTools/Profiler/Profile.cpp
similarity index 100%
rename from DevTools/Profiler/Profile.cpp
rename to Userland/DevTools/Profiler/Profile.cpp
diff --git a/DevTools/Profiler/Profile.h b/Userland/DevTools/Profiler/Profile.h
similarity index 100%
rename from DevTools/Profiler/Profile.h
rename to Userland/DevTools/Profiler/Profile.h
diff --git a/DevTools/Profiler/ProfileModel.cpp b/Userland/DevTools/Profiler/ProfileModel.cpp
similarity index 100%
rename from DevTools/Profiler/ProfileModel.cpp
rename to Userland/DevTools/Profiler/ProfileModel.cpp
diff --git a/DevTools/Profiler/ProfileModel.h b/Userland/DevTools/Profiler/ProfileModel.h
similarity index 100%
rename from DevTools/Profiler/ProfileModel.h
rename to Userland/DevTools/Profiler/ProfileModel.h
diff --git a/DevTools/Profiler/ProfileTimelineWidget.cpp b/Userland/DevTools/Profiler/ProfileTimelineWidget.cpp
similarity index 100%
rename from DevTools/Profiler/ProfileTimelineWidget.cpp
rename to Userland/DevTools/Profiler/ProfileTimelineWidget.cpp
diff --git a/DevTools/Profiler/ProfileTimelineWidget.h b/Userland/DevTools/Profiler/ProfileTimelineWidget.h
similarity index 100%
rename from DevTools/Profiler/ProfileTimelineWidget.h
rename to Userland/DevTools/Profiler/ProfileTimelineWidget.h
diff --git a/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp
similarity index 100%
rename from DevTools/Profiler/main.cpp
rename to Userland/DevTools/Profiler/main.cpp
diff --git a/DevTools/UserspaceEmulator/CMakeLists.txt b/Userland/DevTools/UserspaceEmulator/CMakeLists.txt
similarity index 100%
rename from DevTools/UserspaceEmulator/CMakeLists.txt
rename to Userland/DevTools/UserspaceEmulator/CMakeLists.txt
diff --git a/DevTools/UserspaceEmulator/Emulator.cpp b/Userland/DevTools/UserspaceEmulator/Emulator.cpp
similarity index 100%
rename from DevTools/UserspaceEmulator/Emulator.cpp
rename to Userland/DevTools/UserspaceEmulator/Emulator.cpp
diff --git a/DevTools/UserspaceEmulator/Emulator.h b/Userland/DevTools/UserspaceEmulator/Emulator.h
similarity index 100%
rename from DevTools/UserspaceEmulator/Emulator.h
rename to Userland/DevTools/UserspaceEmulator/Emulator.h
diff --git a/DevTools/UserspaceEmulator/MallocTracer.cpp b/Userland/DevTools/UserspaceEmulator/MallocTracer.cpp
similarity index 100%
rename from DevTools/UserspaceEmulator/MallocTracer.cpp
rename to Userland/DevTools/UserspaceEmulator/MallocTracer.cpp
diff --git a/DevTools/UserspaceEmulator/MallocTracer.h b/Userland/DevTools/UserspaceEmulator/MallocTracer.h
similarity index 100%
rename from DevTools/UserspaceEmulator/MallocTracer.h
rename to Userland/DevTools/UserspaceEmulator/MallocTracer.h
diff --git a/DevTools/UserspaceEmulator/MmapRegion.cpp b/Userland/DevTools/UserspaceEmulator/MmapRegion.cpp
similarity index 100%
rename from DevTools/UserspaceEmulator/MmapRegion.cpp
rename to Userland/DevTools/UserspaceEmulator/MmapRegion.cpp
diff --git a/DevTools/UserspaceEmulator/MmapRegion.h b/Userland/DevTools/UserspaceEmulator/MmapRegion.h
similarity index 100%
rename from DevTools/UserspaceEmulator/MmapRegion.h
rename to Userland/DevTools/UserspaceEmulator/MmapRegion.h
diff --git a/DevTools/UserspaceEmulator/Region.cpp b/Userland/DevTools/UserspaceEmulator/Region.cpp
similarity index 100%
rename from DevTools/UserspaceEmulator/Region.cpp
rename to Userland/DevTools/UserspaceEmulator/Region.cpp
diff --git a/DevTools/UserspaceEmulator/Region.h b/Userland/DevTools/UserspaceEmulator/Region.h
similarity index 100%
rename from DevTools/UserspaceEmulator/Region.h
rename to Userland/DevTools/UserspaceEmulator/Region.h
diff --git a/DevTools/UserspaceEmulator/Report.h b/Userland/DevTools/UserspaceEmulator/Report.h
similarity index 100%
rename from DevTools/UserspaceEmulator/Report.h
rename to Userland/DevTools/UserspaceEmulator/Report.h
diff --git a/DevTools/UserspaceEmulator/SharedBufferRegion.cpp b/Userland/DevTools/UserspaceEmulator/SharedBufferRegion.cpp
similarity index 100%
rename from DevTools/UserspaceEmulator/SharedBufferRegion.cpp
rename to Userland/DevTools/UserspaceEmulator/SharedBufferRegion.cpp
diff --git a/DevTools/UserspaceEmulator/SharedBufferRegion.h b/Userland/DevTools/UserspaceEmulator/SharedBufferRegion.h
similarity index 100%
rename from DevTools/UserspaceEmulator/SharedBufferRegion.h
rename to Userland/DevTools/UserspaceEmulator/SharedBufferRegion.h
diff --git a/DevTools/UserspaceEmulator/SimpleRegion.cpp b/Userland/DevTools/UserspaceEmulator/SimpleRegion.cpp
similarity index 100%
rename from DevTools/UserspaceEmulator/SimpleRegion.cpp
rename to Userland/DevTools/UserspaceEmulator/SimpleRegion.cpp
diff --git a/DevTools/UserspaceEmulator/SimpleRegion.h b/Userland/DevTools/UserspaceEmulator/SimpleRegion.h
similarity index 100%
rename from DevTools/UserspaceEmulator/SimpleRegion.h
rename to Userland/DevTools/UserspaceEmulator/SimpleRegion.h
diff --git a/DevTools/UserspaceEmulator/SoftCPU.cpp b/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp
similarity index 100%
rename from DevTools/UserspaceEmulator/SoftCPU.cpp
rename to Userland/DevTools/UserspaceEmulator/SoftCPU.cpp
diff --git a/DevTools/UserspaceEmulator/SoftCPU.h b/Userland/DevTools/UserspaceEmulator/SoftCPU.h
similarity index 100%
rename from DevTools/UserspaceEmulator/SoftCPU.h
rename to Userland/DevTools/UserspaceEmulator/SoftCPU.h
diff --git a/DevTools/UserspaceEmulator/SoftMMU.cpp b/Userland/DevTools/UserspaceEmulator/SoftMMU.cpp
similarity index 100%
rename from DevTools/UserspaceEmulator/SoftMMU.cpp
rename to Userland/DevTools/UserspaceEmulator/SoftMMU.cpp
diff --git a/DevTools/UserspaceEmulator/SoftMMU.h b/Userland/DevTools/UserspaceEmulator/SoftMMU.h
similarity index 100%
rename from DevTools/UserspaceEmulator/SoftMMU.h
rename to Userland/DevTools/UserspaceEmulator/SoftMMU.h
diff --git a/DevTools/UserspaceEmulator/ValueWithShadow.h b/Userland/DevTools/UserspaceEmulator/ValueWithShadow.h
similarity index 100%
rename from DevTools/UserspaceEmulator/ValueWithShadow.h
rename to Userland/DevTools/UserspaceEmulator/ValueWithShadow.h
diff --git a/DevTools/UserspaceEmulator/main.cpp b/Userland/DevTools/UserspaceEmulator/main.cpp
similarity index 100%
rename from DevTools/UserspaceEmulator/main.cpp
rename to Userland/DevTools/UserspaceEmulator/main.cpp