Index: include/lldb/Breakpoint/Breakpoint.h
===================================================================
--- include/lldb/Breakpoint/Breakpoint.h
+++ include/lldb/Breakpoint/Breakpoint.h
@@ -21,7 +21,7 @@
 #include "lldb/Breakpoint/BreakpointName.h"
 #include "lldb/Breakpoint/BreakpointOptions.h"
 #include "lldb/Breakpoint/Stoppoint.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/SearchFilter.h"
 #include "lldb/Utility/StringList.h"
 #include "lldb/Utility/StructuredData.h"
Index: include/lldb/Breakpoint/BreakpointName.h
===================================================================
--- include/lldb/Breakpoint/BreakpointName.h
+++ include/lldb/Breakpoint/BreakpointName.h
@@ -20,7 +20,7 @@
 #include "lldb/Breakpoint/BreakpointLocationList.h"
 #include "lldb/Breakpoint/BreakpointOptions.h"
 #include "lldb/Breakpoint/Stoppoint.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/SearchFilter.h"
 #include "lldb/Utility/Flags.h"
 #include "lldb/Utility/StringList.h"
Index: include/lldb/Core/Communication.h
===================================================================
--- include/lldb/Core/Communication.h
+++ include/lldb/Core/Communication.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_Communication_h_
 #define liblldb_Communication_h_
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Host/HostThread.h"
 #include "lldb/Utility/Timeout.h"
 #include "lldb/lldb-defines.h"
Index: include/lldb/Core/Debugger.h
===================================================================
--- include/lldb/Core/Debugger.h
+++ include/lldb/Core/Debugger.h
@@ -15,7 +15,7 @@
 #include <memory>
 #include <vector>
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Core/FormatEntity.h"
 #include "lldb/Core/IOHandler.h"
 #include "lldb/Core/SourceManager.h"
Index: include/lldb/Core/StructuredDataImpl.h
===================================================================
--- include/lldb/Core/StructuredDataImpl.h
+++ include/lldb/Core/StructuredDataImpl.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_StructuredDataImpl_h_
 #define liblldb_StructuredDataImpl_h_
 
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Target/StructuredDataPlugin.h"
 #include "lldb/Utility/Status.h"
 #include "lldb/Utility/Stream.h"
Index: include/lldb/Interpreter/CommandInterpreter.h
===================================================================
--- include/lldb/Interpreter/CommandInterpreter.h
+++ include/lldb/Interpreter/CommandInterpreter.h
@@ -11,9 +11,9 @@
 #define liblldb_CommandInterpreter_h_
 
 #include <mutex>
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Core/Debugger.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/IOHandler.h"
 #include "lldb/Interpreter/CommandAlias.h"
 #include "lldb/Interpreter/CommandHistory.h"
Index: include/lldb/Interpreter/ScriptInterpreter.h
===================================================================
--- include/lldb/Interpreter/ScriptInterpreter.h
+++ include/lldb/Interpreter/ScriptInterpreter.h
@@ -13,7 +13,7 @@
 #include "lldb/lldb-private.h"
 
 #include "lldb/Breakpoint/BreakpointOptions.h"
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Core/SearchFilter.h"
 #include "lldb/Utility/Status.h"
Index: include/lldb/Target/Process.h
===================================================================
--- include/lldb/Target/Process.h
+++ include/lldb/Target/Process.h
@@ -23,10 +23,10 @@
 #include <vector>
 
 #include "lldb/Breakpoint/BreakpointSiteList.h"
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Core/Communication.h"
-#include "lldb/Core/Event.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Event.h"
+#include "lldb/Utility/Listener.h"
 #include "lldb/Core/LoadedModuleInfoList.h"
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Core/ThreadSafeValue.h"
Index: include/lldb/Target/Target.h
===================================================================
--- include/lldb/Target/Target.h
+++ include/lldb/Target/Target.h
@@ -20,7 +20,7 @@
 #include "lldb/Breakpoint/BreakpointName.h"
 #include "lldb/Breakpoint/WatchpointList.h"
 #include "lldb/Core/Architecture.h"
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Core/Disassembler.h"
 #include "lldb/Core/ModuleList.h"
 #include "lldb/Core/UserSettingsController.h"
