diff --git a/src/kits/debugger/Jamfile b/src/kits/debugger/Jamfile
index 8dce62ee5c..ea9ee5dec4 100644
--- a/src/kits/debugger/Jamfile
+++ b/src/kits/debugger/Jamfile
@@ -44,7 +44,8 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) debug_info ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) debug_info loading_state_handlers ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) debug_managers ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) debugger_interface ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) debugger_interface interfaces ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) debugger_interface core ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) debugger_interface local ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) elf ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) files ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) ids ] ;
@@ -143,8 +144,10 @@ local sources =
 	DebugEvent.cpp
 	DebuggerInterface.cpp
 
-	# debugger_interface/interfaces
+	# debugger_interface/core
 	CoreFileDebuggerInterface.cpp
+
+	# debugger_interface/local
 	LocalDebuggerInterface.cpp
 
 	# elf
diff --git a/src/kits/debugger/debugger_interface/interfaces/CoreFileDebuggerInterface.cpp b/src/kits/debugger/debugger_interface/core/CoreFileDebuggerInterface.cpp
similarity index 100%
rename from src/kits/debugger/debugger_interface/interfaces/CoreFileDebuggerInterface.cpp
rename to src/kits/debugger/debugger_interface/core/CoreFileDebuggerInterface.cpp
diff --git a/src/kits/debugger/debugger_interface/interfaces/CoreFileDebuggerInterface.h b/src/kits/debugger/debugger_interface/core/CoreFileDebuggerInterface.h
similarity index 100%
rename from src/kits/debugger/debugger_interface/interfaces/CoreFileDebuggerInterface.h
rename to src/kits/debugger/debugger_interface/core/CoreFileDebuggerInterface.h
diff --git a/src/kits/debugger/debugger_interface/interfaces/LocalDebuggerInterface.cpp b/src/kits/debugger/debugger_interface/local/LocalDebuggerInterface.cpp
similarity index 100%
rename from src/kits/debugger/debugger_interface/interfaces/LocalDebuggerInterface.cpp
rename to src/kits/debugger/debugger_interface/local/LocalDebuggerInterface.cpp
diff --git a/src/kits/debugger/debugger_interface/interfaces/LocalDebuggerInterface.h b/src/kits/debugger/debugger_interface/local/LocalDebuggerInterface.h
similarity index 100%
rename from src/kits/debugger/debugger_interface/interfaces/LocalDebuggerInterface.h
rename to src/kits/debugger/debugger_interface/local/LocalDebuggerInterface.h