diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index 200eef15ff..dcd6f0807b 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -11,6 +11,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) arch x86 ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) debug_info ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) debugger_interface ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) gui team_window ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) model ] ;
 
 local debugAnalyzerSources
 	= [ FDirName $(HAIKU_TOP) src apps debuganalyzer ] ;
@@ -21,23 +22,14 @@ SubDirHdrs [ FDirName $(debugAnalyzerSources) gui ] ;
 Application Debugger :
 	Debugger.cpp
 #	ElfFile.cpp
-	Image.cpp
-	ImageInfo.cpp
 	Jobs.cpp
-	SymbolInfo.cpp
-	Team.cpp
 	TeamDebugger.cpp
-	TeamDebugModel.cpp
-	Thread.cpp
-	ThreadInfo.cpp
 	Worker.cpp
 
 	# arch
 	Architecture.cpp
 	CpuState.cpp
 	Register.cpp
-	StackFrame.cpp
-	StackTrace.cpp
 
 	# arch/x86
 	ArchitectureX86.cpp
@@ -62,6 +54,17 @@ Application Debugger :
 	TeamWindow.cpp
 	ThreadListView.cpp
 
+	# model
+	Image.cpp
+	ImageInfo.cpp
+	StackFrame.cpp
+	StackTrace.cpp
+	SymbolInfo.cpp
+	Team.cpp
+	TeamDebugModel.cpp
+	Thread.cpp
+	ThreadInfo.cpp
+
 # DWARF
 #	attribute_classes.cpp
 #	AttributeValue.cpp
diff --git a/src/apps/debugger/Image.cpp b/src/apps/debugger/model/Image.cpp
similarity index 100%
rename from src/apps/debugger/Image.cpp
rename to src/apps/debugger/model/Image.cpp
diff --git a/src/apps/debugger/Image.h b/src/apps/debugger/model/Image.h
similarity index 100%
rename from src/apps/debugger/Image.h
rename to src/apps/debugger/model/Image.h
diff --git a/src/apps/debugger/ImageInfo.cpp b/src/apps/debugger/model/ImageInfo.cpp
similarity index 100%
rename from src/apps/debugger/ImageInfo.cpp
rename to src/apps/debugger/model/ImageInfo.cpp
diff --git a/src/apps/debugger/ImageInfo.h b/src/apps/debugger/model/ImageInfo.h
similarity index 100%
rename from src/apps/debugger/ImageInfo.h
rename to src/apps/debugger/model/ImageInfo.h
diff --git a/src/apps/debugger/arch/StackFrame.cpp b/src/apps/debugger/model/StackFrame.cpp
similarity index 100%
rename from src/apps/debugger/arch/StackFrame.cpp
rename to src/apps/debugger/model/StackFrame.cpp
diff --git a/src/apps/debugger/arch/StackFrame.h b/src/apps/debugger/model/StackFrame.h
similarity index 100%
rename from src/apps/debugger/arch/StackFrame.h
rename to src/apps/debugger/model/StackFrame.h
diff --git a/src/apps/debugger/arch/StackTrace.cpp b/src/apps/debugger/model/StackTrace.cpp
similarity index 100%
rename from src/apps/debugger/arch/StackTrace.cpp
rename to src/apps/debugger/model/StackTrace.cpp
diff --git a/src/apps/debugger/arch/StackTrace.h b/src/apps/debugger/model/StackTrace.h
similarity index 100%
rename from src/apps/debugger/arch/StackTrace.h
rename to src/apps/debugger/model/StackTrace.h
diff --git a/src/apps/debugger/SymbolInfo.cpp b/src/apps/debugger/model/SymbolInfo.cpp
similarity index 100%
rename from src/apps/debugger/SymbolInfo.cpp
rename to src/apps/debugger/model/SymbolInfo.cpp
diff --git a/src/apps/debugger/SymbolInfo.h b/src/apps/debugger/model/SymbolInfo.h
similarity index 100%
rename from src/apps/debugger/SymbolInfo.h
rename to src/apps/debugger/model/SymbolInfo.h
diff --git a/src/apps/debugger/Team.cpp b/src/apps/debugger/model/Team.cpp
similarity index 100%
rename from src/apps/debugger/Team.cpp
rename to src/apps/debugger/model/Team.cpp
diff --git a/src/apps/debugger/Team.h b/src/apps/debugger/model/Team.h
similarity index 100%
rename from src/apps/debugger/Team.h
rename to src/apps/debugger/model/Team.h
diff --git a/src/apps/debugger/TeamDebugModel.cpp b/src/apps/debugger/model/TeamDebugModel.cpp
similarity index 100%
rename from src/apps/debugger/TeamDebugModel.cpp
rename to src/apps/debugger/model/TeamDebugModel.cpp
diff --git a/src/apps/debugger/TeamDebugModel.h b/src/apps/debugger/model/TeamDebugModel.h
similarity index 100%
rename from src/apps/debugger/TeamDebugModel.h
rename to src/apps/debugger/model/TeamDebugModel.h
diff --git a/src/apps/debugger/Thread.cpp b/src/apps/debugger/model/Thread.cpp
similarity index 100%
rename from src/apps/debugger/Thread.cpp
rename to src/apps/debugger/model/Thread.cpp
diff --git a/src/apps/debugger/Thread.h b/src/apps/debugger/model/Thread.h
similarity index 100%
rename from src/apps/debugger/Thread.h
rename to src/apps/debugger/model/Thread.h
diff --git a/src/apps/debugger/ThreadInfo.cpp b/src/apps/debugger/model/ThreadInfo.cpp
similarity index 100%
rename from src/apps/debugger/ThreadInfo.cpp
rename to src/apps/debugger/model/ThreadInfo.cpp
diff --git a/src/apps/debugger/ThreadInfo.h b/src/apps/debugger/model/ThreadInfo.h
similarity index 100%
rename from src/apps/debugger/ThreadInfo.h
rename to src/apps/debugger/model/ThreadInfo.h