diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index 58ed75e187..970a315f4e 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -27,8 +27,8 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) model ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) settings ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) settings generic ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) source_language ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) source_language expression_evaluators ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) source_language syntax_highlighters ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) source_language c_family ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) source_language x86 ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) types ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface cli ] ;
@@ -211,21 +211,21 @@ Application Debugger :
 	SettingsDescription.cpp
 
 	# source_language
-	CLanguage.cpp
-	CLanguageFamily.cpp
-	CppLanguage.cpp
 	SourceLanguage.cpp
 	SyntaxHighlighter.cpp
 	UnsupportedLanguage.cpp
-	X86AssemblyLanguage.cpp
 
-	# source_language/expression_evaluators
+	# source_language/c_family
+	CLanguage.cpp
 	CLanguageExpressionEvaluator.cpp
-	CLanguageTokenizer.cpp
-
-	# source_language/syntax_highlighters
+	CLanguageFamily.cpp
 	CLanguageFamilySyntaxHighlighter.cpp
 	CLanguageFamilySyntaxHighlightInfo.cpp
+	CLanguageTokenizer.cpp
+	CppLanguage.cpp
+
+	# source_language/x86
+	X86AssemblyLanguage.cpp
 
 	# types
 	ArrayIndexPath.cpp
diff --git a/src/apps/debugger/source_language/CLanguage.cpp b/src/apps/debugger/source_language/c_family/CLanguage.cpp
similarity index 100%
rename from src/apps/debugger/source_language/CLanguage.cpp
rename to src/apps/debugger/source_language/c_family/CLanguage.cpp
diff --git a/src/apps/debugger/source_language/CLanguage.h b/src/apps/debugger/source_language/c_family/CLanguage.h
similarity index 100%
rename from src/apps/debugger/source_language/CLanguage.h
rename to src/apps/debugger/source_language/c_family/CLanguage.h
diff --git a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp b/src/apps/debugger/source_language/c_family/CLanguageExpressionEvaluator.cpp
similarity index 100%
rename from src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp
rename to src/apps/debugger/source_language/c_family/CLanguageExpressionEvaluator.cpp
diff --git a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h b/src/apps/debugger/source_language/c_family/CLanguageExpressionEvaluator.h
similarity index 100%
rename from src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h
rename to src/apps/debugger/source_language/c_family/CLanguageExpressionEvaluator.h
diff --git a/src/apps/debugger/source_language/CLanguageFamily.cpp b/src/apps/debugger/source_language/c_family/CLanguageFamily.cpp
similarity index 100%
rename from src/apps/debugger/source_language/CLanguageFamily.cpp
rename to src/apps/debugger/source_language/c_family/CLanguageFamily.cpp
diff --git a/src/apps/debugger/source_language/CLanguageFamily.h b/src/apps/debugger/source_language/c_family/CLanguageFamily.h
similarity index 100%
rename from src/apps/debugger/source_language/CLanguageFamily.h
rename to src/apps/debugger/source_language/c_family/CLanguageFamily.h
diff --git a/src/apps/debugger/source_language/syntax_highlighters/CLanguageFamilySyntaxHighlightInfo.cpp b/src/apps/debugger/source_language/c_family/CLanguageFamilySyntaxHighlightInfo.cpp
similarity index 100%
rename from src/apps/debugger/source_language/syntax_highlighters/CLanguageFamilySyntaxHighlightInfo.cpp
rename to src/apps/debugger/source_language/c_family/CLanguageFamilySyntaxHighlightInfo.cpp
diff --git a/src/apps/debugger/source_language/syntax_highlighters/CLanguageFamilySyntaxHighlightInfo.h b/src/apps/debugger/source_language/c_family/CLanguageFamilySyntaxHighlightInfo.h
similarity index 100%
rename from src/apps/debugger/source_language/syntax_highlighters/CLanguageFamilySyntaxHighlightInfo.h
rename to src/apps/debugger/source_language/c_family/CLanguageFamilySyntaxHighlightInfo.h
diff --git a/src/apps/debugger/source_language/syntax_highlighters/CLanguageFamilySyntaxHighlighter.cpp b/src/apps/debugger/source_language/c_family/CLanguageFamilySyntaxHighlighter.cpp
similarity index 100%
rename from src/apps/debugger/source_language/syntax_highlighters/CLanguageFamilySyntaxHighlighter.cpp
rename to src/apps/debugger/source_language/c_family/CLanguageFamilySyntaxHighlighter.cpp
diff --git a/src/apps/debugger/source_language/syntax_highlighters/CLanguageFamilySyntaxHighlighter.h b/src/apps/debugger/source_language/c_family/CLanguageFamilySyntaxHighlighter.h
similarity index 100%
rename from src/apps/debugger/source_language/syntax_highlighters/CLanguageFamilySyntaxHighlighter.h
rename to src/apps/debugger/source_language/c_family/CLanguageFamilySyntaxHighlighter.h
diff --git a/src/apps/debugger/source_language/expression_evaluators/CLanguageTokenizer.cpp b/src/apps/debugger/source_language/c_family/CLanguageTokenizer.cpp
similarity index 100%
rename from src/apps/debugger/source_language/expression_evaluators/CLanguageTokenizer.cpp
rename to src/apps/debugger/source_language/c_family/CLanguageTokenizer.cpp
diff --git a/src/apps/debugger/source_language/expression_evaluators/CLanguageTokenizer.h b/src/apps/debugger/source_language/c_family/CLanguageTokenizer.h
similarity index 100%
rename from src/apps/debugger/source_language/expression_evaluators/CLanguageTokenizer.h
rename to src/apps/debugger/source_language/c_family/CLanguageTokenizer.h
diff --git a/src/apps/debugger/source_language/CppLanguage.cpp b/src/apps/debugger/source_language/c_family/CppLanguage.cpp
similarity index 100%
rename from src/apps/debugger/source_language/CppLanguage.cpp
rename to src/apps/debugger/source_language/c_family/CppLanguage.cpp
diff --git a/src/apps/debugger/source_language/CppLanguage.h b/src/apps/debugger/source_language/c_family/CppLanguage.h
similarity index 100%
rename from src/apps/debugger/source_language/CppLanguage.h
rename to src/apps/debugger/source_language/c_family/CppLanguage.h
diff --git a/src/apps/debugger/source_language/X86AssemblyLanguage.cpp b/src/apps/debugger/source_language/x86/X86AssemblyLanguage.cpp
similarity index 100%
rename from src/apps/debugger/source_language/X86AssemblyLanguage.cpp
rename to src/apps/debugger/source_language/x86/X86AssemblyLanguage.cpp
diff --git a/src/apps/debugger/source_language/X86AssemblyLanguage.h b/src/apps/debugger/source_language/x86/X86AssemblyLanguage.h
similarity index 100%
rename from src/apps/debugger/source_language/X86AssemblyLanguage.h
rename to src/apps/debugger/source_language/x86/X86AssemblyLanguage.h