diff --git a/src/apps/debugger/Debugger.cpp b/src/apps/debugger/Debugger.cpp
index cf99a45e0c..2795c55799 100644
--- a/src/apps/debugger/Debugger.cpp
+++ b/src/apps/debugger/Debugger.cpp
@@ -19,6 +19,7 @@
 
 #include "debug_utils.h"
 
+#include "GraphicalUserInterface.h"
 #include "MessageCodes.h"
 #include "SettingsManager.h"
 #include "TeamDebugger.h"
@@ -261,7 +262,15 @@ printf("There's already a debugger for team: %ld\n", team);
 			return;
 		}
 
-		debugger = new(std::nothrow) TeamDebugger(this, &fSettingsManager);
+		UserInterface* userInterface = new(std::nothrow) GraphicalUserInterface;
+		if (userInterface == NULL) {
+			// TODO: Notify the user!
+			fprintf(stderr, "Error: Out of memory!\n");
+		}
+		Reference<UserInterface> userInterfaceReference(userInterface, true);
+
+		debugger = new(std::nothrow) TeamDebugger(this, userInterface,
+			&fSettingsManager);
 		if (debugger == NULL) {
 			// TODO: Notify the user!
 			fprintf(stderr, "Error: Out of memory!\n");
diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index cc30e0eb85..aed8091fd9 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -12,9 +12,11 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) debug_info ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) debugger_interface ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) elf ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) files ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) gui model ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) gui team_window ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) gui util ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui model ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui team_window ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui util ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) ids ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) model ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) settings ] ;
@@ -94,11 +96,17 @@ Application Debugger :
 	LocatableFile.cpp
 	SourceFile.cpp
 
-	# gui/model
+	# user_interface
+	UserInterface.cpp
+
+	# user_interface/gui
+	GraphicalUserInterface.cpp
+
+	# user_interface/gui/model
 	VariablesViewState.cpp
 	VariablesViewStateHistory.cpp
 
-	# gui/team_window
+	# user_interface/gui/team_window
 	BreakpointListView.cpp
 	BreakpointsView.cpp
 	ImageFunctionsView.cpp
@@ -110,7 +118,7 @@ Application Debugger :
 	ThreadListView.cpp
 	VariablesView.cpp
 
-	# gui/util
+	# user_interface/gui/util
 	TargetAddressTableColumn.cpp
 
 	# ids
@@ -185,4 +193,4 @@ Application Debugger :
 HaikuSubInclude arch x86 disasm ;
 HaikuSubInclude demangler ;
 HaikuSubInclude dwarf ;
-HaikuSubInclude gui running_teams_window ;
+HaikuSubInclude user_interface gui running_teams_window ;
diff --git a/src/apps/debugger/TeamDebugger.cpp b/src/apps/debugger/TeamDebugger.cpp
index 46f69462c8..36ec833416 100644
--- a/src/apps/debugger/TeamDebugger.cpp
+++ b/src/apps/debugger/TeamDebugger.cpp
@@ -11,7 +11,6 @@
 
 #include <new>
 
-#include <Alert.h>
 #include <Message.h>
 
 #include <AutoLocker.h>
