diff --git a/src/apps/debuganalyzer/Jamfile b/src/apps/debuganalyzer/Jamfile
index 75618bc1ec..fa3e4c8770 100644
--- a/src/apps/debuganalyzer/Jamfile
+++ b/src/apps/debuganalyzer/Jamfile
@@ -3,29 +3,33 @@ SubDir HAIKU_TOP src apps debuganalyzer ;
 UsePrivateHeaders debug interface kernel shared ;
 UsePrivateSystemHeaders ;
 
-SEARCH_SOURCE += [ FDirName $(SUBDIR) main_window ] ;
+HAIKU_DEBUG_ANALYZER_HEADERS = 
+	$(SUBDIR)
+	[ FDirName $(SUBDIR) gui ]
+	[ FDirName $(SUBDIR) model ]
+	[ FDirName $(SUBDIR) model_loader ]
+	[ FDirName $(SUBDIR) util ]
+;
+
+UseHeaders $(HAIKU_DEBUG_ANALYZER_HEADERS) ;
+
 
 Application DebugAnalyzer
 	:
-	AbstractGeneralPage.cpp
-	DataSource.cpp
 	DebugAnalyzer.cpp
-	Model.cpp
-	ModelLoader.cpp
-	SubWindow.cpp
-	SubWindowManager.cpp
-	Table.cpp
-	TableColumns.cpp
-	Variant.cpp
 
 	:
-	<nogrist>DebugAnalyzer_MainWindow.o
-	<nogrist>DebugAnalyzer_ThreadWindow.o
+	<nogrist>DebugAnalyzer_gui.o
+	<nogrist>DebugAnalyzer_model.o
+	<nogrist>DebugAnalyzer_model_loader.o
+	<nogrist>DebugAnalyzer_util.o
 
 	libcolumnlistview.a libdebug.so be
 	:
 	DebugAnalyzer.rdef
 ;
 
-HaikuSubInclude main_window ;
-HaikuSubInclude thread_window ;
+HaikuSubInclude gui ;
+HaikuSubInclude model ;
+HaikuSubInclude model_loader ;
+HaikuSubInclude util ;
diff --git a/src/apps/debuganalyzer/AbstractGeneralPage.cpp b/src/apps/debuganalyzer/gui/AbstractGeneralPage.cpp
similarity index 100%
rename from src/apps/debuganalyzer/AbstractGeneralPage.cpp
rename to src/apps/debuganalyzer/gui/AbstractGeneralPage.cpp
diff --git a/src/apps/debuganalyzer/AbstractGeneralPage.h b/src/apps/debuganalyzer/gui/AbstractGeneralPage.h
similarity index 100%
rename from src/apps/debuganalyzer/AbstractGeneralPage.h
rename to src/apps/debuganalyzer/gui/AbstractGeneralPage.h
diff --git a/src/apps/debuganalyzer/gui/Jamfile b/src/apps/debuganalyzer/gui/Jamfile
new file mode 100644
index 0000000000..4061bb05a9
--- /dev/null
+++ b/src/apps/debuganalyzer/gui/Jamfile
@@ -0,0 +1,23 @@
+SubDir HAIKU_TOP src apps debuganalyzer gui ;
+
+UsePrivateHeaders debug interface kernel shared ;
+UsePrivateSystemHeaders ;
+
+UseHeaders $(HAIKU_DEBUG_ANALYZER_HEADERS) ;
+
+
+MergeObject DebugAnalyzer_gui.o
+	:
+	AbstractGeneralPage.cpp
+	SubWindow.cpp
+	SubWindowManager.cpp
+	:
+	DebugAnalyzer_gui_main_window.o
+	DebugAnalyzer_gui_table.o
+	DebugAnalyzer_gui_thread_window.o
+;
+
+
+HaikuSubInclude main_window ;
+HaikuSubInclude table ;
+HaikuSubInclude thread_window ;
diff --git a/src/apps/debuganalyzer/SubWindow.cpp b/src/apps/debuganalyzer/gui/SubWindow.cpp
similarity index 100%
rename from src/apps/debuganalyzer/SubWindow.cpp
rename to src/apps/debuganalyzer/gui/SubWindow.cpp
diff --git a/src/apps/debuganalyzer/SubWindow.h b/src/apps/debuganalyzer/gui/SubWindow.h
similarity index 100%
rename from src/apps/debuganalyzer/SubWindow.h
rename to src/apps/debuganalyzer/gui/SubWindow.h
diff --git a/src/apps/debuganalyzer/SubWindowManager.cpp b/src/apps/debuganalyzer/gui/SubWindowManager.cpp
similarity index 100%
rename from src/apps/debuganalyzer/SubWindowManager.cpp
rename to src/apps/debuganalyzer/gui/SubWindowManager.cpp
diff --git a/src/apps/debuganalyzer/SubWindowManager.h b/src/apps/debuganalyzer/gui/SubWindowManager.h
similarity index 100%
rename from src/apps/debuganalyzer/SubWindowManager.h
rename to src/apps/debuganalyzer/gui/SubWindowManager.h
diff --git a/src/apps/debuganalyzer/gui/main_window/Jamfile b/src/apps/debuganalyzer/gui/main_window/Jamfile
new file mode 100644
index 0000000000..cad25913d3
--- /dev/null
+++ b/src/apps/debuganalyzer/gui/main_window/Jamfile
@@ -0,0 +1,13 @@
+SubDir HAIKU_TOP src apps debuganalyzer gui main_window ;
+
+UsePrivateHeaders debug interface kernel shared ;
+UsePrivateSystemHeaders ;
+
+UseHeaders $(HAIKU_DEBUG_ANALYZER_HEADERS) ;
+
+
+MergeObject DebugAnalyzer_gui_main_window.o
+	:
+	MainWindow.cpp
+	ThreadsPage.cpp
+;
diff --git a/src/apps/debuganalyzer/main_window/MainWindow.cpp b/src/apps/debuganalyzer/gui/main_window/MainWindow.cpp
similarity index 100%
rename from src/apps/debuganalyzer/main_window/MainWindow.cpp
rename to src/apps/debuganalyzer/gui/main_window/MainWindow.cpp
diff --git a/src/apps/debuganalyzer/main_window/MainWindow.h b/src/apps/debuganalyzer/gui/main_window/MainWindow.h
similarity index 100%
rename from src/apps/debuganalyzer/main_window/MainWindow.h
rename to src/apps/debuganalyzer/gui/main_window/MainWindow.h
diff --git a/src/apps/debuganalyzer/main_window/ThreadsPage.cpp b/src/apps/debuganalyzer/gui/main_window/ThreadsPage.cpp
similarity index 99%
rename from src/apps/debuganalyzer/main_window/ThreadsPage.cpp
rename to src/apps/debuganalyzer/gui/main_window/ThreadsPage.cpp
index a1b096338e..11f2fa6371 100644
--- a/src/apps/debuganalyzer/main_window/ThreadsPage.cpp
+++ b/src/apps/debuganalyzer/gui/main_window/ThreadsPage.cpp
@@ -9,7 +9,7 @@
 
 #include <new>
 