Index: include/lldb/Target/TargetList.h
===================================================================
--- include/lldb/Target/TargetList.h
+++ include/lldb/Target/TargetList.h
@@ -13,7 +13,7 @@
 #include <mutex>
 #include <vector>
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Target/Target.h"
 
 namespace lldb_private {
Index: include/lldb/Target/Thread.h
===================================================================
--- include/lldb/Target/Thread.h
+++ include/lldb/Target/Thread.h
@@ -15,8 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/UserSettingsController.h"
 #include "lldb/Target/ExecutionContextScope.h"
 #include "lldb/Target/RegisterCheckpoint.h"
Index: include/lldb/Utility/Broadcaster.h
===================================================================
--- include/lldb/Utility/Broadcaster.h
+++ include/lldb/Utility/Broadcaster.h
@@ -223,7 +223,7 @@
 };
 
 //----------------------------------------------------------------------
-/// @class Broadcaster Broadcaster.h "lldb/Core/Broadcaster.h" An event
+/// @class Broadcaster Broadcaster.h "lldb/Utility/Broadcaster.h" An event
 /// broadcasting class.
 ///
 /// The Broadcaster class is designed to be subclassed by objects that wish to
Index: include/lldb/Utility/Event.h
===================================================================
--- include/lldb/Utility/Event.h
+++ include/lldb/Utility/Event.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_Event_h_
 #define liblldb_Event_h_
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Predicate.h"
 #include "lldb/Utility/StructuredData.h"
Index: include/lldb/Utility/Listener.h
===================================================================
--- include/lldb/Utility/Listener.h
+++ include/lldb/Utility/Listener.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_Select_h_
 #define liblldb_Select_h_
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Utility/Timeout.h"
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-forward.h"
Index: source/API/SBBroadcaster.cpp
===================================================================
--- source/API/SBBroadcaster.cpp
+++ source/API/SBBroadcaster.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Utility/Log.h"
 
 #include "lldb/API/SBBroadcaster.h"
Index: source/API/SBCommandInterpreter.cpp
===================================================================
--- source/API/SBCommandInterpreter.cpp
+++ source/API/SBCommandInterpreter.cpp
@@ -9,7 +9,7 @@
 
 #include "lldb/lldb-types.h"
 
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Listener.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandObjectMultiword.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
Index: source/API/SBEvent.cpp
===================================================================
--- source/API/SBEvent.cpp
+++ source/API/SBEvent.cpp
@@ -12,7 +12,7 @@
 #include "lldb/API/SBStream.h"
 
 #include "lldb/Breakpoint/Breakpoint.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Target/Process.h"
Index: source/API/SBListener.cpp
===================================================================
--- source/API/SBListener.cpp
+++ source/API/SBListener.cpp
@@ -12,9 +12,9 @@
 #include "lldb/API/SBDebugger.h"
 #include "lldb/API/SBEvent.h"
 #include "lldb/API/SBStream.h"
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Core/Debugger.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Listener.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/StreamString.h"
 
Index: source/API/SBStructuredData.cpp
===================================================================
--- source/API/SBStructuredData.cpp
+++ source/API/SBStructuredData.cpp
@@ -11,7 +11,7 @@
 
 #include "lldb/API/SBStream.h"
 #include "lldb/API/SBStringList.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/StructuredDataImpl.h"
 #include "lldb/Target/StructuredDataPlugin.h"
 #include "lldb/Utility/Status.h"
Index: source/Core/CMakeLists.txt
===================================================================
--- source/Core/CMakeLists.txt
+++ source/Core/CMakeLists.txt
@@ -13,7 +13,6 @@
   AddressResolver.cpp
   AddressResolverFileLine.cpp
   AddressResolverName.cpp
-  Broadcaster.cpp
   Communication.cpp
   Debugger.cpp
   Disassembler.cpp