@@ -124,7 +123,8 @@ struct TeamDebugger::ImageHandlerHashDefinition {
 // #pragma mark - TeamDebugger
 
 
-TeamDebugger::TeamDebugger(Listener* listener, SettingsManager* settingsManager)
+TeamDebugger::TeamDebugger(Listener* listener, UserInterface* userInterface,
+	SettingsManager* settingsManager)
 	:
 	BLooper("team debugger"),
 	fListener(listener),
@@ -137,10 +137,11 @@ TeamDebugger::TeamDebugger(Listener* listener, SettingsManager* settingsManager)
 	fWorker(NULL),
 	fBreakpointManager(NULL),
 	fDebugEventListener(-1),
-	fTeamWindow(NULL),
+	fUserInterface(userInterface),
 	fTerminating(false),
 	fKillTeamOnQuit(false)
 {
+	fUserInterface->AcquireReference();
 }
 
 
@@ -164,13 +165,9 @@ TeamDebugger::~TeamDebugger()
 	if (fDebugEventListener >= 0)
 		wait_for_thread(fDebugEventListener, NULL);
 
-	// quit window
-	if (fTeamWindow != NULL) {
-		// TODO: This is not clean. If the window has been deleted we shouldn't
-		// try to access it!
-		if (fTeamWindow->Lock())
-			fTeamWindow->Quit();
-	}
+	// terminate UI
+	fUserInterface->Terminate();
+	fUserInterface->ReleaseReference();
 
 	ThreadHandler* threadHandler = fThreadHandlers.Clear(true);
 	while (threadHandler != NULL) {
@@ -356,16 +353,14 @@ TeamDebugger::Init(team_id teamID, thread_id threadID, bool stopInMain)
 	if (looperThread < 0)
 		return looperThread;
 
-	// create the team window
-	try {
-		fTeamWindow = TeamWindow::Create(fTeam, this);
-	} catch (...) {
-		// TODO: Notify the user!
-		ERROR("Error: Failed to create team window!\n");
-		return B_NO_MEMORY;
+	// init the UI
+	error = fUserInterface->Init(fTeam, this);
+	if (error != B_OK) {
+		ERROR("Error: Failed to init the UI: %s\n", strerror(error));
+		return error;
 	}
 
-	fTeamWindow->Show();
+	fUserInterface->Show();
 
 	// if requested, stop the given thread
 	if (threadID >= 0) {
@@ -643,7 +638,7 @@ TeamDebugger::ClearBreakpointRequested(UserBreakpoint* breakpoint)
 
 
 bool
-TeamDebugger::TeamWindowQuitRequested()
+TeamDebugger::UserInterfaceQuitRequested()
 {
 	AutoLocker< ::Team> locker(fTeam);
 	BString name(fTeam->Name());
@@ -662,10 +657,10 @@ TeamDebugger::TeamWindowQuitRequested()
 	BString resumeLabel("Resume ");
 	resumeLabel << name;
 
-	BAlert* alert = new BAlert("Quit Debugger", message.String(),
-		killLabel.String(), "Cancel", resumeLabel.String());
+	int32 choice = fUserInterface->SynchronouslyAskUser("Quit Debugger",
+		message, killLabel, "Cancel", resumeLabel);
 
-	switch (alert->Go()) {
+	switch (choice) {
 		case 0:
 			fKillTeamOnQuit = true;
 			break;
@@ -1291,15 +1286,8 @@ TeamDebugger::_NotifyUser(const char* title, const char* text,...)
 	vsnprintf(buffer, sizeof(buffer), text, args);
 	va_end(args);
 
-	// show the alert
-	BAlert* alert = new(std::nothrow) BAlert(title, buffer, "OK",
-		NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-	if (alert != NULL)
-		alert->Go(NULL);
-
-	// TODO: We need to let the alert run asynchronously, but we shouldn't just
-	// create it and don't care anymore. Maybe an error window, which can
-	// display a list of errors would be the better choice.
+	// notify the user
+	fUserInterface->NotifyUser(title, buffer, USER_NOTIFICATION_WARNING);
 }
 
 
diff --git a/src/apps/debugger/TeamDebugger.h b/src/apps/debugger/TeamDebugger.h
index dfd1396931..1f743057a9 100644
--- a/src/apps/debugger/TeamDebugger.h
+++ b/src/apps/debugger/TeamDebugger.h
@@ -13,8 +13,8 @@
 
 #include "DebugEvent.h"
 #include "Team.h"
-#include "TeamWindow.h"
 #include "ThreadHandler.h"
+#include "UserInterface.h"
 #include "Worker.h"
 
 
@@ -24,13 +24,14 @@ class SettingsManager;
 class TeamDebugInfo;
 
 
-class TeamDebugger : public BLooper, private TeamWindow::Listener,
+class TeamDebugger : public BLooper, private UserInterfaceListener,
 	private JobListener, private Team::Listener {
 public:
 	class Listener;
 
 public:
 								TeamDebugger(Listener* listener,
+									UserInterface* userInterface,
 									SettingsManager* settingsManager);
 								~TeamDebugger();
 
@@ -42,7 +43,7 @@ public:
 	virtual	void				MessageReceived(BMessage* message);
 
 private:
-	// TeamWindow::Listener
+	// UserInterfaceListener
 	virtual	void				FunctionSourceCodeRequested(
 									FunctionInstance* function);
 	virtual	void				ImageDebugInfoRequested(Image* image);
@@ -59,7 +60,7 @@ private:
 	virtual	void				ClearBreakpointRequested(target_addr_t address);
 	virtual	void				ClearBreakpointRequested(
 									UserBreakpoint* breakpoint);
-	virtual	bool				TeamWindowQuitRequested();
+	virtual	bool				UserInterfaceQuitRequested();
 
 	// JobListener
 	virtual	void				JobDone(Job* job);
@@ -133,7 +134,7 @@ private:
 			Worker*				fWorker;
 			BreakpointManager*	fBreakpointManager;
 			thread_id			fDebugEventListener;
-			TeamWindow*			fTeamWindow;
+			UserInterface*		fUserInterface;
 	volatile bool				fTerminating;
 			bool				fKillTeamOnQuit;
 };
diff --git a/src/apps/debugger/user_interface/UserInterface.cpp b/src/apps/debugger/user_interface/UserInterface.cpp
new file mode 100644
index 0000000000..a903df53b3
--- /dev/null
+++ b/src/apps/debugger/user_interface/UserInterface.cpp
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "UserInterface.h"
+
+
+// #pragma mark - UserInterface
+
+
+UserInterface::~UserInterface()
+{
+}
+
+
+// #pragma mark - UserInterfaceListener
+
+
+UserInterfaceListener::~UserInterfaceListener()
+{
+}
diff --git a/src/apps/debugger/user_interface/UserInterface.h b/src/apps/debugger/user_interface/UserInterface.h
new file mode 100644
index 0000000000..bbb80a80ea
--- /dev/null
+++ b/src/apps/debugger/user_interface/UserInterface.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef USER_INTERFACE_H
+#define USER_INTERFACE_H
+
+
+#include <OS.h>
+
+#include <Referenceable.h>
+
+#include "Types.h"
+
+
+class FunctionInstance;
+class Image;
+class StackFrame;
+class Team;
+class Thread;
+class TypeComponentPath;
+class UserBreakpoint;
+class UserInterfaceListener;
+class Variable;
+
+
+enum user_notification_type {
+	USER_NOTIFICATION_INFO,
+	USER_NOTIFICATION_WARNING,
+	USER_NOTIFICATION_ERROR
+};
+
+
+class UserInterface : public BReferenceable {
+public:
+	virtual						~UserInterface();
+
+	virtual	status_t			Init(Team* team,
+									UserInterfaceListener* listener) = 0;
+	virtual	void				Show() = 0;
+	virtual	void				Terminate() = 0;
+									// shut down the UI *now* -- no more user
+									// feedback
+
+	virtual	void				NotifyUser(const char* title,
+									const char* message,
+									user_notification_type type) = 0;
+	virtual	int32				SynchronouslyAskUser(const char* title,
+									const char* message, const char* choice1,
+									const char* choice2, const char* choice3)
+									= 0;
+};
+
+
+class UserInterfaceListener {
+public:
+	virtual						~UserInterfaceListener();
+
+	virtual	void				FunctionSourceCodeRequested(
+									FunctionInstance* function) = 0;
+	virtual	void				ImageDebugInfoRequested(Image* image) = 0;
+	virtual	void				StackFrameValueRequested(Thread* thread,
+									StackFrame* stackFrame, Variable* variable,
+									TypeComponentPath* path) = 0;
+									// called with team locked
+	virtual	void				ThreadActionRequested(thread_id threadID,
+									uint32 action) = 0;
+
+	virtual	void				SetBreakpointRequested(target_addr_t address,
+									bool enabled) = 0;
+	virtual	void				SetBreakpointEnabledRequested(
+									UserBreakpoint* breakpoint,
+									bool enabled) = 0;
+	virtual	void				ClearBreakpointRequested(
+									target_addr_t address) = 0;
+	virtual	void				ClearBreakpointRequested(
+									UserBreakpoint* breakpoint) = 0;
+									// TODO: Consolidate those!
+
+	virtual	bool				UserInterfaceQuitRequested() = 0;
+};
+
+
+#endif	// USER_INTERFACE_H
diff --git a/src/apps/debugger/user_interface/gui/GraphicalUserInterface.cpp b/src/apps/debugger/user_interface/gui/GraphicalUserInterface.cpp
new file mode 100644
index 0000000000..c5f061d8ff
--- /dev/null
+++ b/src/apps/debugger/user_interface/gui/GraphicalUserInterface.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "GraphicalUserInterface.h"
+
+#include <Alert.h>
+
+#include "TeamWindow.h"
+#include "Tracing.h"
+
+
+GraphicalUserInterface::GraphicalUserInterface()
+	:
+	fTeamWindow(NULL)
+{
+}
+
+
+GraphicalUserInterface::~GraphicalUserInterface()
+{
+}
+
+
+status_t
+GraphicalUserInterface::Init(Team* team, UserInterfaceListener* listener)
+{
+	try {
+		fTeamWindow = TeamWindow::Create(team, listener);
+	} catch (...) {
+		// TODO: Notify the user!
+		ERROR("Error: Failed to create team window!\n");
+		return B_NO_MEMORY;
+	}
+
+	return B_OK;
+}
+
+
+void
+GraphicalUserInterface::Show()
+{
+	fTeamWindow->Show();
+}
+
+
+void
+GraphicalUserInterface::Terminate()
+{
+	// quit window
+	if (fTeamWindow != NULL) {
+		// TODO: This is not clean. If the window has been deleted we shouldn't
+		// try to access it!
+		if (fTeamWindow->Lock())
+			fTeamWindow->Quit();
+	}
+}
+
+
+void
+GraphicalUserInterface::NotifyUser(const char* title, const char* message,
+	user_notification_type type)
+{
+	// convert notification type to alert type
+	alert_type alertType;
+	switch (type) {
+		case USER_NOTIFICATION_INFO:
+			alertType = B_INFO_ALERT;
+			break;
+		case USER_NOTIFICATION_WARNING:
+		case USER_NOTIFICATION_ERROR:
+			alertType = B_WARNING_ALERT;
+			break;
+	}
+
+	BAlert* alert = new(std::nothrow) BAlert(title, message, "OK",
+		NULL, NULL, B_WIDTH_AS_USUAL, alertType);
+	if (alert != NULL)
+		alert->Go(NULL);
+
+	// TODO: We need to let the alert run asynchronously, but we shouldn't just
+	// create it and don't care anymore. Maybe an error window, which can
+	// display a list of errors would be the better choice.
+}
+
+
+int32
+GraphicalUserInterface::SynchronouslyAskUser(const char* title,
+	const char* message, const char* choice1, const char* choice2,
+	const char* choice3)
+{
+	BAlert* alert = new(std::nothrow) BAlert(title, message,
+		choice1, choice2, choice3);
+	if (alert == NULL)
+		return 0;
+	return alert->Go();
+}
diff --git a/src/apps/debugger/user_interface/gui/GraphicalUserInterface.h b/src/apps/debugger/user_interface/gui/GraphicalUserInterface.h
new file mode 100644
index 0000000000..5d23f27928
--- /dev/null
+++ b/src/apps/debugger/user_interface/gui/GraphicalUserInterface.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef GRAPHICAL_USER_INTERFACE_H
+#define GRAPHICAL_USER_INTERFACE_H
+
+
+#include "UserInterface.h"
+
+
+class TeamWindow;
+
+
+class GraphicalUserInterface : public UserInterface {
+public:
+								GraphicalUserInterface();
+	virtual						~GraphicalUserInterface();
+
+	virtual	status_t			Init(Team* team,
+									UserInterfaceListener* listener);
+	virtual	void				Show();
+	virtual	void				Terminate();
+									// shut down the UI *now* -- no more user
+									// feedback
+
+	virtual	void				NotifyUser(const char* title,
+									const char* message,
+									user_notification_type type);
+	virtual	int32				SynchronouslyAskUser(const char* title,
+									const char* message, const char* choice1,
+									const char* choice2, const char* choice3);
+
+private:
+			TeamWindow*			fTeamWindow;
+};
+
+
+#endif	// GRAPHICAL_USER_INTERFACE_H
diff --git a/src/apps/debugger/gui/model/VariablesViewState.cpp b/src/apps/debugger/user_interface/gui/model/VariablesViewState.cpp
similarity index 100%
rename from src/apps/debugger/gui/model/VariablesViewState.cpp
rename to src/apps/debugger/user_interface/gui/model/VariablesViewState.cpp
diff --git a/src/apps/debugger/gui/model/VariablesViewState.h b/src/apps/debugger/user_interface/gui/model/VariablesViewState.h
similarity index 100%
rename from src/apps/debugger/gui/model/VariablesViewState.h
rename to src/apps/debugger/user_interface/gui/model/VariablesViewState.h
diff --git a/src/apps/debugger/gui/model/VariablesViewStateHistory.cpp b/src/apps/debugger/user_interface/gui/model/VariablesViewStateHistory.cpp
similarity index 100%
rename from src/apps/debugger/gui/model/VariablesViewStateHistory.cpp
rename to src/apps/debugger/user_interface/gui/model/VariablesViewStateHistory.cpp
diff --git a/src/apps/debugger/gui/model/VariablesViewStateHistory.h b/src/apps/debugger/user_interface/gui/model/VariablesViewStateHistory.h
similarity index 100%
rename from src/apps/debugger/gui/model/VariablesViewStateHistory.h
rename to src/apps/debugger/user_interface/gui/model/VariablesViewStateHistory.h
diff --git a/src/apps/debugger/gui/running_teams_window/Jamfile b/src/apps/debugger/user_interface/gui/running_teams_window/Jamfile
similarity index 100%
rename from src/apps/debugger/gui/running_teams_window/Jamfile
rename to src/apps/debugger/user_interface/gui/running_teams_window/Jamfile
diff --git a/src/apps/debugger/gui/running_teams_window/RunningTeamsWindow.cpp b/src/apps/debugger/user_interface/gui/running_teams_window/RunningTeamsWindow.cpp
similarity index 100%
rename from src/apps/debugger/gui/running_teams_window/RunningTeamsWindow.cpp
rename to src/apps/debugger/user_interface/gui/running_teams_window/RunningTeamsWindow.cpp
diff --git a/src/apps/debugger/gui/running_teams_window/RunningTeamsWindow.h b/src/apps/debugger/user_interface/gui/running_teams_window/RunningTeamsWindow.h
similarity index 100%
rename from src/apps/debugger/gui/running_teams_window/RunningTeamsWindow.h
rename to src/apps/debugger/user_interface/gui/running_teams_window/RunningTeamsWindow.h
diff --git a/src/apps/debugger/gui/running_teams_window/TeamWindow.cpp b/src/apps/debugger/user_interface/gui/running_teams_window/TeamWindow.cpp
similarity index 100%
rename from src/apps/debugger/gui/running_teams_window/TeamWindow.cpp
rename to src/apps/debugger/user_interface/gui/running_teams_window/TeamWindow.cpp
diff --git a/src/apps/debugger/gui/running_teams_window/TeamWindow.h b/src/apps/debugger/user_interface/gui/running_teams_window/TeamWindow.h
similarity index 100%
rename from src/apps/debugger/gui/running_teams_window/TeamWindow.h
rename to src/apps/debugger/user_interface/gui/running_teams_window/TeamWindow.h
diff --git a/src/apps/debugger/gui/running_teams_window/TeamsListView.cpp b/src/apps/debugger/user_interface/gui/running_teams_window/TeamsListView.cpp
similarity index 100%
rename from src/apps/debugger/gui/running_teams_window/TeamsListView.cpp
rename to src/apps/debugger/user_interface/gui/running_teams_window/TeamsListView.cpp
diff --git a/src/apps/debugger/gui/running_teams_window/TeamsListView.h b/src/apps/debugger/user_interface/gui/running_teams_window/TeamsListView.h
similarity index 100%
rename from src/apps/debugger/gui/running_teams_window/TeamsListView.h
rename to src/apps/debugger/user_interface/gui/running_teams_window/TeamsListView.h
diff --git a/src/apps/debugger/gui/running_teams_window/hdb.cpp b/src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp
similarity index 100%
rename from src/apps/debugger/gui/running_teams_window/hdb.cpp
rename to src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp
diff --git a/src/apps/debugger/gui/running_teams_window/hdb.h b/src/apps/debugger/user_interface/gui/running_teams_window/hdb.h
similarity index 100%
rename from src/apps/debugger/gui/running_teams_window/hdb.h
rename to src/apps/debugger/user_interface/gui/running_teams_window/hdb.h
diff --git a/src/apps/debugger/gui/team_window/BreakpointListView.cpp b/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp
similarity index 100%
rename from src/apps/debugger/gui/team_window/BreakpointListView.cpp
rename to src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp
diff --git a/src/apps/debugger/gui/team_window/BreakpointListView.h b/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.h
similarity index 100%
rename from src/apps/debugger/gui/team_window/BreakpointListView.h
rename to src/apps/debugger/user_interface/gui/team_window/BreakpointListView.h
diff --git a/src/apps/debugger/gui/team_window/BreakpointsView.cpp b/src/apps/debugger/user_interface/gui/team_window/BreakpointsView.cpp
similarity index 100%
rename from src/apps/debugger/gui/team_window/BreakpointsView.cpp
rename to src/apps/debugger/user_interface/gui/team_window/BreakpointsView.cpp
diff --git a/src/apps/debugger/gui/team_window/BreakpointsView.h b/src/apps/debugger/user_interface/gui/team_window/BreakpointsView.h
similarity index 100%
rename from src/apps/debugger/gui/team_window/BreakpointsView.h
rename to src/apps/debugger/user_interface/gui/team_window/BreakpointsView.h
diff --git a/src/apps/debugger/gui/team_window/ImageFunctionsView.cpp b/src/apps/debugger/user_interface/gui/team_window/ImageFunctionsView.cpp
similarity index 100%
rename from src/apps/debugger/gui/team_window/ImageFunctionsView.cpp
rename to src/apps/debugger/user_interface/gui/team_window/ImageFunctionsView.cpp
diff --git a/src/apps/debugger/gui/team_window/ImageFunctionsView.h b/src/apps/debugger/user_interface/gui/team_window/ImageFunctionsView.h
similarity index 100%
rename from src/apps/debugger/gui/team_window/ImageFunctionsView.h
rename to src/apps/debugger/user_interface/gui/team_window/ImageFunctionsView.h
diff --git a/src/apps/debugger/gui/team_window/ImageListView.cpp b/src/apps/debugger/user_interface/gui/team_window/ImageListView.cpp
similarity index 100%
rename from src/apps/debugger/gui/team_window/ImageListView.cpp
rename to src/apps/debugger/user_interface/gui/team_window/ImageListView.cpp
diff --git a/src/apps/debugger/gui/team_window/ImageListView.h b/src/apps/debugger/user_interface/gui/team_window/ImageListView.h
similarity index 100%
rename from src/apps/debugger/gui/team_window/ImageListView.h
rename to src/apps/debugger/user_interface/gui/team_window/ImageListView.h
diff --git a/src/apps/debugger/gui/team_window/RegistersView.cpp b/src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp
similarity index 100%
rename from src/apps/debugger/gui/team_window/RegistersView.cpp
rename to src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp
diff --git a/src/apps/debugger/gui/team_window/RegistersView.h b/src/apps/debugger/user_interface/gui/team_window/RegistersView.h
similarity index 100%
rename from src/apps/debugger/gui/team_window/RegistersView.h
rename to src/apps/debugger/user_interface/gui/team_window/RegistersView.h
diff --git a/src/apps/debugger/gui/team_window/SourceView.cpp b/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp
similarity index 100%
rename from src/apps/debugger/gui/team_window/SourceView.cpp
rename to src/apps/debugger/user_interface/gui/team_window/SourceView.cpp
diff --git a/src/apps/debugger/gui/team_window/SourceView.h b/src/apps/debugger/user_interface/gui/team_window/SourceView.h
similarity index 100%
rename from src/apps/debugger/gui/team_window/SourceView.h
rename to src/apps/debugger/user_interface/gui/team_window/SourceView.h
diff --git a/src/apps/debugger/gui/team_window/StackTraceView.cpp b/src/apps/debugger/user_interface/gui/team_window/StackTraceView.cpp
similarity index 100%
rename from src/apps/debugger/gui/team_window/StackTraceView.cpp
rename to src/apps/debugger/user_interface/gui/team_window/StackTraceView.cpp
diff --git a/src/apps/debugger/gui/team_window/StackTraceView.h b/src/apps/debugger/user_interface/gui/team_window/StackTraceView.h
similarity index 100%
rename from src/apps/debugger/gui/team_window/StackTraceView.h
rename to src/apps/debugger/user_interface/gui/team_window/StackTraceView.h
diff --git a/src/apps/debugger/gui/team_window/TeamWindow.cpp b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
similarity index 99%
rename from src/apps/debugger/gui/team_window/TeamWindow.cpp
rename to src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
index bc6c0a22ef..67035d3d74 100644
--- a/src/apps/debugger/gui/team_window/TeamWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
@@ -33,6 +33,7 @@
 #include "StackTraceView.h"
 #include "Tracing.h"
 #include "TypeComponentPath.h"
+#include "UserInterface.h"
 #include "Variable.h"
 
 
@@ -45,7 +46,7 @@ enum {
 // #pragma mark - TeamWindow
 
 
-TeamWindow::TeamWindow(::Team* team, Listener* listener)
+TeamWindow::TeamWindow(::Team* team, UserInterfaceListener* listener)
 	:
 	BWindow(BRect(100, 100, 899, 699), "Team", B_TITLED_WINDOW,
 		B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
@@ -107,7 +108,7 @@ TeamWindow::~TeamWindow()
 
 
 /*static*/ TeamWindow*
-TeamWindow::Create(::Team* team, Listener* listener)
+TeamWindow::Create(::Team* team, UserInterfaceListener* listener)
 {
 	TeamWindow* self = new TeamWindow(team, listener);
 
@@ -265,7 +266,7 @@ TeamWindow::MessageReceived(BMessage* message)
 bool
 TeamWindow::QuitRequested()
 {
-	return fListener->TeamWindowQuitRequested();
+	return fListener->UserInterfaceQuitRequested();
 }
 
 
@@ -968,11 +969,3 @@ TeamWindow::_HandleUserBreakpointChanged(UserBreakpoint* breakpoint)
 	fSourceView->UserBreakpointChanged(breakpoint);
 	fBreakpointsView->UserBreakpointChanged(breakpoint);
 }
-
-
-// #pragma mark - Listener
-
-
-TeamWindow::Listener::~Listener()
-{
-}
diff --git a/src/apps/debugger/gui/team_window/TeamWindow.h b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.h
similarity index 81%
rename from src/apps/debugger/gui/team_window/TeamWindow.h
rename to src/apps/debugger/user_interface/gui/team_window/TeamWindow.h
index f875dd74b7..bdc40cff24 100644
--- a/src/apps/debugger/gui/team_window/TeamWindow.h
+++ b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.h
@@ -29,6 +29,7 @@ class RegistersView;
 class SourceCode;
 class StackFrame;
 class UserBreakpoint;
+class UserInterfaceListener;
 class VariablesView;
 
 
@@ -38,13 +39,12 @@ class TeamWindow : public BWindow, ThreadListView::Listener,
 	SourceView::Listener, VariablesView::Listener, Team::Listener,
 	Function::Listener, StackFrame::Listener {
 public:
-	class Listener;
-
-public:
-								TeamWindow(::Team* team, Listener* listener);
+								TeamWindow(::Team* team,
+									UserInterfaceListener* listener);
 								~TeamWindow();
 
-	static	TeamWindow*			Create(::Team* team, Listener* listener);
+	static	TeamWindow*			Create(::Team* team,
+									UserInterfaceListener* listener);
 									// throws
 
 	virtual	void				DispatchMessage(BMessage* message,
@@ -148,7 +148,7 @@ private:
 			FunctionInstance*	fActiveFunction;
 			SourceCode*			fActiveSourceCode;
 			ActiveSourceObject	fActiveSourceObject;
-			Listener*			fListener;
+			UserInterfaceListener* fListener;
 			BTabView*			fTabView;
 			BTabView*			fLocalsTabView;
 			ThreadListView*		fThreadListView;
@@ -167,33 +167,4 @@ private:
 };
 
 
-class TeamWindow::Listener {
-public:
-	virtual						~Listener();
-
-	virtual	void				FunctionSourceCodeRequested(
-									FunctionInstance* function) = 0;
-	virtual	void				ImageDebugInfoRequested(Image* image) = 0;
-	virtual	void				StackFrameValueRequested(::Thread* thread,
-									StackFrame* stackFrame, Variable* variable,
-									TypeComponentPath* path) = 0;
-									// called with team locked
-	virtual	void				ThreadActionRequested(thread_id threadID,
-									uint32 action) = 0;
-
-	virtual	void				SetBreakpointRequested(target_addr_t address,
-									bool enabled) = 0;
-	virtual	void				SetBreakpointEnabledRequested(
-									UserBreakpoint* breakpoint,
-									bool enabled) = 0;
-	virtual	void				ClearBreakpointRequested(
-									target_addr_t address) = 0;
-	virtual	void				ClearBreakpointRequested(
-									UserBreakpoint* breakpoint) = 0;
-									// TODO: Consolidate those!
-
-	virtual	bool				TeamWindowQuitRequested() = 0;
-};
-
-
 #endif	// TEAM_WINDOW_H
diff --git a/src/apps/debugger/gui/team_window/ThreadListView.cpp b/src/apps/debugger/user_interface/gui/team_window/ThreadListView.cpp
similarity index 100%
rename from src/apps/debugger/gui/team_window/ThreadListView.cpp
rename to src/apps/debugger/user_interface/gui/team_window/ThreadListView.cpp
diff --git a/src/apps/debugger/gui/team_window/ThreadListView.h b/src/apps/debugger/user_interface/gui/team_window/ThreadListView.h
similarity index 100%
rename from src/apps/debugger/gui/team_window/ThreadListView.h
rename to src/apps/debugger/user_interface/gui/team_window/ThreadListView.h
diff --git a/src/apps/debugger/gui/team_window/VariablesView.cpp b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
similarity index 100%
rename from src/apps/debugger/gui/team_window/VariablesView.cpp
rename to src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
diff --git a/src/apps/debugger/gui/team_window/VariablesView.h b/src/apps/debugger/user_interface/gui/team_window/VariablesView.h
similarity index 100%
rename from src/apps/debugger/gui/team_window/VariablesView.h
rename to src/apps/debugger/user_interface/gui/team_window/VariablesView.h
diff --git a/src/apps/debugger/gui/util/TargetAddressTableColumn.cpp b/src/apps/debugger/user_interface/gui/util/TargetAddressTableColumn.cpp
similarity index 100%
rename from src/apps/debugger/gui/util/TargetAddressTableColumn.cpp
rename to src/apps/debugger/user_interface/gui/util/TargetAddressTableColumn.cpp
diff --git a/src/apps/debugger/gui/util/TargetAddressTableColumn.h b/src/apps/debugger/user_interface/gui/util/TargetAddressTableColumn.h
similarity index 100%
rename from src/apps/debugger/gui/util/TargetAddressTableColumn.h
rename to src/apps/debugger/user_interface/gui/util/TargetAddressTableColumn.h