diff --git a/extension/AMBuilder b/extension/AMBuilder
index 56cbb0c..53b927e 100644
--- a/extension/AMBuilder
+++ b/extension/AMBuilder
@@ -43,6 +43,7 @@ def BuildEverything():
 			'dwarf_cfi_to_module.cc',
 			'dwarf_cu_to_module.cc',
 			'dwarf_line_to_module.cc',
+			'dwarf_range_list_handler.cc',
 			'language.cc',
 			'module.cc',
 			'path_helper.cc',
@@ -78,7 +79,7 @@ def BuildEverything():
 			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'common.lib'),
 			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'exception_handler.lib'),
 			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'crash_generation', 'Release', 'lib', 'crash_generation_client.lib'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'libdisasm.lib'),
+			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'third_party', 'libdisasm', 'Release', 'lib', 'libdisasm.lib'),
 			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'processor.lib'),
 		]
 
diff --git a/test/AMBuilder b/test/AMBuilder
index 3cdbbac..4147c6d 100644
--- a/test/AMBuilder
+++ b/test/AMBuilder
@@ -28,31 +28,30 @@ def BuildEverything():
 	extension = AMBuild.AddJob(name)
 	binary = Cpp.ExecutableBuilder(name, AMBuild, extension, compiler)
 
-	sourceFiles = [
+	binary.AddSourceFiles('test', [
 		'test.cpp',
-	]
+	]);
 
 	if AMBuild.target['platform'] in ['linux']:
-		sourceFiles.extend([
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf_cfi_to_module.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf_cu_to_module.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf_line_to_module.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'language.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'module.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'path_helper.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'stabs_reader.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'stabs_to_module.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf', 'bytereader.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf', 'dwarf2diehandler.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf', 'dwarf2reader.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf', 'elf_reader.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'linux', 'crc32.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'linux', 'dump_symbols.cc'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'linux', 'elf_symbols_to_module.cc'),
+		binary.AddSourceFiles(os.path.join('breakpad', 'src', 'src', 'common'), [
+			'dwarf_cfi_to_module.cc',
+			'dwarf_cu_to_module.cc',
+			'dwarf_line_to_module.cc',
+			'dwarf_range_list_handler.cc',
+			'language.cc',
+			'module.cc',
+			'path_helper.cc',
+			'stabs_reader.cc',
+			'stabs_to_module.cc',
+			'dwarf/bytereader.cc',
+			'dwarf/dwarf2diehandler.cc',
+			'dwarf/dwarf2reader.cc',
+			'dwarf/elf_reader.cc',
+			'linux/crc32.cc',
+			'linux/dump_symbols.cc',
+			'linux/elf_symbols_to_module.cc',
 		])
 
-	binary.AddSourceFiles('test', sourceFiles);
-
 	if AMBuild.target['platform'] in ['linux']:
 		libs = [
 			('libbreakpad_client.a', os.path.join('breakpad', 'build', 'src', 'client', 'linux', 'libbreakpad_client.a')),
@@ -74,7 +73,7 @@ def BuildEverything():
 			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'common.lib'),
 			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'exception_handler.lib'),
 			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'crash_generation', 'Release', 'lib', 'crash_generation_client.lib'),
-			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'libdisasm.lib'),
+			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'third_party', 'libdisasm', 'Release', 'lib', 'libdisasm.lib'),
 			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'processor.lib'),
 		]