@@ -21,13 +20,11 @@
   DumpRegisterValue.cpp
   DynamicLoader.cpp
   EmulateInstruction.cpp
-  Event.cpp
   FileLineResolver.cpp
   FileSpecList.cpp
   FormatEntity.cpp
   Highlighter.cpp
   IOHandler.cpp
-  Listener.cpp
   Mangled.cpp
   Module.cpp
   ModuleChild.cpp
Index: source/Core/Communication.cpp
===================================================================
--- source/Core/Communication.cpp
+++ source/Core/Communication.cpp
@@ -9,8 +9,8 @@
 
 #include "lldb/Core/Communication.h"
 
-#include "lldb/Core/Event.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Event.h"
+#include "lldb/Utility/Listener.h"
 #include "lldb/Host/HostThread.h"
 #include "lldb/Host/ThreadLauncher.h"
 #include "lldb/Utility/Connection.h"
Index: source/Core/Debugger.cpp
===================================================================
--- source/Core/Debugger.cpp
+++ source/Core/Debugger.cpp
@@ -10,9 +10,9 @@
 #include "lldb/Core/Debugger.h"
 
 #include "lldb/Breakpoint/Breakpoint.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/FormatEntity.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Listener.h"
 #include "lldb/Core/Mangled.h"
 #include "lldb/Core/ModuleList.h"
 #include "lldb/Core/PluginManager.h"
Index: source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h
+++ source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "lldb/Core/Communication.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Listener.h"
 #include "lldb/Core/StreamBuffer.h"
 #include "lldb/Utility/Predicate.h"
 #include "lldb/lldb-private.h"
Index: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
+++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
@@ -14,7 +14,7 @@
 #include <list>
 #include <vector>
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Core/ThreadSafeValue.h"
 #include "lldb/Host/HostThread.h"
 #include "lldb/Target/Process.h"
Index: source/Plugins/Process/Utility/HistoryThread.h
===================================================================
--- source/Plugins/Process/Utility/HistoryThread.h
+++ source/Plugins/Process/Utility/HistoryThread.h
@@ -12,8 +12,8 @@
 
 #include <mutex>
 
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/UserSettingsController.h"
 #include "lldb/Target/ExecutionContextScope.h"
 #include "lldb/Target/StackFrameList.h"
Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
===================================================================
--- source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
+++ source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
@@ -19,7 +19,7 @@
 #include <vector>
 
 #include "lldb/Core/Communication.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Listener.h"
 #include "lldb/Host/HostThread.h"
 #include "lldb/Utility/Args.h"
 #include "lldb/Utility/Predicate.h"
Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h
===================================================================
--- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h
+++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h
@@ -15,7 +15,7 @@
 #include "GDBRemoteCommunicationHistory.h"
 
 // Project includes
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Host/HostThread.h"
 #include "lldb/lldb-private-forward.h"
 #include "llvm/Support/Error.h"
Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
===================================================================
--- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
+++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
@@ -19,7 +19,7 @@
 #include <cstring>
 
 // Project includes
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Host/ThreadLauncher.h"
 #include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/FileSpec.h"
Index: source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
===================================================================
--- source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
+++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Core/LoadedModuleInfoList.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/ThreadSafeValue.h"
Index: source/Target/Process.cpp
===================================================================
--- source/Target/Process.cpp
+++ source/Target/Process.cpp
@@ -17,7 +17,7 @@
 #include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Breakpoint/StoppointCallbackContext.h"
 #include "lldb/Core/Debugger.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
Index: source/Target/Target.cpp
===================================================================
--- source/Target/Target.cpp
+++ source/Target/Target.cpp
@@ -20,7 +20,7 @@
 #include "lldb/Breakpoint/BreakpointResolverScripted.h"
 #include "lldb/Breakpoint/Watchpoint.h"
 #include "lldb/Core/Debugger.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
