diff --git a/src/apps/debuganalyzer/Jamfile b/src/apps/debuganalyzer/Jamfile
index 1e7cfc8471..3c2741911d 100644
--- a/src/apps/debuganalyzer/Jamfile
+++ b/src/apps/debuganalyzer/Jamfile
@@ -3,6 +3,8 @@ SubDir HAIKU_TOP src apps debuganalyzer ;
 UsePrivateHeaders debug interface kernel shared ;
 UsePrivateSystemHeaders ;
 
+SEARCH_SOURCE += [ FDirName $(SUBDIR) main_window ] ;
+
 Application DebugAnalyzer
 	:
 	DataSource.cpp
diff --git a/src/apps/debuganalyzer/MainWindow.cpp b/src/apps/debuganalyzer/main_window/MainWindow.cpp
similarity index 100%
rename from src/apps/debuganalyzer/MainWindow.cpp
rename to src/apps/debuganalyzer/main_window/MainWindow.cpp
diff --git a/src/apps/debuganalyzer/MainWindow.h b/src/apps/debuganalyzer/main_window/MainWindow.h
similarity index 100%
rename from src/apps/debuganalyzer/MainWindow.h
rename to src/apps/debuganalyzer/main_window/MainWindow.h
diff --git a/src/apps/debuganalyzer/ThreadsPage.cpp b/src/apps/debuganalyzer/main_window/ThreadsPage.cpp
similarity index 100%
rename from src/apps/debuganalyzer/ThreadsPage.cpp
rename to src/apps/debuganalyzer/main_window/ThreadsPage.cpp
diff --git a/src/apps/debuganalyzer/ThreadsPage.h b/src/apps/debuganalyzer/main_window/ThreadsPage.h
similarity index 100%
rename from src/apps/debuganalyzer/ThreadsPage.h
rename to src/apps/debuganalyzer/main_window/ThreadsPage.h