diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index b9cdfbd723..2629ec2bbd 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -7,15 +7,17 @@ UsePrivateHeaders kernel shared ;
 UsePrivateSystemHeaders ;
 
 Application Debugger :
-	attribute_classes.cpp
-	AttributeValue.cpp
 	debugger.cpp
-	DebugInfoEntries.cpp
-	DebugInfoEntry.cpp
-	DwarfManager.cpp
 	ElfFile.cpp
-	SourceLanguageInfo.cpp
-	tag_names.cpp
+
+# DWARF
+#	attribute_classes.cpp
+#	AttributeValue.cpp
+#	DebugInfoEntries.cpp
+#	DebugInfoEntry.cpp
+#	DwarfManager.cpp
+#	SourceLanguageInfo.cpp
+3	tag_names.cpp
 
 	: $(TARGET_LIBSUPC++)
 ;
diff --git a/src/apps/debugger/AttributeValue.cpp b/src/apps/debugger/dwarf/AttributeValue.cpp
similarity index 100%
rename from src/apps/debugger/AttributeValue.cpp
rename to src/apps/debugger/dwarf/AttributeValue.cpp
diff --git a/src/apps/debugger/AttributeValue.h b/src/apps/debugger/dwarf/AttributeValue.h
similarity index 100%
rename from src/apps/debugger/AttributeValue.h
rename to src/apps/debugger/dwarf/AttributeValue.h
diff --git a/src/apps/debugger/DataReader.h b/src/apps/debugger/dwarf/DataReader.h
similarity index 100%
rename from src/apps/debugger/DataReader.h
rename to src/apps/debugger/dwarf/DataReader.h
diff --git a/src/apps/debugger/DebugInfoEntries.cpp b/src/apps/debugger/dwarf/DebugInfoEntries.cpp
similarity index 100%
rename from src/apps/debugger/DebugInfoEntries.cpp
rename to src/apps/debugger/dwarf/DebugInfoEntries.cpp
diff --git a/src/apps/debugger/DebugInfoEntries.h b/src/apps/debugger/dwarf/DebugInfoEntries.h
similarity index 100%
rename from src/apps/debugger/DebugInfoEntries.h
rename to src/apps/debugger/dwarf/DebugInfoEntries.h
diff --git a/src/apps/debugger/DebugInfoEntry.cpp b/src/apps/debugger/dwarf/DebugInfoEntry.cpp
similarity index 100%
rename from src/apps/debugger/DebugInfoEntry.cpp
rename to src/apps/debugger/dwarf/DebugInfoEntry.cpp
diff --git a/src/apps/debugger/DebugInfoEntry.h b/src/apps/debugger/dwarf/DebugInfoEntry.h
similarity index 100%
rename from src/apps/debugger/DebugInfoEntry.h
rename to src/apps/debugger/dwarf/DebugInfoEntry.h
diff --git a/src/apps/debugger/DwarfManager.cpp b/src/apps/debugger/dwarf/DwarfManager.cpp
similarity index 100%
rename from src/apps/debugger/DwarfManager.cpp
rename to src/apps/debugger/dwarf/DwarfManager.cpp
diff --git a/src/apps/debugger/DwarfManager.h b/src/apps/debugger/dwarf/DwarfManager.h
similarity index 100%
rename from src/apps/debugger/DwarfManager.h
rename to src/apps/debugger/dwarf/DwarfManager.h
diff --git a/src/apps/debugger/SourceLanguageInfo.cpp b/src/apps/debugger/dwarf/SourceLanguageInfo.cpp
similarity index 100%
rename from src/apps/debugger/SourceLanguageInfo.cpp
rename to src/apps/debugger/dwarf/SourceLanguageInfo.cpp
diff --git a/src/apps/debugger/SourceLanguageInfo.h b/src/apps/debugger/dwarf/SourceLanguageInfo.h
similarity index 100%
rename from src/apps/debugger/SourceLanguageInfo.h
rename to src/apps/debugger/dwarf/SourceLanguageInfo.h
diff --git a/src/apps/debugger/attribute_classes.cpp b/src/apps/debugger/dwarf/attribute_classes.cpp
similarity index 100%
rename from src/apps/debugger/attribute_classes.cpp
rename to src/apps/debugger/dwarf/attribute_classes.cpp
diff --git a/src/apps/debugger/attribute_classes.h b/src/apps/debugger/dwarf/attribute_classes.h
similarity index 100%
rename from src/apps/debugger/attribute_classes.h
rename to src/apps/debugger/dwarf/attribute_classes.h
diff --git a/src/apps/debugger/dwarf.h b/src/apps/debugger/dwarf/dwarf.h
similarity index 100%
rename from src/apps/debugger/dwarf.h
rename to src/apps/debugger/dwarf/dwarf.h
diff --git a/src/apps/debugger/tag_names.cpp b/src/apps/debugger/dwarf/tag_names.cpp
similarity index 100%
rename from src/apps/debugger/tag_names.cpp
rename to src/apps/debugger/dwarf/tag_names.cpp
diff --git a/src/apps/debugger/tag_names.h b/src/apps/debugger/dwarf/tag_names.h
similarity index 100%
rename from src/apps/debugger/tag_names.h
rename to src/apps/debugger/dwarf/tag_names.h
diff --git a/src/apps/debugger/types.h b/src/apps/debugger/dwarf/types.h
similarity index 100%
rename from src/apps/debugger/types.h
rename to src/apps/debugger/dwarf/types.h