diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 3e85661b990..fc450ee908c 100755
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -24,7 +24,7 @@
 </context>
 <context id ="make_targets_view">
    <description>Click below to see help.</description>
-   <topic href="rreference/cdt_u_make_targets_view.htm"
+   <topic href="reference/cdt_u_make_targets_view.htm"
    	label="Make Targets view"/>
 </context>
 <context id ="editor_view">
@@ -167,24 +167,14 @@
    <topic href="reference/cdt_u_prop_general_idx.htm"
    	label="Indexer"/>
 </context>
-<context id ="std_prop_info">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_info.htm"
-   	label="Info"/>
-</context>
-<context id ="std_prop_builder">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_builders.htm"
-   	label="Builders"/>
-</context>
 <context id ="std_prop_file_types">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_file_types.htm"
+   <topic href="reference/cdt_u_prop_general_typ.htm"
    	label="File Types"/>
 </context>
 <context id ="std_prop_include">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_includes.htm"
+   <topic href="reference/cdt_u_prop_general_pns_inc.htm"
    	label="Include Paths and Symbols"/>
 </context>
 <context id ="std_prop_indexer">
@@ -194,52 +184,52 @@
 </context>
 <context id ="std_prop_build">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_mbuild.htm"
+   <topic href="reference/cdt_u_prop_build.htm"
    	label="Make Builder"/>
 </context>
 <context id ="std_prop_error">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_merror.htm"
+   <topic href="reference/cdt_u_prop_build_settings_errparser.htm"
    	label="Error Parser"/>
 </context>
 <context id ="std_prop_binary">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_mbinary.htm"
+   <topic href="reference/cdt_u_prop_build_settings_binparser.htm"
    	label="Binary Parser"/>
 </context>
 <context id ="std_prop_discovery">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_mdiscovery.htm"
+   <topic href="reference/cdt_u_prop_build_discovery.htm"
    	label="Discovery Options"/>
 </context>
 <context id ="std_prop_source">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_psource.htm"
+   <topic href="reference/cdt_u_prop_general_pns_src.htm"
    	label="Source"/>
 </context>
 <context id ="std_prop_output">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_poutput.htm"
+   <topic href="reference/cdt_u_prop_general_pns_out.htm"
    	label="Output"/>
 </context>
 <context id ="std_prop_projects">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_pproj.htm"
+   <topic href="reference/cdt_u_prop_general_exp.htm"
    	label="Projects"/>
 </context>
 <context id ="std_prop_libraries">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_plib.htm"
+   <topic href="reference/cdt_u_prop_general_pns_lib.htm"
    	label="Libraries"/>
 </context>
 <context id ="std_prop_containers">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_pcontainers.htm"
+   <topic href="reference/cdt_u_prop_general_pns_sym.htm"
    	label="Path Containers"/>
 </context>
 <context id ="std_prop_references">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_ref.htm"
+   <topic href="reference/cdt_u_prop_general_pns_ref.htm"
    	label="Project References"/>
 </context>
 <context id ="new_proj_wiz">
@@ -249,62 +239,57 @@
 </context>
 <context id ="new_proj_wiz_m_name">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_m_name.htm"
+   <topic href="reference/cdt_u_new_proj_wiz_name.htm"
    	label="Name"/>
 </context>
 <context id ="new_proj_wiz_m_target">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_m_target.htm"
+   <topic href="reference/cdt_u_new_proj_wiz_type.htm"
           label="Select a Project Type"/>
 </context>
 <context id ="new_proj_wiz_m_proj">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_m_proj.htm"
+   <topic href="reference/cdt_u_prop_ref.htm"
    	label="Referenced Projects"/>
 </context>
 <context id ="new_proj_wiz_m_errorp">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_m_errorp.htm"
+   <topic href="reference/cdt_u_prop_build_settings_errparser.htm"
    	label="Error Parsers"/>
 </context>
 <context id ="new_proj_wiz_m_cindexer">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_m_cindexer.htm"
+   <topic href="reference/cdt_u_prop_general_idx.htm"
    	label="C/C++ Indexer"/>
 </context>
 <context id ="new_proj_wiz_s_name">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_name.htm"
+   <topic href="reference/cdt_u_new_proj_wiz_name.htm"
    	label="Name"/>
 </context>
 <context id ="new_proj_wiz_s_proj">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_proj.htm"
+   <topic href="reference/cdt_u_prop_ref.htm"
    	label="Referenced Projects"/>
 </context>
-<context id ="new_proj_wiz_s_mbuilder">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_mbuilder.htm"
-   	label="Make Builder"/>
-</context>
 <context id ="new_proj_wiz_s_errorp">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_errorp.htm"
+   <topic href="reference/cdt_u_prop_build_settings_errparser.htm"
    	label="Error Parsers"/>
 </context>
 <context id ="new_proj_wiz_s_binary">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_binary.htm"