-#include "TableColumns.h"
+#include "table/TableColumns.h"
 
 
 // #pragma mark - ThreadsTableModel
diff --git a/src/apps/debuganalyzer/main_window/ThreadsPage.h b/src/apps/debuganalyzer/gui/main_window/ThreadsPage.h
similarity index 96%
rename from src/apps/debuganalyzer/main_window/ThreadsPage.h
rename to src/apps/debuganalyzer/gui/main_window/ThreadsPage.h
index 85f862f4aa..aa183930b8 100644
--- a/src/apps/debuganalyzer/main_window/ThreadsPage.h
+++ b/src/apps/debuganalyzer/gui/main_window/ThreadsPage.h
@@ -7,7 +7,7 @@
 
 #include <GroupView.h>
 
-#include "Table.h"
+#include "table/Table.h"
 
 #include "main_window/MainWindow.h"
 
diff --git a/src/apps/debuganalyzer/gui/table/Jamfile b/src/apps/debuganalyzer/gui/table/Jamfile
new file mode 100644
index 0000000000..22f7b83279
--- /dev/null
+++ b/src/apps/debuganalyzer/gui/table/Jamfile
@@ -0,0 +1,13 @@
+SubDir HAIKU_TOP src apps debuganalyzer gui table ;
+
+UsePrivateHeaders debug interface kernel shared ;
+UsePrivateSystemHeaders ;
+
+UseHeaders $(HAIKU_DEBUG_ANALYZER_HEADERS) ;
+
+
+MergeObject DebugAnalyzer_gui_table.o
+	:
+	Table.cpp
+	TableColumns.cpp
+;
diff --git a/src/apps/debuganalyzer/Table.cpp b/src/apps/debuganalyzer/gui/table/Table.cpp
similarity index 99%
rename from src/apps/debuganalyzer/Table.cpp
rename to src/apps/debuganalyzer/gui/table/Table.cpp
index 907db9c0f9..d5e71bbf75 100644
--- a/src/apps/debuganalyzer/Table.cpp
+++ b/src/apps/debuganalyzer/gui/table/Table.cpp
@@ -3,7 +3,7 @@
  * Distributed under the terms of the MIT License.
  */
 
-#include "Table.h"
+#include "table/Table.h"
 
 #include <new>
 