Index: source/Target/TargetList.cpp
===================================================================
--- source/Target/TargetList.cpp
+++ source/Target/TargetList.cpp
@@ -8,9 +8,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Target/TargetList.h"
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Core/Debugger.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Host/Host.h"
Index: source/Utility/Broadcaster.cpp
===================================================================
--- source/Utility/Broadcaster.cpp
+++ source/Utility/Broadcaster.cpp
@@ -7,10 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 
-#include "lldb/Core/Event.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Event.h"
+#include "lldb/Utility/Listener.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/Logging.h"
 #include "lldb/Utility/Stream.h"
Index: source/Utility/CMakeLists.txt
===================================================================
--- source/Utility/CMakeLists.txt
+++ source/Utility/CMakeLists.txt
@@ -45,6 +45,7 @@
   ArchSpec.cpp
   Args.cpp
   Baton.cpp
+  Broadcaster.cpp
   Connection.cpp
   ConstString.cpp
   CompletionRequest.cpp
@@ -53,9 +54,11 @@
   DataEncoder.cpp
   DataExtractor.cpp
   Environment.cpp
+  Event.cpp
   FileSpec.cpp
   IOObject.cpp
   JSON.cpp
+  Listener.cpp
   LLDBAssert.cpp
   Log.cpp
   Logging.cpp
Index: source/Utility/Event.cpp
===================================================================
--- source/Utility/Event.cpp
+++ source/Utility/Event.cpp
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 
-#include "lldb/Core/Broadcaster.h"
+#include "lldb/Utility/Broadcaster.h"
 #include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/Endian.h"
 #include "lldb/Utility/Stream.h"
Index: source/Utility/Listener.cpp
===================================================================
--- source/Utility/Listener.cpp
+++ source/Utility/Listener.cpp
@@ -7,10 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Listener.h"
 
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/Logging.h"
Index: unittests/Core/CMakeLists.txt
===================================================================
--- unittests/Core/CMakeLists.txt
+++ unittests/Core/CMakeLists.txt
@@ -1,7 +1,4 @@
 add_lldb_unittest(LLDBCoreTests
-  BroadcasterTest.cpp
-  EventTest.cpp
-  ListenerTest.cpp
   MangledTest.cpp
   RangeTest.cpp
   RichManglingContextTest.cpp
Index: unittests/Utility/BroadcasterTest.cpp
===================================================================
--- unittests/Utility/BroadcasterTest.cpp
+++ unittests/Utility/BroadcasterTest.cpp
@@ -9,9 +9,9 @@
 
 #include "gtest/gtest.h"
 
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Event.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Event.h"
+#include "lldb/Utility/Listener.h"
 #include "lldb/Utility/Predicate.h"
 
 #include <thread>
Index: unittests/Utility/CMakeLists.txt
===================================================================
--- unittests/Utility/CMakeLists.txt
+++ unittests/Utility/CMakeLists.txt
@@ -3,14 +3,17 @@
   ArgsTest.cpp
   OptionsWithRawTest.cpp
   ArchSpecTest.cpp
+  BroadcasterTest.cpp
   CleanUpTest.cpp
   ConstStringTest.cpp
   CompletionRequestTest.cpp
   DataExtractorTest.cpp
   EnvironmentTest.cpp
+  EventTest.cpp
   FileSpecTest.cpp
   FlagsTest.cpp
   JSONTest.cpp
+  ListenerTest.cpp
   LogTest.cpp
   NameMatchesTest.cpp
   PredicateTest.cpp
Index: unittests/Utility/EventTest.cpp
===================================================================
--- unittests/Utility/EventTest.cpp
+++ unittests/Utility/EventTest.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Core/Event.h"
+#include "lldb/Utility/Event.h"
 #include "lldb/Utility/StreamString.h"
 #include "gtest/gtest.h"
 
Index: unittests/Utility/ListenerTest.cpp
===================================================================
--- unittests/Utility/ListenerTest.cpp
+++ unittests/Utility/ListenerTest.cpp
@@ -9,8 +9,8 @@
 
 #include "gtest/gtest.h"
 
-#include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Listener.h"
+#include "lldb/Utility/Broadcaster.h"
+#include "lldb/Utility/Listener.h"
 #include <future>
 #include <thread>