+   <topic href="reference/cdt_u_prop_build_settings_binparser.htm"
    	label="Binary Parser"/>
 </context>
 <context id ="new_proj_wiz_s_discovery">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_discovery.htm"
+   <topic href="reference/cdt_u_prop_general_scanner_discovery.htm"
    	label="Discovery Options"/>
 </context>
 <context id ="new_proj_wiz_s_cindexer">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_cindexer.htm"
+   <topic href="reference/cdt_u_prop_general_idx.htm"
    	label="C/C++ Indexer"/>
 </context>
 <context id ="run_dbg_main">
@@ -383,22 +368,22 @@
 </context>             
 <context id="cdt_u_prop_build_setting_tool">
    <description></description>
-   <topic href="reference/cdt_u_prop_build_setting_tool.htm"    	
+   <topic href="reference/cdt_u_prop_build_settings_tool.htm"    	
    label="Tool Settings"/> 
 </context>            
 <context id="cdt_u_prop_build_setting_steps">
    <description></description>
-   <topic href="reference/cdt_u_prop_build_setting_steps.htm"    	
+   <topic href="reference/cdt_u_prop_build_settings_steps.htm"    	
    label="Build Steps"/> 
 </context>           
 <context id="cdt_u_prop_build_setting_artifact">
    <description></description>
-   <topic href="reference/cdt_u_prop_build_setting_artifact.htm"    	
+   <topic href="reference/cdt_u_prop_build_settings_artifact.htm"    	
    label="Build Artifact"/>
 </context>        
 <context id="cdt_u_prop_build_setting_binparser">
    <description></description>
-   <topic href="reference/cdt_u_prop_build_setting_binparser.htm"    	
+   <topic href="reference/cdt_u_prop_build_settings_binparser.htm"    	
    label="Binary Parsers"/> 
 </context>       
 <context id="cdt_u_prop_build_setting_errparser">
@@ -413,43 +398,38 @@
 </context>               
 <context id="cdt_u_prop_pns_inc">
    <description></description>
-   <topic href="reference/cdt_u_prop_pns_inc.htm"    	
+   <topic href="reference/cdt_u_prop_general_pns_inc.htm"    	
    label="Include paths"/> 
 </context>                       
 <context id="cdt_u_prop_pns_sym">
    <description></description>
-   <topic href="reference/cdt_u_prop_pns_sym.htm"    	
+   <topic href="reference/cdt_u_prop_general_pns_sym.htm"    	
    label="Symbols"/> </context>                       
 <context id="cdt_u_prop_pns_libpath">
    <description></description>
-   <topic href="reference/cdt_u_prop_pns_libpath.htm"    	
+   <topic href="reference/cdt_u_prop_general_pns_libpath.htm"    	
    label="Library paths"/> 
 </context>                   
 <context id="cdt_u_prop_pns_lib">
    <description></description>
-   <topic href="reference/cdt_u_prop_pns_lib.htm"    	
+   <topic href="reference/cdt_u_prop_general_pns_lib.htm"    	
    label="Libraries"/> 
 </context>                       
 <context id="cdt_u_prop_pns_ref">
    <description></description>
-   <topic href="reference/cdt_u_prop_pns_ref.htm"    	
+   <topic href="reference/cdt_u_prop_general_pns_ref.htm"    	
    label="References"/> 
 </context>                       
 <context id="cdt_u_prop_pns_src">
    <description></description>
-   <topic href="reference/cdt_u_prop_pns_src.htm"    	
+   <topic href="reference/cdt_u_prop_general_pns_src.htm"    	
    label="Source Location"/> 
 </context>                       
 <context id="cdt_u_prop_pns_out">
    <description></description>
-   <topic href="reference/cdt_u_prop_pns_out.htm"    	
+   <topic href="reference/cdt_u_prop_general_pns_out.htm"    	
    label="Output Locations"/> 
 </context>                       
-<context id="cdt_u_prop_exp">
-   <description></description>
-   <topic href="reference/cdt_u_prop_exp.htm"    	
-   label="Exported data"/> 
-</context>                           
 <context id="cdt_u_prop_resource">
    <description></description>
    <topic href="reference/cdt_u_prop_resource.htm"    	
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
index 3b0360b3bba..5935e7f679e 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
@@ -24,7 +24,7 @@
 </context>					
 <context id ="std_prop_discovery">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_mdiscovery.htm"
+   <topic href="reference/cdt_u_prop_build_discovery.htm"
    	label="Discovery Options"/>
 </context>
 <context id ="cdt_make_builder_page">
@@ -45,52 +45,47 @@
 </context>
 <context id ="new_proj_wiz_s_name">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_name.htm"
+   <topic href="reference/cdt_u_new_proj_wiz_name.htm"
    	label="Name"/>
 </context>
 <context id ="new_proj_wiz_s_proj">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_proj.htm"