diff --git a/src/apps/debuganalyzer/Table.h b/src/apps/debuganalyzer/gui/table/Table.h
similarity index 100%
rename from src/apps/debuganalyzer/Table.h
rename to src/apps/debuganalyzer/gui/table/Table.h
diff --git a/src/apps/debuganalyzer/TableColumns.cpp b/src/apps/debuganalyzer/gui/table/TableColumns.cpp
similarity index 99%
rename from src/apps/debuganalyzer/TableColumns.cpp
rename to src/apps/debuganalyzer/gui/table/TableColumns.cpp
index 092592f1c6..9331ad3f07 100644
--- a/src/apps/debuganalyzer/TableColumns.cpp
+++ b/src/apps/debuganalyzer/gui/table/TableColumns.cpp
@@ -3,7 +3,7 @@
  * Distributed under the terms of the MIT License.
  */
 
-#include "TableColumns.h"
+#include "table/TableColumns.h"
 
 #include <stdio.h>
 
diff --git a/src/apps/debuganalyzer/TableColumns.h b/src/apps/debuganalyzer/gui/table/TableColumns.h
similarity index 99%
rename from src/apps/debuganalyzer/TableColumns.h
rename to src/apps/debuganalyzer/gui/table/TableColumns.h
index 4af4de9ea3..dbeb0071d7 100644
--- a/src/apps/debuganalyzer/TableColumns.h
+++ b/src/apps/debuganalyzer/gui/table/TableColumns.h
@@ -7,7 +7,7 @@
 
 #include <ColumnTypes.h>
 