+   <topic href="reference/cdt_u_prop_ref.htm.htm"
    	label="Referenced Projects"/>
 </context>
-<context id ="new_proj_wiz_s_mbuilder">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_mbuilder.htm"
-   	label="Make Builder"/>
-</context>
 <context id ="new_proj_wiz_s_errorp">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_errorp.htm"
+   <topic href="reference/cdt_u_prop_build_settings_errparser.htm"
    	label="Error Parsers"/>
 </context>
 <context id ="new_proj_wiz_s_binary">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_binary.htm"
+   <topic href="reference/cdt_u_prop_build_settings_binparser.htm"
    	label="Binary Parser"/>
 </context>
 <context id ="new_proj_wiz_s_discovery">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_discovery.htm"
+   <topic href="reference/cdt_u_prop_general_scanner_discovery.htm"
    	label="Discovery Options"/>
 </context>
 <context id ="new_proj_wiz_s_cindexer">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_new_proj_wiz_s_cindexer.htm"
+   <topic href="reference/cdt_u_prop_general_idx.htm"
    	label="C/C++ Indexer"/>
 </context>
 <context id ="std_prop_build">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_mbuild.htm"
+   <topic href="reference/cdt_u_prop_build.htm"
    	label="Make Builder"/>
 </context>
 <context id ="std_prop_error">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_merror.htm"
+   <topic href="reference/cdt_u_prop_build_settings_errparser.htm"
    	label="Error Parser"/>
 </context>
 <context id ="std_prop_binary">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_sprop_mbinary.htm"
+   <topic href="reference/cdt_u_prop_build_settings_binparser.htm"
    	label="Binary Parser"/>
 </context>
 <context id ="newproj_parser_error">
@@ -110,7 +105,7 @@
 </context>
 <context id ="make_targets_pref">
    <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_make_pref.htm"
+   <topic href="reference/cdt_u_make_targets_pref.htm"
    	label="Make Targets preferences"/>
 </context>
 <context id ="make_settings_pref">
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm
deleted file mode 100644
index 893fe8ede21..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>C/C++ New Project Wizard, Managed Make Project</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-
-<div role="main"><h1>C/C++ New Project Wizard, Managed Make Project</h1>
-<p>This section describes properties for creating a Managed make project in the <strong>C/C++ New Project Wizard</strong>.</p>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_name.htm">Name</a><br>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_target.htm">Select a 
-Project Type</a><br>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_proj.htm">Referenced Projects</a><br>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_cindexer.htm">C/C++ Indexer</a><br>
-
-	
-<p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
-
-</div></body>
-</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_sproj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_sproj.htm
deleted file mode 100644
index 4f6d95f3b21..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_sproj.htm
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>C/C++ New Project Wizard, Standard Make Project</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-
-<div role="main"><h1>C/C++ New Project Wizard, Standard Make Project</h1>
-<p>This section describes properties for creating a Standard make project in the <strong>C/C++ New Project Wizard</strong>.</p>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_s_name.htm">Name</a><br>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_s_proj.htm">Referenced Projects</a><br>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_s_mbuilder.htm">Make Builder</a><br>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_s_errorp.htm">Error Parsers</a><br>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_s_binary.htm">Binary Parser</a><br>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_s_discovery.htm">Discovery Options</a><br>
-		<img src="../images/trans.gif" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_s_cindexer.htm">C/C++ Indexer</a><br>
-	
-<p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
-
-</div></body>
-</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
index 05c8058bf5b..ecadbf38a86 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
@@ -53,7 +53,7 @@
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_pref_build_vars.htm">Build Variables</a><br>
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_console_pref.htm">Console</a><br>
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_environment_pref.htm">Environment</a><br>
-  <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_pref.htm">Make Targets</a><br>
+  <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_targets_pref.htm">Make Targets</a><br>
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_makefile_settings_pref.htm">Makefile Editor</a><br>
   <img src="../images/trans.gif" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_settings_pref.htm">Settings</a><br>
   <img src="../images/trans.gif" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_style_pref.htm">Code Style preferences</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_pref.htm
similarity index 100%
rename from doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_pref.htm
rename to doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_pref.htm
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index dc81c74e83f..a5f9848358b 100755
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -61,7 +61,7 @@
 			<topic label="Build Variables" href="reference/cdt_u_pref_build_vars.htm"/>
 			<topic label="Console" href="reference/cdt_u_console_pref.htm"/>
 			<topic label="Environment" href="reference/cdt_u_environment_pref.htm"/>
-			<topic label="Make Targets" href="reference/cdt_u_make_pref.htm" />
+			<topic label="Make Targets" href="reference/cdt_u_make_targets_pref.htm" />
 			<topic label="Makefile Editor" href="reference/cdt_u_makefile_settings_pref.htm">
 				<topic label="Settings" href="reference/cdt_u_make_settings_pref.htm"/>
 			</topic>