-#include "Table.h"
+#include "table/Table.h"
 
 
 class DelagateBasedTableColumn : public TableColumn {
diff --git a/src/apps/debuganalyzer/thread_window/GeneralPage.cpp b/src/apps/debuganalyzer/gui/thread_window/GeneralPage.cpp
similarity index 100%
rename from src/apps/debuganalyzer/thread_window/GeneralPage.cpp
rename to src/apps/debuganalyzer/gui/thread_window/GeneralPage.cpp
diff --git a/src/apps/debuganalyzer/thread_window/GeneralPage.h b/src/apps/debuganalyzer/gui/thread_window/GeneralPage.h
similarity index 100%
rename from src/apps/debuganalyzer/thread_window/GeneralPage.h
rename to src/apps/debuganalyzer/gui/thread_window/GeneralPage.h
diff --git a/src/apps/debuganalyzer/gui/thread_window/Jamfile b/src/apps/debuganalyzer/gui/thread_window/Jamfile
new file mode 100644
index 0000000000..b42dc237d1
--- /dev/null
+++ b/src/apps/debuganalyzer/gui/thread_window/Jamfile
@@ -0,0 +1,13 @@
+SubDir HAIKU_TOP src apps debuganalyzer gui thread_window ;
+
+UsePrivateHeaders debug interface kernel shared ;
+UsePrivateSystemHeaders ;
+
+UseHeaders $(HAIKU_DEBUG_ANALYZER_HEADERS) ;
+
+
+MergeObject DebugAnalyzer_gui_thread_window.o
+	:
+	ThreadWindow.cpp
+	GeneralPage.cpp
+;
diff --git a/src/apps/debuganalyzer/thread_window/ThreadWindow.cpp b/src/apps/debuganalyzer/gui/thread_window/ThreadWindow.cpp
similarity index 100%
rename from src/apps/debuganalyzer/thread_window/ThreadWindow.cpp
rename to src/apps/debuganalyzer/gui/thread_window/ThreadWindow.cpp
diff --git a/src/apps/debuganalyzer/thread_window/ThreadWindow.h b/src/apps/debuganalyzer/gui/thread_window/ThreadWindow.h
similarity index 100%
rename from src/apps/debuganalyzer/thread_window/ThreadWindow.h
rename to src/apps/debuganalyzer/gui/thread_window/ThreadWindow.h
diff --git a/src/apps/debuganalyzer/main_window/Jamfile b/src/apps/debuganalyzer/main_window/Jamfile
deleted file mode 100644
index 68b8d3e4dc..0000000000
--- a/src/apps/debuganalyzer/main_window/Jamfile
+++ /dev/null
@@ -1,12 +0,0 @@
-SubDir HAIKU_TOP src apps debuganalyzer main_window ;
-
-UsePrivateHeaders debug interface kernel shared ;
-UsePrivateSystemHeaders ;
-
-SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
-
-MergeObject DebugAnalyzer_MainWindow.o
-	:
-	MainWindow.cpp
-	ThreadsPage.cpp
-;
diff --git a/src/apps/debuganalyzer/model/Jamfile b/src/apps/debuganalyzer/model/Jamfile
new file mode 100644
index 0000000000..d50ee887e3
--- /dev/null
+++ b/src/apps/debuganalyzer/model/Jamfile
@@ -0,0 +1,12 @@
+SubDir HAIKU_TOP src apps debuganalyzer model ;
+
+UsePrivateHeaders debug interface kernel shared ;
+UsePrivateSystemHeaders ;
+
+UseHeaders $(HAIKU_DEBUG_ANALYZER_HEADERS) ;
+
+
+MergeObject DebugAnalyzer_model.o
+	:
+	Model.cpp
+;
diff --git a/src/apps/debuganalyzer/Model.cpp b/src/apps/debuganalyzer/model/Model.cpp
similarity index 100%
rename from src/apps/debuganalyzer/Model.cpp
rename to src/apps/debuganalyzer/model/Model.cpp
diff --git a/src/apps/debuganalyzer/Model.h b/src/apps/debuganalyzer/model/Model.h
similarity index 100%
rename from src/apps/debuganalyzer/Model.h
rename to src/apps/debuganalyzer/model/Model.h
diff --git a/src/apps/debuganalyzer/model_loader/Jamfile b/src/apps/debuganalyzer/model_loader/Jamfile
new file mode 100644
index 0000000000..7e2c938e0b
--- /dev/null
+++ b/src/apps/debuganalyzer/model_loader/Jamfile
@@ -0,0 +1,12 @@
+SubDir HAIKU_TOP src apps debuganalyzer model_loader ;
+
+UsePrivateHeaders debug interface kernel shared ;
+UsePrivateSystemHeaders ;
+
+UseHeaders $(HAIKU_DEBUG_ANALYZER_HEADERS) ;
+
+
+MergeObject DebugAnalyzer_model_loader.o
+	:
+	ModelLoader.cpp
+;
diff --git a/src/apps/debuganalyzer/ModelLoader.cpp b/src/apps/debuganalyzer/model_loader/ModelLoader.cpp
similarity index 100%
rename from src/apps/debuganalyzer/ModelLoader.cpp
rename to src/apps/debuganalyzer/model_loader/ModelLoader.cpp
diff --git a/src/apps/debuganalyzer/ModelLoader.h b/src/apps/debuganalyzer/model_loader/ModelLoader.h
similarity index 100%
rename from src/apps/debuganalyzer/ModelLoader.h
rename to src/apps/debuganalyzer/model_loader/ModelLoader.h
diff --git a/src/apps/debuganalyzer/thread_window/Jamfile b/src/apps/debuganalyzer/thread_window/Jamfile
deleted file mode 100644
index ce23c5ddf5..0000000000
--- a/src/apps/debuganalyzer/thread_window/Jamfile
+++ /dev/null
@@ -1,12 +0,0 @@
-SubDir HAIKU_TOP src apps debuganalyzer thread_window ;
-
-UsePrivateHeaders debug interface kernel shared ;
-UsePrivateSystemHeaders ;
-
-SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
-
-MergeObject DebugAnalyzer_ThreadWindow.o
-	:
-	ThreadWindow.cpp
-	GeneralPage.cpp
-;
diff --git a/src/apps/debuganalyzer/DataSource.cpp b/src/apps/debuganalyzer/util/DataSource.cpp
similarity index 100%
rename from src/apps/debuganalyzer/DataSource.cpp
rename to src/apps/debuganalyzer/util/DataSource.cpp
diff --git a/src/apps/debuganalyzer/DataSource.h b/src/apps/debuganalyzer/util/DataSource.h
similarity index 100%
rename from src/apps/debuganalyzer/DataSource.h
rename to src/apps/debuganalyzer/util/DataSource.h
diff --git a/src/apps/debuganalyzer/util/Jamfile b/src/apps/debuganalyzer/util/Jamfile
new file mode 100644
index 0000000000..84a73c7107
--- /dev/null
+++ b/src/apps/debuganalyzer/util/Jamfile
@@ -0,0 +1,13 @@
+SubDir HAIKU_TOP src apps debuganalyzer util ;
+
+UsePrivateHeaders debug interface kernel shared ;
+UsePrivateSystemHeaders ;
+
+UseHeaders $(HAIKU_DEBUG_ANALYZER_HEADERS) ;
+
+
+MergeObject DebugAnalyzer_util.o
+	:
+	DataSource.cpp
+	Variant.cpp
+;
diff --git a/src/apps/debuganalyzer/Variant.cpp b/src/apps/debuganalyzer/util/Variant.cpp
similarity index 100%
rename from src/apps/debuganalyzer/Variant.cpp
rename to src/apps/debuganalyzer/util/Variant.cpp
diff --git a/src/apps/debuganalyzer/Variant.h b/src/apps/debuganalyzer/util/Variant.h
similarity index 100%
rename from src/apps/debuganalyzer/Variant.h
rename to src/apps/debuganalyzer/util/Variant.h