diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/doc/mainpage.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/doc/packagedoc.h
similarity index 96%
rename from AtlasTest/DatabaseTest/AthenaDBTestRec/doc/mainpage.h
rename to AtlasTest/DatabaseTest/AthenaDBTestRec/doc/packagedoc.h
index a2b758fe2c8a2d7288c692b67600d649034148fb..1e8c794561bfadfc1c09165f0461b38b224705ba 100644
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/doc/mainpage.h
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 in/**
-\mainpage AthenaDBTestRec package
+@page AthenaDBTestRec_page AthenaDBTestRec package
 
-\section introductionAthenaDBTestRec Introduction
+@section AthenaDBTestRec_introductionAthenaDBTestRec Introduction
 
 The AthenaDBTestRec package provides a number of tools to help study and 
 evaluate the performance of the conditions database in the context of
@@ -20,7 +20,7 @@ Athena, configured using a joboption file specifed by TestCoolRecWriter.
   can be used to study the use of detector store objects under conditions 
   database control.
 
-\section TestCoolRecWriter
+@section AthenaDBTestRec_TestCoolRecWriter 
 
 This standalone application fills a COOL conditions database according to 
 a folder structure specification given in a configuration file. It is designed
@@ -51,7 +51,7 @@ to read back.
  - time0: initial timestamp, in seconds (default 0)
  - timerun: time per run, in seconds (default 3600)
 
-\section ConfigurationFile Configuration File
+@section AthenaDBTestRec_ConfigurationFile Configuration File
 
 The TestCoolRecWriter configuration file defines one or several database 
 folders. Each line starts with a keyword (case senstive) followed by 
@@ -122,7 +122,7 @@ POOL files are named according to the setting of the <filestem> parameter, as
 the filename is simple <poolstem>.root. POOL files are created and registered 
 in the local PoolFileCatalog.xml in the usual way. If a file with the same
 name is already present and registered in the catalogue, data is appended to it.
-\section TestCoolRecRead
+@section AthenaDBTestRec_TestCoolRecRead 
 
 TestCoolRecRead is an Athena algorithm for reading back data stored with
 TestCoolRecWriter. The algorithm is configured using joboptions to set which
@@ -184,7 +184,7 @@ The TestCoolRecExample job options.py file:
 
 @include TestCoolRecExample.py
 
-\section Reference Workloads
+@section AthenaDBTestRec_Reference Workloads
 
 An initial reference workload has been defined in the file refc1301.txt in
 the config directory. This defines 50 folders each containing 32 channels
@@ -265,7 +265,7 @@ be replaced by absolute pathnames in this case.
 
 
 
-\section DetStoreDump
+@section AthenaDBTestRec_DetStoreDump 
 
 DetStoreDump is a very simple algorithm that calls the Storegate dump method 
 on the detector store, at initialisation or at execute for the first event.
@@ -277,15 +277,13 @@ The DetStoreDump_jobOptions.py file:
 @include DetStoreDump_jobOptions.py
 
 
-@section requirements requirements 
+@section AthenaDBTestRec_requirements requirements
 
 The package requirements file:
 
-@include requirements
 
-@section uses Packages used
+@section AthenaDBTestRec_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
 
diff --git a/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/MainPage.h b/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/MainPage.h
deleted file mode 100755
index 813626dc29c96d2179554bdef3d54b6ee57ae57d..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/MainPage.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @mainpage
- *
- * @section purpose Purpose: Test ESD / AOD readability
- *
- * @section requirements requirements
- * 
- * @include requirements
- * 
- * @section Links Links to used packages
- * 
- * @htmlinclude used_packages.html
- * 
- */
diff --git a/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/packagedoc.h b/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..5fb11e4900ef2e8beb3524e707dc4c417570a739
--- /dev/null
+++ b/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/doc/packagedoc.h
@@ -0,0 +1,16 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+@page AthenaPoolDataModelTest_page @mainpage
+ *
+@section AthenaPoolDataModelTest_@section purpose Purpose: Test ESD / AOD readability
+ *
+@section AthenaPoolDataModelTest_@section requirements requirements
+ * 
+ * 
+@section AthenaPoolDataModelTest_@section Links Links to used packages
+ * 
+ * 
+ */
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/MainPage.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/MainPage.h
rename to AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/packagedoc.h
index 2d6cd65ddff17b6f1f2875494b5e416f6fe226a6..e423132b3a941e9d92b146c8c7ce0583aa093990
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/MainPage.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/doc/packagedoc.h
@@ -3,27 +3,27 @@
 */
 
 /**
- * @mainpage
+@page AthenaPoolMultiTest_page @mainpage
  *
  * @date 26 May 2009 J. Cranshaw
  *
- * @section Purpose Purpose: TEST
+@section AthenaPoolMultiTest_@section Purpose Purpose: TEST
  *
  * AthenaPoolMultiTest is the part of the DatabaseTest packages 
  * that checks functionality which requires multiple files or 
  * multiple streams. 
  * <br> <br>
- * @section One Dependencies and Associations
+@section AthenaPoolMultiTest_@section One Dependencies and Associations
  * It uses algorithms from AthenaPoolExampleAlgorithms to create 
  * the dummy data. The dummy data classes are defined in 
  * AthenaPoolExampleData and AthenaPoolTestData.
  * <br><br>
- * @section Two Components
+@section AthenaPoolMultiTest_@section Two Components
  * The algorithms defined here serve as test filters to be applied to output streams 
  * (EventSplit, PassAllFilter, PassNoneFilter), utilities useful for the generating test data (AddTrigMap), 
  * tag building (EventTagWriter, RunEventTagWriter), 
  * and utilities for validation (EventTagReader, EventCheck).
- * @section Three Running the Tests
+@section AthenaPoolMultiTest_@section Three Running the Tests
  * The tests which run in the nightlies are defined in the requirements 
  * file using the athenarun_test pattern. They show up in the nightly 
  * test report under the package name. The reference files are in the 
@@ -49,12 +49,10 @@
  * </ul>
  * <br>
  *
- * @section requirements requirements
+@section AthenaPoolMultiTest_@section requirements requirements
  *
- * @include requirements
  *
- * @section Links Links to used packages
+@section AthenaPoolMultiTest_@section Links Links to used packages
  *
- * @htmlinclude used_packages.html
  *
  */
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/doc/MainPage.h b/AtlasTest/DatabaseTest/AthenaPoolTest/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/doc/MainPage.h
rename to AtlasTest/DatabaseTest/AthenaPoolTest/doc/packagedoc.h
index f135c4fdee2c13176530c845ae97163f8e640b2e..7efa57ccbcd18351eccc989abd4df54c2845e299
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/doc/MainPage.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page AthenaPoolTest_page 
 
 AthenaPoolTest is a package containing tests of I/O for
 AthenaPOOL. The tests write and read data objects which are both
@@ -28,7 +28,7 @@ event. Different features of I/O are also tested, i.e.
   - Adding of detector description tags to the EventInfo object
 
 
-@section HowTheTestWork How the tests work
+@section AthenaPoolTest_HowTheTestWork How the tests work
 
 Currently the tests are run using the athenarun_test pattern. This
 allows a pre and a post script to be run before/after an athena
@@ -45,7 +45,7 @@ as specified by a selection string, which is typically the algorithm
 name which appears in the output.
 
 
-@section TheTests The tests
+@section AthenaPoolTest_TheTests The tests
 
 The following tests are currently being run:
 
@@ -144,13 +144,11 @@ The following tests are currently being run:
     .
   .
 
-@section requirements requirements 
+@section AthenaPoolTest_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section AthenaPoolTest_uses Packages used
 
-@htmlinclude used_packages.html
 
 
 */
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/MainPage.h b/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/MainPage.h
deleted file mode 100755
index c6a00bce8127ecbcda93bcc920d45c7864306687..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/MainPage.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- *
- * @mainpage
- *
- * @section purpose  Purpose: POOL CONVERTERS
- * 
- * This package generates the pool converters for the classes 
- * defined in AthenaPoolTestData using the poolcnv pattern.
- * 
- * @section requirements requirements
- * 
- * @include requirements
- * 
- * @section Links Links to used packages
- * 
- * @htmlinclude used_packages.html
- * 
-*/
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/packagedoc.h b/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..380eb6a09dcb40d1dd21ca48b9dc2d81b0c73e2d
--- /dev/null
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/doc/packagedoc.h
@@ -0,0 +1,20 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ *
+@page AthenaPoolTestAthenaPool_page @mainpage
+ *
+@section AthenaPoolTestAthenaPool_@section purpose Purpose: POOL CONVERTERS
+ * 
+ * This package generates the pool converters for the classes 
+ * defined in AthenaPoolTestData using the poolcnv pattern.
+ * 
+@section AthenaPoolTestAthenaPool_@section requirements requirements
+ * 
+ * 
+@section AthenaPoolTestAthenaPool_@section Links Links to used packages
+ * 
+ * 
+*/
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/doc/MainPage.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 52%
rename from AtlasTest/DatabaseTest/AthenaPoolTestData/doc/MainPage.h
rename to AtlasTest/DatabaseTest/AthenaPoolTestData/doc/packagedoc.h
index 606f726cb5130c8d03b2403d2a883c128f5096cf..50266642f4f35434480414f7043dbd066d086756
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/doc/MainPage.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/doc/packagedoc.h
@@ -3,20 +3,18 @@
 */
 
 /**
- * @mainpage
+@page AthenaPoolTestData_page @mainpage
  *
- * @section purpose Purpose: DATA DEFINITION
+@section AthenaPoolTestData_@section purpose Purpose: DATA DEFINITION
  *
  * This package contains the classes used by the other test packages 
  * for the stored data. Dictionaries are then built using the lcgdict 
  * pattern.
  * 
- * @section requirements requirements
+@section AthenaPoolTestData_@section requirements requirements
  * 
- * @include requirements
  * 
- * @section Links Links to used packages
+@section AthenaPoolTestData_@section Links Links to used packages
  * 
- * @htmlinclude used_packages.html
  * 
  */
diff --git a/AtlasTest/DatabaseTest/CoraCoolTest/doc/mainpage.h b/AtlasTest/DatabaseTest/CoraCoolTest/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from AtlasTest/DatabaseTest/CoraCoolTest/doc/mainpage.h
rename to AtlasTest/DatabaseTest/CoraCoolTest/doc/packagedoc.h
index 87fdac1d4a45462ab8ca05cbcd5d4c6d1b972c85..f58306f3ba8666324ad5ddf32f6477539bc3a290
--- a/AtlasTest/DatabaseTest/CoraCoolTest/doc/mainpage.h
+++ b/AtlasTest/DatabaseTest/CoraCoolTest/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage CoraCoolTest package
+@page CoraCoolTest_page CoraCoolTest package
 
-\section introductionCoraCoolTest Introduction
+@section CoraCoolTest_introductionCoraCoolTest Introduction
 
 The CoraCoolTest package provides various examples and test codes for the 
 CoraCool database API (found in the Database/CoraCool package) that provides
@@ -13,7 +13,7 @@ an interface for storing conditions DB data in COOL but with the payload in
 a separate table managed directly by CORAL. At present, this package only 
 includes the CoraCoolExample program.
 
-\section CoraCoolExample
+@section CoraCoolTest_CoraCoolExample 
 
 The CoraCoolExample class provides a standalone executable command 
 CoraCoolExample.exe, which exercises the storing and retrieving of data through the CoraCool API. This functions both as a simple test of the API,
@@ -51,12 +51,10 @@ types (signed and unsigned ints and long longs, floats and doubles), plus
 optionally a Coral BLOB. Created objects include information on the channel and IOV they were created for, so data read back from the database can be
 checked for consistency.
 
-@section requirements requirements
+@section CoraCoolTest_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section CoraCoolTest_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
diff --git a/AtlasTest/DatabaseTest/RDBAccessTest/doc/MainPage.h b/AtlasTest/DatabaseTest/RDBAccessTest/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from AtlasTest/DatabaseTest/RDBAccessTest/doc/MainPage.h
rename to AtlasTest/DatabaseTest/RDBAccessTest/doc/packagedoc.h
index 48ce9a6b08dc6942dc3f625de347ad1df3a656de..0f0eb7992bd088b09a140c18f5d31daa2cb2d1d0
--- a/AtlasTest/DatabaseTest/RDBAccessTest/doc/MainPage.h
+++ b/AtlasTest/DatabaseTest/RDBAccessTest/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page RDBAccessTest_page 
 
 RDBAccessTest is a simple test demonstrating the usage of RDBAccessSvc.
 At the initialization phase the algorithm is connecting to the database
@@ -24,7 +24,5 @@ and the field values are printed out.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/doc/MainPage.h b/AtlasTest/DatabaseTest/TagCollectionTest/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from AtlasTest/DatabaseTest/TagCollectionTest/doc/MainPage.h
rename to AtlasTest/DatabaseTest/TagCollectionTest/doc/packagedoc.h
index 93166f00361babbe721a5b91fc195c4fd5c4ee0f..38af908074e0faee3220e062a01c864fcec8aa23
--- a/AtlasTest/DatabaseTest/TagCollectionTest/doc/MainPage.h
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page TagCollectionTest_page 
 
 TagCollectionTest provides some simple tests of the POOL Collection 
 integration with the ATLAS Athena framework. It also contains a
@@ -15,12 +15,12 @@ handled by the utility include ROOT and MySQL. This package was originally
 implemented as part of an ATLAS offline database test suite used in the 
 Data Challenge 2 exercises.
 
-@section Tests Tests 
+@section TagCollectionTest_Tests Tests
 
 The table in coverage.html gives a summary of the test coverage for the Root Collection 
 building using the RegistrationStream. 
 
-@section Components Components
+@section TagCollectionTest_Components Components
 
 The package includes 3 classes called EventTagWriter, EventTagReader,
 RunEventTagWriter each of which inherits from the Gaudi Algorithm class. 
@@ -47,7 +47,7 @@ and/or event number. The collections can be of type ROOT or MySQL.
 See the following section for further details on usage. Regression tests of 
 this utility are included in the nightly build and are described below.
 
-@section JobOptions Job Options
+@section TagCollectionTest_JobOptions Job Options
 
 The tests in TagCollectionTest are run via the following set of Athena Python 
 job options files:
@@ -184,14 +184,14 @@ read back the respective collections created by the first 3 job options files.
 @include test_ReadSimpleMySQLCollection.py
 @include test_ReadSimpleMySQLltCollection.py
 
-@section SourceCode Source Code
+@section TagCollectionTest_SourceCode Source Code
 
 TagCollectionTest resides in the package AtlasTest/DatabaseTest and can be 
 browsed in the ATLAS CVS repository via, for instance, the following URL:
 
 http://atlassw1.phy.bnl.gov/lxr/source/atlas/AtlasTest/DatabaseTest/TagCollectionTest
 
-@section RegressionTests Regression Tests
+@section TagCollectionTest_RegressionTests Regression Tests
 
 The test directory of the TagCollectionTest package contains the necessary
 script, reference and pattern files to perform regression tests on the
@@ -205,7 +205,7 @@ found in the package AtlasTest/TestTools:
 
 http://atlassw1.phy.bnl.gov/lxr/source/atlas/AtlasTest/TestTools/scripts/nightlies/
 
-@section ExtraPages Extra Pages
+@section TagCollectionTest_ExtraPages Extra Pages
 
  - @ref UsedPackagesTagCollectionTest
  - @ref RequirementsTagCollectionTest
@@ -213,11 +213,9 @@ http://atlassw1.phy.bnl.gov/lxr/source/atlas/AtlasTest/TestTools/scripts/nightli
 
 /**
 @page UsedPackagesTagCollectionTest Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTagCollectionTest Requirements 
-@include requirements
 */
 
diff --git a/AtlasTest/TestTools/doc/MainPage.h b/AtlasTest/TestTools/doc/packagedoc.h
similarity index 91%
rename from AtlasTest/TestTools/doc/MainPage.h
rename to AtlasTest/TestTools/doc/packagedoc.h
index df825d7670f211ff84389b902e42d5af2f093df0..1c6df01007277c0ece5d4cdecc4cb36df7d86426 100644
--- a/AtlasTest/TestTools/doc/MainPage.h
+++ b/AtlasTest/TestTools/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-   \mainpage
+@page TestTools_page 
 
 This package contains a few tools to help writing unit tests. 
 
-\section UnitTest_run The UnitTest_run cmt pattern
+@section TestTools_UnitTest_run The UnitTest_run cmt pattern
 
 TestTools requirements file defines the cmt pattern UnitTest_run. UnitTest_run 
 will compile, link and run a standalone C++ program when a "gmake check" 
@@ -40,7 +40,7 @@ reported by ChronoStatSvc or the package versions and even in certain cases
 pointer addresses). This is currently done in a very naive fashion (using 
 diff -I option) but a more sophisticated "diff" script is in the plans
 
-\section initGaudi The initGaudi functions
+@section TestTools_initGaudi The initGaudi functions
 TestTools/initGaudi.h defines two functions in the namespace Athena_test 
 to initialize Gaudi ApplicationMgr 
 and be able to run using core Gaudi services. An optional string argument
@@ -48,7 +48,7 @@ and be able to run using core Gaudi services. An optional string argument
  $PKGROOT/share/<jobOptsFile>
 to configure your job
 
-\section scripts Scripts
+@section TestTools_scripts Scripts
  - share/runUnitTests.sh is a sh script that cmt broadcasts gmake check
  and filter its output. It is 
 installed in the run area. It accepts one or more arguments that it passes
@@ -59,7 +59,7 @@ to cmt broadcast, for example
  - share/post.sh is a script used by the UnitTest_run pattern to 
 analize a job output 
 
-\section toys Toys 
+@section TestTools_toys Toys
 
 The TestTools component library provides toy implementations of a number of
 typical Gaudi classes, namely ToyConverter, ToyConversionSvc (and soon 
@@ -68,7 +68,7 @@ ToyAlgorithm). These are made available via the job opts file
 
 
 
-\section Examples Examples
+@section TestTools_Examples Examples
 
 The package AthenaTests/ControlTests contains several examples that use
 the initGaudi function.
@@ -78,7 +78,7 @@ that show
  - how to link the test program with an extra library (e.g. Clear_Store) 
  - how to use the ToyConversionSvc provided by TestTools (ProxyProviderSvc)
 
-\section links More info
+@section TestTools_links More info
 The package can be browsed using LXR 
 (http://atlassw1.phy.bnl.gov/lxr/source/atlas/AtlasTest/TestTools/)
 
diff --git a/Calorimeter/CaloCalibHitRec/doc/mainpage.h b/Calorimeter/CaloCalibHitRec/doc/packagedoc.h
similarity index 87%
rename from Calorimeter/CaloCalibHitRec/doc/mainpage.h
rename to Calorimeter/CaloCalibHitRec/doc/packagedoc.h
index 4b840533de41afe540ffb0e402d215d6ad7b96f0..8254a7e30111c81271f5627aae9c6992c0c32bd9 100644
--- a/Calorimeter/CaloCalibHitRec/doc/mainpage.h
+++ b/Calorimeter/CaloCalibHitRec/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloCalibHitRec Package
+@page CaloCalibHitRec_page CaloCalibHitRec Package
 
 This package provides algorithms to have LAr/Tile calorimeter calibration hits in CBNTAA.
 Also it contains classes for accessing to geometry information of the dead material calibration hits.
diff --git a/Calorimeter/CaloClusterCorrection/doc/mainpage.h b/Calorimeter/CaloClusterCorrection/doc/packagedoc.h
similarity index 84%
rename from Calorimeter/CaloClusterCorrection/doc/mainpage.h
rename to Calorimeter/CaloClusterCorrection/doc/packagedoc.h
index 0ab38289fa9938c75569bcbc352102c1a98c71da..293e321bfc0bbc3cf5ebe0645412cdce6161049e 100644
--- a/Calorimeter/CaloClusterCorrection/doc/mainpage.h
+++ b/Calorimeter/CaloClusterCorrection/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloClusterCorrection Package
+@page CaloClusterCorrection_page CaloClusterCorrection Package
 
 This package provides tools for calorimeter cluster corrections 
 
@@ -15,13 +15,13 @@ The tools are specific for sliding window clusters and Topological clusters
 
 @author Scott Snyder  <snyder@bnl.gov>
 
-@section BaseClass ----Base classes
+@section CaloClusterCorrection_BaseClass ----Base classes
 
 CaloClusterCorrectionCommon
 
 CaloClusterCorrection
 
-@section ConcreteTools  ----Concrete implementation
+@section CaloClusterCorrection_ConcreteTools ----Concrete implementation
 
 CaloClusterLocalCalibCone
 
diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/doc/mainpage.h b/Calorimeter/CaloCnv/CaloAthenaPool/doc/packagedoc.h
similarity index 81%
rename from Calorimeter/CaloCnv/CaloAthenaPool/doc/mainpage.h
rename to Calorimeter/CaloCnv/CaloAthenaPool/doc/packagedoc.h
index 4adc93d369b89dbfe92c97673638a079478074c9..e92ac939c411a1f5e32c54a5f4af6a6027005536 100644
--- a/Calorimeter/CaloCnv/CaloAthenaPool/doc/mainpage.h
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloAthenaPool Package
+@page CaloAthenaPool_page CaloAthenaPool Package
 
 This package provides POOL persistency event data classes.
 
@@ -17,16 +17,16 @@ Calorimeter/CaloCnv/CaloTPCnv package.
 @author Walter Lampl <walter.lampl@cern.ch>
 @author RD Schaffer  <R.D.Schaffer@cern.ch>
 
-@section CaloCell  ---- CaloCell persistency
+@section CaloAthenaPool_CaloCell ---- CaloCell persistency
 The persistent CaloCell is CaloCompactCell in CaloEvent. The compatification is defined by CaloCompactCellTool in CaloTools package, and used by the POOL converter.
 
-@section CaloCluster   ---- CaloCluster  persistency
+@section CaloAthenaPool_CaloCluster ---- CaloCluster persistency
 CaloCluster consists of Links to CaloCell and CaloShower (objects in event store)  and two split stores, CaloClusterMement and CaloSamplingData (contained within CaloCluster).  Each of these has persistent data structure. 
 
-@section CaloTower    ---- CaloTower persistency
+@section CaloAthenaPool_CaloTower ---- CaloTower persistency
 CaloTowerContainer contains the towers and the tower segmentation. Only the Tower segmentation has the persistent form, the towers are recreated from cells on the fly using tower builder tools.  This means CaloCellContainer has to be present in the event data store, if CaloTowerContainer is needed.
 
-@section Converters  ---- POOL Converters 
+@section CaloAthenaPool_Converters ---- POOL Converters
 
 CaloCellContainerCnv
 
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/doc/MainPage.h b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/doc/packagedoc.h
similarity index 93%
rename from Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/doc/MainPage.h
rename to Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/doc/packagedoc.h
index 3e4bf1e3e8ffb534c43581d9f7010e0e7616b87e..60cffbb14cfa907d231e4cc05116487a8f962b07 100644
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/doc/MainPage.h
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page CaloDetMgrDetDescrCnv_page 
 
 The package includes converters for the following managers: CaloDetDescrManager, CaloTTDescrManager.
 
@@ -23,7 +23,5 @@ or accessed from the detector store.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/doc/mainpage.h b/Calorimeter/CaloCnv/CaloIdCnv/doc/packagedoc.h
similarity index 90%
rename from Calorimeter/CaloCnv/CaloIdCnv/doc/mainpage.h
rename to Calorimeter/CaloCnv/CaloIdCnv/doc/packagedoc.h
index f483ca124fb76a7dc249c6e487da1d9159c69b6a..73563281e70fe7508f3d97a4ef658394f28bae1c 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/doc/mainpage.h
+++ b/Calorimeter/CaloCnv/CaloIdCnv/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page CaloIdCnv_page 
 
 The CaloIdCnv package contains the converters which are necessary
 to initialize the Calorimeter helpers and identifier managers. <br>
@@ -15,8 +15,6 @@ TileTBID helper is a bit special - it is not used for normal calorimeter cells,
 but used for MBTS cells in full ATLAS reconstruction as
 well as for ancillary detectors at the testbeam (like Muon Wall or beam chambers)
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Calorimeter/CaloCnv/CaloJiveXML/doc/mainpage.h b/Calorimeter/CaloCnv/CaloJiveXML/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Calorimeter/CaloCnv/CaloJiveXML/doc/mainpage.h
rename to Calorimeter/CaloCnv/CaloJiveXML/doc/packagedoc.h
index bf220e243521d7f1c4cd059cff337db32f5bfac9..5e100d0840bb37b617954ed7d8173a37656dd606
--- a/Calorimeter/CaloCnv/CaloJiveXML/doc/mainpage.h
+++ b/Calorimeter/CaloCnv/CaloJiveXML/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page CaloJiveXML_page 
 @author Nikos.Konstantinidis -at- cern.ch, Eric.Jansen -at- hef.ru.nl, Juergen.Thomas -at- cern.ch
-@section IntroCaloJiveXML Introduction
+@section CaloJiveXML_IntroCaloJiveXML Introduction
 
 This package contains the AlgToos that produce the XML fragments of Calorimeter related datatypes for the XML files read by atlantis.
 The AlgTools, all inheriting from JiveXML::DataRetriever, are the following:
@@ -19,8 +19,6 @@ The AlgTools, all inheriting from JiveXML::DataRetriever, are the following:
    - JiveXML::CaloTBRetriever : largely obsolete now, it was used for CTB-2004 data, to access the information about the rotation of the calorimeters in the CTB setup.
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Calorimeter/CaloCnv/CaloTPCnv/doc/mainpage.h b/Calorimeter/CaloCnv/CaloTPCnv/doc/packagedoc.h
similarity index 86%
rename from Calorimeter/CaloCnv/CaloTPCnv/doc/mainpage.h
rename to Calorimeter/CaloCnv/CaloTPCnv/doc/packagedoc.h
index a1b1cf19b73c63fb12490904ade1defc0b4615c0..e52af1ea3bd1ceed0e409f2d7cb3986e523a6f16 100644
--- a/Calorimeter/CaloCnv/CaloTPCnv/doc/mainpage.h
+++ b/Calorimeter/CaloCnv/CaloTPCnv/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloTPCnv Package
+@page CaloTPCnv_page CaloTPCnv Package
 
 This package provides POOL persistent representation for Calo event data classes and the T/P converters. 
 
@@ -14,10 +14,10 @@ Calo event data classes are T/P separated, and the POOL Converters are in Calori
 
 @author RD Schaffer  <R.D.Schaffer@cern.ch>
 
-@section CaloCell  ---- CaloCell persistency
+@section CaloTPCnv_CaloCell ---- CaloCell persistency
 The persistent CaloCellContainer is CaloCompactCellContainer in CaloEvent. The compatification is defined by CaloCompactCellTool in CaloTools package, and used by the POOL converter.  No persistent data or tool defined here for CaloCell in this package. 
 
-@section CaloCluster   ---- CaloCluster  persistency
+@section CaloTPCnv_CaloCluster ---- CaloCluster persistency
 CaloCluster consists of Links to CaloCell and CaloShower (objects in event store)  and two split stores, CaloClusterMement and CaloSamplingData (contained within CaloCluster).  Each of these has persistent data structure:
 
 CaloCellLinkContainer_p2
@@ -30,12 +30,12 @@ CaloSamplingDataContainer_p1 and CaloSamplingData_p1
 
 CaloShowerContainer_p2
 
-@section CaloTower    ---- CaloTower persistency
+@section CaloTPCnv_CaloTower ---- CaloTower persistency
 CaloTowerContainer contains the towers and the tower segmentation. Only the Tower segmentation has the persistent form, the towers are recreated from cells on the fly using tower builder tools.  This means CaloCellContainer has to be present in the event data store, if CaloTowerContainer is needed.
 
 CaloTowerContainer_p1 and CaloTowerSeg_p1
 
-@section Converters  ---- T/P converter classes 
+@section CaloTPCnv_Converters ---- T/P converter classes
 
 CaloCellLinkContainerCnv_p2
 
diff --git a/Calorimeter/CaloDetDescr/doc/MainPage.h b/Calorimeter/CaloDetDescr/doc/packagedoc.h
similarity index 93%
rename from Calorimeter/CaloDetDescr/doc/MainPage.h
rename to Calorimeter/CaloDetDescr/doc/packagedoc.h
index b61d815c9cf825537d5fe88ba5961b78c300189b..42fc61892568c25b7819077b39a9db842b2eeb49 100644
--- a/Calorimeter/CaloDetDescr/doc/MainPage.h
+++ b/Calorimeter/CaloDetDescr/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page CaloDetDescr_page 
 
 The main purpose of the CaloDetDescr package is to provide an unified 
 interface to readout geometry description of the ATLAS Calorimeters -
@@ -31,7 +31,5 @@ alignment information retrieved from the Conditions Database
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/Calorimeter/CaloDmDetDescr/doc/mainpage.h b/Calorimeter/CaloDmDetDescr/doc/packagedoc.h
similarity index 82%
rename from Calorimeter/CaloDmDetDescr/doc/mainpage.h
rename to Calorimeter/CaloDmDetDescr/doc/packagedoc.h
index 06c3418851f6f5948f1a91b5ee042ecb811f7f42..09f11fa0d94a15708055f565a8ea7c74ffbb5381 100644
--- a/Calorimeter/CaloDmDetDescr/doc/mainpage.h
+++ b/Calorimeter/CaloDmDetDescr/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloDmDescrt Package
+@page CaloDmDetDescr_page CaloDmDescrt Package
 
 This package contains the helper class for the Calo Dead material identifier
 
diff --git a/Calorimeter/CaloEvent/doc/mainpage.h b/Calorimeter/CaloEvent/doc/packagedoc.h
similarity index 83%
rename from Calorimeter/CaloEvent/doc/mainpage.h
rename to Calorimeter/CaloEvent/doc/packagedoc.h
index e1035832c45104d31d2917db5d53640fb7acdfcf..fd80905790ff5d39d1f702524ec64e6f9b713b2c 100644
--- a/Calorimeter/CaloEvent/doc/mainpage.h
+++ b/Calorimeter/CaloEvent/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloEvent Package
+@page CaloEvent_page CaloEvent Package
 
 This package provides event data model classes for Calorimeter 
 reconstruction.
@@ -13,13 +13,13 @@ reconstruction.
 @author David Rousseau rousseau@lal.in2p3.fr
 @author many many others
 
-@section CaloEventCaloCell CaloCell related classes
+@section CaloEvent_CaloEventCaloCell CaloCell related classes
 
 CaloCell is the input data class for all calorimeter reconstruction 
 algorithms. CaloCells are stored in a CaloCellContainer. They can 
 be compactified into a CaloCompactCell in a CaloCompactCellContainer.
  
-@section CaloEventCluster Clustering related classes
+@section CaloEvent_CaloEventCluster Clustering related classes
 
 The principal data classes for composite calorimeter reconstruction objects are
  CaloTower and  CaloCluster . Both classes provide the same basic features
@@ -32,7 +32,7 @@ sub-detector boundaries.
  CaloTower and  CaloCluster are stored in the  CaloTowerContainer and
 the  CaloClusterContainer , respectively. 
 
-@section CaloEventOther Other classes
+@section CaloEvent_CaloEventOther Other classes
 
 
 
diff --git a/Calorimeter/CaloExample/CaloAnaEx/doc/mainpage.h b/Calorimeter/CaloExample/CaloAnaEx/doc/packagedoc.h
similarity index 87%
rename from Calorimeter/CaloExample/CaloAnaEx/doc/mainpage.h
rename to Calorimeter/CaloExample/CaloAnaEx/doc/packagedoc.h
index 38498d8594903ef633ffb674e0253cd5bcd14bfc..c48522b9860359043bc7c862f5ae1000fa5178d8 100644
--- a/Calorimeter/CaloExample/CaloAnaEx/doc/mainpage.h
+++ b/Calorimeter/CaloExample/CaloAnaEx/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloAnaEx Package
+@page CaloAnaEx_page CaloAnaEx Package
 
 This package is used to test (ATN, RTT) reconstruction in the calorimeter only with ESD and AOD writing switched on and ESD then AOD.
 
diff --git a/Calorimeter/CaloExample/CaloDigEx/doc/mainpage.h b/Calorimeter/CaloExample/CaloDigEx/doc/packagedoc.h
similarity index 84%
rename from Calorimeter/CaloExample/CaloDigEx/doc/mainpage.h
rename to Calorimeter/CaloExample/CaloDigEx/doc/packagedoc.h
index 7ed2f3a86e1c9ee6333e913ddc66928a8d628aea..ca1d75807f19f5f69e4e8ab0bd76768126b43990 100644
--- a/Calorimeter/CaloExample/CaloDigEx/doc/mainpage.h
+++ b/Calorimeter/CaloExample/CaloDigEx/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloDigEx Package
+@page CaloDigEx_page CaloDigEx Package
 
 This package is used to test (ATN, RTT) digitisation in the calorimeter only.
 
diff --git a/Calorimeter/CaloExample/CaloRecEx/doc/mainpage.h b/Calorimeter/CaloExample/CaloRecEx/doc/packagedoc.h
similarity index 78%
rename from Calorimeter/CaloExample/CaloRecEx/doc/mainpage.h
rename to Calorimeter/CaloExample/CaloRecEx/doc/packagedoc.h
index 7a8612c30f3b460b893eb3fc190d3314fc545bfb..9ac9ac912ecf83475154787e293adfa28dc7ba6b 100644
--- a/Calorimeter/CaloExample/CaloRecEx/doc/mainpage.h
+++ b/Calorimeter/CaloExample/CaloRecEx/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage CaloRecEx Package
+@page CaloRecEx_page CaloRecEx Package
 
 This package is mainly used to test (ATN, RTT) reconstruction in the calorimeter (only ntuple).
 
 @author Karim Bernardet bernardet@cppm.in2p3.fr
 
-@section FragOpt jobOptions fragments
+@section CaloRecEx_FragOpt jobOptions fragments
 
 CaloRecOutputItemList_jobOptions.py : list of the calo objects written in the ESD/AOD 
 
diff --git a/Calorimeter/CaloExample/CaloSimEx/doc/mainpage.h b/Calorimeter/CaloExample/CaloSimEx/doc/packagedoc.h
similarity index 84%
rename from Calorimeter/CaloExample/CaloSimEx/doc/mainpage.h
rename to Calorimeter/CaloExample/CaloSimEx/doc/packagedoc.h
index c99031c04a84421d5d3abc8ecab2af5a8e691910..bb94cfcb737c323163ba68eb9d6c6ef440c2f7d1 100644
--- a/Calorimeter/CaloExample/CaloSimEx/doc/mainpage.h
+++ b/Calorimeter/CaloExample/CaloSimEx/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloSimEx Package
+@page CaloSimEx_page CaloSimEx Package
 
 This package is used to test (ATN, RTT) simulation in the calorimeter.
 
diff --git a/Calorimeter/CaloExample/CaloTests/doc/mainpage.h b/Calorimeter/CaloExample/CaloTests/doc/packagedoc.h
similarity index 86%
rename from Calorimeter/CaloExample/CaloTests/doc/mainpage.h
rename to Calorimeter/CaloExample/CaloTests/doc/packagedoc.h
index d5efa925fe269ed61f095c049c77fb67be355b61..15eec8e8c93fd4895cda164680c4c711d98edb89 100644
--- a/Calorimeter/CaloExample/CaloTests/doc/mainpage.h
+++ b/Calorimeter/CaloExample/CaloTests/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloTests Package
+@page CaloTests_page CaloTests Package
 
 This package is used to test (RTT) the full chain in the calorimeter (simulation -> digitization -> reconstruction)
 
diff --git a/Calorimeter/CaloG4Sim/doc/MainPage.h b/Calorimeter/CaloG4Sim/doc/packagedoc.h
similarity index 93%
rename from Calorimeter/CaloG4Sim/doc/MainPage.h
rename to Calorimeter/CaloG4Sim/doc/packagedoc.h
index 2c8d893d8203716b4cb88fc0aae732957e70a307..d78fcbff5d966759493c6097d39ff48a1c5247f4 100644
--- a/Calorimeter/CaloG4Sim/doc/MainPage.h
+++ b/Calorimeter/CaloG4Sim/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page CaloG4Sim_page 
 
 This package is used by Calorimeter simulation with Calibration Hits.
 
@@ -23,7 +23,5 @@ The key classes of this package are:
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/Calorimeter/CaloIdentifier/doc/mainpage.h b/Calorimeter/CaloIdentifier/doc/packagedoc.h
similarity index 96%
rename from Calorimeter/CaloIdentifier/doc/mainpage.h
rename to Calorimeter/CaloIdentifier/doc/packagedoc.h
index ea1e379c658c175af3856957889569e4e0b4ebff..7d536254a79b34d4abfcec06d177e3da5a5126ba 100644
--- a/Calorimeter/CaloIdentifier/doc/mainpage.h
+++ b/Calorimeter/CaloIdentifier/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page CaloIdentifier_page 
 
       There are two types of identifiers for the ATLAS calorimeters:<br>
       offline identifiers (type= Identifier), and online identifiers (type= HWIdentifier). <br>
@@ -32,9 +32,7 @@
       and IdDictCalorimeter_zzz.xml (TTOnline_ID); there is no dictionary for LArReadoutModuleID. <br>
       There are also identifiers/helpers for calibration lines and High Voltages, see package LArCalorimeter/LArIdentifier. <br>
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 
 */
diff --git a/Calorimeter/CaloInterface/doc/mainpage.h b/Calorimeter/CaloInterface/doc/packagedoc.h
similarity index 93%
rename from Calorimeter/CaloInterface/doc/mainpage.h
rename to Calorimeter/CaloInterface/doc/packagedoc.h
index 4058925b0006f5bdd3ee005dc86c82cdcd84324a..c090c5d099184a8e59bd2a2bc235b619d8754b22 100644
--- a/Calorimeter/CaloInterface/doc/mainpage.h
+++ b/Calorimeter/CaloInterface/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage CaloInterface
+@page CaloInterface_page CaloInterface
 @author G.Unal
 
-@section CaloInterface Introduction
+@section CaloInterface_CaloInterface Introduction
 
 This package contains the interfaces of the various tools used in the calorimeter
 reconstruction
 
-@section CaloInterface  Class Overview
+@section CaloInterface_CaloInterface Class Overview
   
   The CaloInterface package contains of following classes:
 
diff --git a/Calorimeter/CaloRec/doc/mainpage.h b/Calorimeter/CaloRec/doc/packagedoc.h
similarity index 90%
rename from Calorimeter/CaloRec/doc/mainpage.h
rename to Calorimeter/CaloRec/doc/packagedoc.h
index 2d421298d51a4229a0f787a57c91077742c139eb..172959aaeb3865d5789bd29e1d9eb5e7b4c700bf 100644
--- a/Calorimeter/CaloRec/doc/mainpage.h
+++ b/Calorimeter/CaloRec/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloRec Package
+@page CaloRec_page CaloRec Package
 
 This package provides algorithms for Calorimeter reconstruction.
 
diff --git a/Calorimeter/CaloSimEvent/doc/mainpage.h b/Calorimeter/CaloSimEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from Calorimeter/CaloSimEvent/doc/mainpage.h
rename to Calorimeter/CaloSimEvent/doc/packagedoc.h
index 58ec720c058681939680684df362a0eaacea2364..f10a8c70addc86273a1eaa22e674549accc9731e
--- a/Calorimeter/CaloSimEvent/doc/mainpage.h
+++ b/Calorimeter/CaloSimEvent/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage CaloSimEvent Package
+@page CaloSimEvent_page CaloSimEvent Package
 
 The package CaloSimEvent contains data model classes for calorimeter
 simulation that are not specific to LAr or Tile. They therefore complement
 LArSimEvent and TileSimEvent.
 
-@section CaloCalibrationHit Calibration Hit related classes
+@section CaloSimEvent_CaloCalibrationHit Calibration Hit related classes
 
 This package includes the CaloCalibrationHit class that describes the
 calorimeter calibration hit. This class 
diff --git a/Calorimeter/CaloTTDetDescr/doc/mainpage.h b/Calorimeter/CaloTTDetDescr/doc/packagedoc.h
similarity index 83%
rename from Calorimeter/CaloTTDetDescr/doc/mainpage.h
rename to Calorimeter/CaloTTDetDescr/doc/packagedoc.h
index 15daa500f11eb8ab484c8e17a7d2ed9b69d14ab8..e7c63c1414787dbaac6b3e95413013e1f338047c 100644
--- a/Calorimeter/CaloTTDetDescr/doc/mainpage.h
+++ b/Calorimeter/CaloTTDetDescr/doc/packagedoc.h
@@ -4,13 +4,11 @@
 
 /**
 
-@mainpage
+@page CaloTTDetDescr_page 
 
 CaloTTDetDescr is a small package which manages the detector description for the Calorimeter Trigger Towers. <br>
 It must be noted that, as of now (Aug. 07) the TT geometry is ideal and does not follow the LAr or Tile description.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Calorimeter/CaloTools/doc/mainpage.h b/Calorimeter/CaloTools/doc/packagedoc.h
similarity index 86%
rename from Calorimeter/CaloTools/doc/mainpage.h
rename to Calorimeter/CaloTools/doc/packagedoc.h
index 9e53fca440116d96b0b66a9ab8b6b755b9215448..b7bd84970a20a30da5d3a2e5e08a507f785b7a65 100644
--- a/Calorimeter/CaloTools/doc/mainpage.h
+++ b/Calorimeter/CaloTools/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloTols Package
+@page CaloTools_page CaloTols Package
 
 This package provides some tools used in the calorimeter reconstruction.
 
diff --git a/Calorimeter/CaloTrackingGeometry/doc/mainpage.h b/Calorimeter/CaloTrackingGeometry/doc/packagedoc.h
similarity index 80%
rename from Calorimeter/CaloTrackingGeometry/doc/mainpage.h
rename to Calorimeter/CaloTrackingGeometry/doc/packagedoc.h
index d6d9ccec8974521ae8cfad0fe7a30e9597047927..3480b9152af96f09562c96879eca06ae270ffffd 100644
--- a/Calorimeter/CaloTrackingGeometry/doc/mainpage.h
+++ b/Calorimeter/CaloTrackingGeometry/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage CaloTrackingGeometry package
+@page CaloTrackingGeometry_page CaloTrackingGeometry package
 
 @author Andreas.Salzburger@cern.ch
 
-@section CaloTrackingGeometryIntro Introduction
+@section CaloTrackingGeometry_CaloTrackingGeometryIntro Introduction
 
 This packge contains two (Ath)AlgTools, the 
    - CaloTrackingGeometryBuilder
diff --git a/Calorimeter/CaloTriggerTool/doc/mainpage.h b/Calorimeter/CaloTriggerTool/doc/packagedoc.h
similarity index 97%
rename from Calorimeter/CaloTriggerTool/doc/mainpage.h
rename to Calorimeter/CaloTriggerTool/doc/packagedoc.h
index 1d87d986f9547ca2ffa4bc2d52dc8e821cb36db1..d1d0d747740b552c03465783e1b95f21501217a2 100644
--- a/Calorimeter/CaloTriggerTool/doc/mainpage.h
+++ b/Calorimeter/CaloTriggerTool/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page CaloTriggerTool_page 
 
 The Cabling Services ( CaloTriggerTowerService of the present package, LArCablingService and  TileCablingService ) 
 are meant to provide the mapping between cells and Trigger Towers, between offline and online identifiers and other mappings.<br>
@@ -88,8 +88,6 @@ std::vector < HWIdentifier > channelIdVec = m_cablingService->createChannelIDvec
 
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Calorimeter/CaloUtils/doc/mainpage.h b/Calorimeter/CaloUtils/doc/packagedoc.h
similarity index 72%
rename from Calorimeter/CaloUtils/doc/mainpage.h
rename to Calorimeter/CaloUtils/doc/packagedoc.h
index 4042c1c32ef1f7e904567897f2bba6cd099e8d61..c210ffb3516c20fce355e19f56c6f2f0c91b0888 100644
--- a/Calorimeter/CaloUtils/doc/mainpage.h
+++ b/Calorimeter/CaloUtils/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage CaloUtils Package
+@page CaloUtils_page CaloUtils Package
 
 The package for Calorimeter Utilities
 
@@ -11,13 +11,12 @@ The package for Calorimeter Utilities
 Lechowski, David Rousseau, Sven Menke, Peter Loch, Giulio Usai, Damir
 Lelas, Kyle Cranmer
 
-@section CaloUtilsIntro Introduction
+@section CaloUtils_CaloUtilsIntro Introduction
 
 This is the package for calorimeter utilities.
 
-@section CaloUtilsReq Requirements
+@section CaloUtils_CaloUtilsReq Requirements
 
-@include requirements
 
 
 */
diff --git a/Control/AthenaExamples/AthExJobOptions/doc/mainpage.h b/Control/AthenaExamples/AthExJobOptions/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from Control/AthenaExamples/AthExJobOptions/doc/mainpage.h
rename to Control/AthenaExamples/AthExJobOptions/doc/packagedoc.h
index 09ac6e39ed560931065dc03a828dd6ca0364616a..1e2d298ad0f41fcfcdffa0666d00fe8dcff4d55f
--- a/Control/AthenaExamples/AthExJobOptions/doc/mainpage.h
+++ b/Control/AthenaExamples/AthExJobOptions/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage AthExJobOptions Package
+@page AthExJobOptions_page AthExJobOptions Package
 @author Wim Lavrijsen <WLavrijsen@lbl.gov>
 @author Martin Woudstra <Martin.Woudstra@cern.ch>
 
-@section AthExJobOptionsIntro Introduction
+@section AthExJobOptions_AthExJobOptionsIntro Introduction
 
 This package contains examples of configurable-style job options, and shows
 how to write self-contained Gaudi component configurations by deriving your
@@ -15,7 +15,7 @@ own python classes from the generated configurables.
 For this purpose, it uses a few "Hello World!"-style Algorithms and AlgTools;
 the real meat, however, is in the custom python files.
 
-@section AthExJobOptionsOverview Class Overview
+@section AthExJobOptions_AthExJobOptionsOverview Class Overview
 
 Of main interest are the python classes; the other classes are merely there in
 order to have something to play with.
@@ -53,10 +53,8 @@ As well as the following helpers:
 
 /**
 @page used_AthExJobOptions Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AthExJobOptions Requirements
-@include requirements
 */
diff --git a/Control/AthenaExamples/AthExThinning/doc/mainpage.h b/Control/AthenaExamples/AthExThinning/doc/packagedoc.h
similarity index 95%
rename from Control/AthenaExamples/AthExThinning/doc/mainpage.h
rename to Control/AthenaExamples/AthExThinning/doc/packagedoc.h
index 225c01ea315275b65a886c5a14fd98c38aaf9156..5013b742f3181f5535133af93b32897711f5aaef 100644
--- a/Control/AthenaExamples/AthExThinning/doc/mainpage.h
+++ b/Control/AthenaExamples/AthExThinning/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage AthExThinning Package
+@page AthExThinning_page AthExThinning Package
 @author Sebastien Binet
 
-@section AthExThinningIntro Introduction
+@section AthExThinning_AthExThinningIntro Introduction
 
 This package serves both as an example on how to perform data thinning and as a unit test, making sure everything is working as planned.
 It consists of 3 algorithms explaining how to use the @c IThinningSvc interface to perform thinning of @c DataVector containers as a possible way of reducing disk size of a given dataset.
 
-@section AthExThinningOverview Class Overview
+@section AthExThinning_AthExThinningOverview Class Overview
   The AthExThinning package contains the following transient data classes:
 
   - AthExParticle : a simple 4-momentum-like data class. Its sole purpose is to hold data. Some of the instances of these @c AthExParticle will be removed (aka "thinning")
@@ -50,10 +50,8 @@ Note however that <b>only T/P separated</b> classes can make use of the thinning
 
 /**
 @page used_AthExThinning Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AthExThinning Requirements
-@include requirements
 */
diff --git a/Control/AthenaExamples/TBBExamples/doc/MainPage.h b/Control/AthenaExamples/TBBExamples/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 74%
rename from Control/AthenaExamples/TBBExamples/doc/MainPage.h
rename to Control/AthenaExamples/TBBExamples/doc/packagedoc.h
index c049fb555bd3076aed4b5604d648564e8d6a0d94..6f20d6813a21b4af91a066398c3c0414c80eba59
--- a/Control/AthenaExamples/TBBExamples/doc/MainPage.h
+++ b/Control/AthenaExamples/TBBExamples/doc/packagedoc.h
@@ -4,22 +4,20 @@
 
 /**
 
-   @mainpage TBBExamples
+@page TBBExamples_page TBBExamples
 This package contains HelloWorld-type examples of TBB task scheduling within
 an athena Algorithm. 
 
-@section Examples Examples
+@section TBBExamples_Examples Examples
  - HelloParForAlg
  - HelloPipeAlg
  - HelloGraphAlg
 
-@htmlinclude used_packages.html
 
 
-@section reqs CMT requirements file
-@include requirements
+@section TBBExamples_reqs CMT requirements file
 
-@section Refs More Documentation
+@section TBBExamples_Refs More Documentation
 
 The code can be browsed using LXR 
 (http://alxr.usatlas.bnl.gov/lxr/source/atlas/Control/AthenaExamples/TBBExamples)
diff --git a/Control/AthenaExamples/ToyConversion/doc/MainPage.h b/Control/AthenaExamples/ToyConversion/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from Control/AthenaExamples/ToyConversion/doc/MainPage.h
rename to Control/AthenaExamples/ToyConversion/doc/packagedoc.h
index df825d7670f211ff84389b902e42d5af2f093df0..1f860c464242ad48d79d9ba5f0b36fbbbbe22a58
--- a/Control/AthenaExamples/ToyConversion/doc/MainPage.h
+++ b/Control/AthenaExamples/ToyConversion/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-   \mainpage
+@page ToyConversion_page 
 
 This package contains a few tools to help writing unit tests. 
 
-\section UnitTest_run The UnitTest_run cmt pattern
+@section ToyConversion_UnitTest_run The UnitTest_run cmt pattern
 
 TestTools requirements file defines the cmt pattern UnitTest_run. UnitTest_run 
 will compile, link and run a standalone C++ program when a "gmake check" 
@@ -40,7 +40,7 @@ reported by ChronoStatSvc or the package versions and even in certain cases
 pointer addresses). This is currently done in a very naive fashion (using 
 diff -I option) but a more sophisticated "diff" script is in the plans
 
-\section initGaudi The initGaudi functions
+@section ToyConversion_initGaudi The initGaudi functions
 TestTools/initGaudi.h defines two functions in the namespace Athena_test 
 to initialize Gaudi ApplicationMgr 
 and be able to run using core Gaudi services. An optional string argument
@@ -48,7 +48,7 @@ and be able to run using core Gaudi services. An optional string argument
  $PKGROOT/share/<jobOptsFile>
 to configure your job
 
-\section scripts Scripts
+@section ToyConversion_scripts Scripts
  - share/runUnitTests.sh is a sh script that cmt broadcasts gmake check
  and filter its output. It is 
 installed in the run area. It accepts one or more arguments that it passes
@@ -59,7 +59,7 @@ to cmt broadcast, for example
  - share/post.sh is a script used by the UnitTest_run pattern to 
 analize a job output 
 
-\section toys Toys 
+@section ToyConversion_toys Toys
 
 The TestTools component library provides toy implementations of a number of
 typical Gaudi classes, namely ToyConverter, ToyConversionSvc (and soon 
@@ -68,7 +68,7 @@ ToyAlgorithm). These are made available via the job opts file
 
 
 
-\section Examples Examples
+@section ToyConversion_Examples Examples
 
 The package AthenaTests/ControlTests contains several examples that use
 the initGaudi function.
@@ -78,7 +78,7 @@ that show
  - how to link the test program with an extra library (e.g. Clear_Store) 
  - how to use the ToyConversionSvc provided by TestTools (ProxyProviderSvc)
 
-\section links More info
+@section ToyConversion_links More info
 The package can be browsed using LXR 
 (http://atlassw1.phy.bnl.gov/lxr/source/atlas/AtlasTest/TestTools/)
 
diff --git a/Control/AthenaKernel/doc/MainPage.h b/Control/AthenaKernel/doc/packagedoc.h
similarity index 81%
rename from Control/AthenaKernel/doc/MainPage.h
rename to Control/AthenaKernel/doc/packagedoc.h
index 484c660582a0ea6a48ddcaf0ca22877dc38e00e7..37d8eb0ffbdcfacd503ecdfd927277d3787e8706 100644
--- a/Control/AthenaKernel/doc/MainPage.h
+++ b/Control/AthenaKernel/doc/packagedoc.h
@@ -4,24 +4,22 @@
 
 /**
 
-   @mainpage AthenaKernel 
+@page AthenaKernel_page AthenaKernel
 This package is the repository for interfaces to ATLAS components of general interest. The package also contains tools to implement those interfaces, e.g. 
 service base classes and simple utilities which do not depend on other packages.
 It can be seen as an extension of GaudiKernel.
 
-@htmlinclude used_packages.html
 
-@section Tests Unit Tests
+@section AthenaKernel_Tests Unit Tests
  - AthenaPackageInfo_test.cxx
  - errorcheck_test.cxx
  - getMessageSvc_test.cxx
  - type_tools_test.cxx
 
 
-@section reqs CMT requirements file
-@include requirements
+@section AthenaKernel_reqs CMT requirements file
 
-@section Refs More Documentation
+@section AthenaKernel_Refs More Documentation
 
 More information is available from the Athena wiki 
 (https://twiki.cern.ch/twiki/bin/view/Atlas/AthenaFramework).
diff --git a/Control/AthenaSealSvc/doc/mainpage.h b/Control/AthenaSealSvc/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Control/AthenaSealSvc/doc/mainpage.h
rename to Control/AthenaSealSvc/doc/packagedoc.h
index 0807c669cef724d854418ab62fbb636972241209..4eb2ebfeb0e96abcb1997faa2282697e8f28dd80
--- a/Control/AthenaSealSvc/doc/mainpage.h
+++ b/Control/AthenaSealSvc/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page AthenaSealSvc_page 
 
 This Athena service check "completeness" of class definitions in
 Reflex dictionaries. 
@@ -29,13 +29,11 @@ found in LD_LIBRARY_PATH - the rootmap files contain a list of classes
 that each dictionary holds and the corresponding name of the DLL
 (dynamically loadable library).
 
-@section requirements requirements
+@section AthenaSealSvc_requirements requirements
 
-@include requirements
 
-@section Links Links to used packages
+@section AthenaSealSvc_Links Links to used packages
 
-@htmlinclude used_packages.html
 
 
 */
diff --git a/Control/AthenaServices/doc/mainpage.h b/Control/AthenaServices/doc/packagedoc.h
similarity index 85%
rename from Control/AthenaServices/doc/mainpage.h
rename to Control/AthenaServices/doc/packagedoc.h
index f167fca17bd0b9d41fb85404e0ae63ccbd1b86ec..5d1e314176f71808e21a9ef56cdbbe27436bd8b1 100644
--- a/Control/AthenaServices/doc/mainpage.h
+++ b/Control/AthenaServices/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-   @mainpage AthenaServices 
+@page AthenaServices_page AthenaServices
 AthenaServices contains several ATLAS "core" components, that implement an 
 interface defined in AthenaKernel or in GaudiKernel. Among those you'll find
  - the standard AthenaEventLoopMgr and its python version, plus an event loop manager  that allows multiple passes over a dataset and a MixingEventSelector that reads event from multiple input streams into a job
@@ -13,9 +13,8 @@ interface defined in AthenaKernel or in GaudiKernel. Among those you'll find
 (AthenaOutputStream and AthenaOutputStreamTool)
 
 
-@htmlinclude used_packages.html
 
-@section tests Unit Tests
+@section AthenaServices_tests Unit Tests
 
  - AthenaOutputStream_test.cxx
  - AtRndmGen_test.cxx
@@ -23,11 +22,10 @@ interface defined in AthenaKernel or in GaudiKernel. Among those you'll find
  - SimplePOSIXTimeKeeperSvc_test.cxx
  - SimplePOSIXTimeKeeperSvc_test.py
 
-@section reqs CMT requirements file
+@section AthenaServices_reqs CMT requirements file
 
-@include requirements
 
-@section refs More Documentation
+@section AthenaServices_refs More Documentation
 
 More information is available from the Athena wiki 
 (https://twiki.cern.ch/twiki/bin/view/Atlas/AthenaFramework).
diff --git a/Control/CLIDSvc/doc/MainPage.h b/Control/CLIDSvc/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Control/CLIDSvc/doc/MainPage.h
rename to Control/CLIDSvc/doc/packagedoc.h
index 0a52a32ae777ae5a6fb4297ba525259394f31b14..90b307702ca36724f2b1edfedfffacda7187fc7d
--- a/Control/CLIDSvc/doc/MainPage.h
+++ b/Control/CLIDSvc/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-   @mainpage
+@page CLIDSvc_page 
 
 Tools for generating and managing CLIDs. In particular the include file 
 CLASS_DEF.h provides the CLASS_DEF macro that allows to associate a
@@ -25,9 +25,8 @@ More information on CLID assignment is available from
 http://atlas-computing.web.cern.ch/atlas-computing/packages/edm/clid.php.
 
 
-@htmlinclude used_packages.html
 
-@section Tests Unit Tests
+@section CLIDSvc_Tests Unit Tests
 
 The directory test contains test programs that can be run issuing
 a "gmake check" (after "source setup.sh"). 
@@ -35,11 +34,10 @@ a "gmake check" (after "source setup.sh").
  - clid_unittest.py
 
 
-@section requirements CMT requirements file
+@section CLIDSvc_requirements CMT requirements file
 
-@include requirements
 
-@section Docs More Documentation
+@section CLIDSvc_Docs More Documentation
 
 The code can be browsed using LXR 
 (http://atlassw1.phy.bnl.gov/lxr/source/atlas/Control/CLIDSvc/)
diff --git a/Control/DataModel/doc/MainPage.h b/Control/DataModel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Control/DataModel/doc/MainPage.h
rename to Control/DataModel/doc/packagedoc.h
index 9931a5e504afb25e76d31924499337abf071e087..65018d4860eaa77e04459d20bb4b95119579b143
--- a/Control/DataModel/doc/MainPage.h
+++ b/Control/DataModel/doc/packagedoc.h
@@ -4,24 +4,24 @@
 
 /**
 
-   \mainpage
+@page DataModel_page 
 
 %StoreGate is a toolkit to implement the Atlas Data Model.
 It consists of three packages %StoreGate, DataModel(this one) and SGTools.
 
 This package contains the tools to design Data Objects to be used in Athena
 
-\section links DataLink and ElementLink
+@section DataModel_links DataLink and ElementLink
 these are two class templates to write persistable inter-object
 references. They can be used as c++ pointers and read and written
 to/from disk. For details see the doc of the two classes, the
 StoreGate user guide (link below) and the examples in AthExStoreGateExamples
 
-\section pool DataPool
+@section DataModel_pool DataPool
 a memory pool typically used by the containers above to speed-up
 element allocation
 
-\section Documentation Documentation
+@section DataModel_Documentation Documentation
 
 A tutorial is available from 
 http://atlas.web.cern.ch/Atlas/GROUPS/SOFTWARE/OO/architecture/EventDataModel/Tutorial/
@@ -39,13 +39,13 @@ The code can be browsed using LXR
 To generate doxygen doc, run (from the cmt dir) gmake doxygen and point 
 your browser to .../doc/Doxygen/html/index.html
 
-\section Examples Examples
+@section DataModel_Examples Examples
 
 The package Control/AthenaExamples/AthExStoreGateExamples contains 
 running examples of algorithms accessing Data Objects using StoreGateSvc.
 This examples are (very close to) the ones described in the tutorial above
 
-\section tests Unit Tests
+@section DataModel_tests Unit Tests
 
 The directory test contains several test programs that can be run issuing
 a "gmake check" or a ../run/runUnitTests.sh 
diff --git a/Control/PerformanceMonitoring/PerfMonAna/doc/mainpage.h b/Control/PerformanceMonitoring/PerfMonAna/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from Control/PerformanceMonitoring/PerfMonAna/doc/mainpage.h
rename to Control/PerformanceMonitoring/PerfMonAna/doc/packagedoc.h
index 7efbfa91b9eb53f672166cfbbeb6fc66e01c8e35..8a3e2ece53d306c427af84ad0a561e63052d014e
--- a/Control/PerformanceMonitoring/PerfMonAna/doc/mainpage.h
+++ b/Control/PerformanceMonitoring/PerfMonAna/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage PerfMonAna Package
+@page PerfMonAna_page PerfMonAna Package
 @author Sebastien Binet
 
-@section PerfMonAnaIntro Introduction
+@section PerfMonAna_PerfMonAnaIntro Introduction
 
 This package contains python classes and python script to analyze tuple files produced by the PerfMonComps package (actually the @c PerfMonSvc and its tools).
 
-@section PerfMonAnaOverview Class Overview
+@section PerfMonAna_PerfMonAnaOverview Class Overview
   The PerfMonAna package contains the following classes:
 
   - python::PerfMonProcessing::AnaMgr : the main class driving the analyzer script. It takes a few input filenames (reference and current) and delegates to @c Ana to create and fill histograms. Eventually it gathers and merges all the histograms, prints them into a PDF file and saves them into a separate output ROOT file.
@@ -27,7 +27,7 @@ This package contains python classes and python script to analyze tuple files pr
 
 The PerfMonAna package also provides a few handy utilities related to management of (Py)Root: importing ROOT without graphics, configuring a less ugly ROOT style, helper classes to setup histogram styles (color, line-style, marker-style, ...)
 
-@section PerfMonAnaPyRootScript perfmon.py
+@section PerfMonAna_PerfMonAnaPyRootScript perfmon.py
   This package also provides a 'drop-in' PyRoot script that one can run on any perfmon tuple to produce PDF and ROOT files containing the histograms created by all the above analyzers: @c bin/perfmon.py.
 It is fairly easy to use it, just launch in your shell:
 @code
@@ -48,11 +48,9 @@ Informations about various switches, options and usage are available via:
 
 /**
 @page used_PerfMonAna Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_PerfMonAna Requirements
-@include requirements
 */
 
diff --git a/Control/PerformanceMonitoring/PerfMonComps/doc/mainpage.h b/Control/PerformanceMonitoring/PerfMonComps/doc/packagedoc.h
similarity index 96%
rename from Control/PerformanceMonitoring/PerfMonComps/doc/mainpage.h
rename to Control/PerformanceMonitoring/PerfMonComps/doc/packagedoc.h
index e72d511f2a7486efb78223c8979ebf32a42ea0cf..998db01bbe9e117d3e1bbb17213e460d12c71a9b 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/doc/mainpage.h
+++ b/Control/PerformanceMonitoring/PerfMonComps/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage PerfMonComps Package
+@page PerfMonComps_page PerfMonComps Package
 @author Sebastien Binet
 
-@section PerfMonCompsIntro Introduction
+@section PerfMonComps_PerfMonCompsIntro Introduction
 
 This package holds the Gaudi components used to achieve Performance Monitoring of Athena jobs.
 It ships the concrete implementations of interfaces exported from the PerfMonKernel package.
 
-@section PerfMonCompsOverview Class Overview
+@section PerfMonComps_PerfMonCompsOverview Class Overview
   The PerfMonComps package contains the following classes:
 
   - PerfMonSvc : the main central service. It orchestrates the scheduling of the monitoring of the job by delagating to the tools it holds (via a @c ToolHandleArray). This is performed at each step of the Gaudi finite state machine (initialize/execute/finalize) by means of registering callback functions via the @c IIncidentSvc::handle method, dispatching to the relevant monitoring method. This service is also responsible for calling the serialization to disk of the performance monitoring data. It does so by delagating to the @c PerfMon::TupleSvc. The @c PerfMonSvc is configured through a handwritten @c python::Configurable::ConfigurableService python class.
@@ -35,10 +35,8 @@ It ships the concrete implementations of interfaces exported from the PerfMonKer
 
 /**
 @page used_PerfMonComps Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_PerfMonComps Requirements
-@include requirements
 */
diff --git a/Control/PerformanceMonitoring/PerfMonEvent/doc/mainpage.h b/Control/PerformanceMonitoring/PerfMonEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from Control/PerformanceMonitoring/PerfMonEvent/doc/mainpage.h
rename to Control/PerformanceMonitoring/PerfMonEvent/doc/packagedoc.h
index 61ec57a6da02a7fa8d685b7e3ab01daa2d8a7668..1324cd3f50fe5d5986d8d11809eba662491b0e89
--- a/Control/PerformanceMonitoring/PerfMonEvent/doc/mainpage.h
+++ b/Control/PerformanceMonitoring/PerfMonEvent/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage PerfMonEvent Package
+@page PerfMonEvent_page PerfMonEvent Package
 @author Sebastien Binet
 
-@section PerfMonEventIntro Introduction
+@section PerfMonEvent_PerfMonEventIntro Introduction
 
 This package holds the data classes modeling performance monitoring data. This performance monitoring data is gathered by the monitoring tools and later on stored into a tuple.
 Each class holds information(s) about a very specialized monitoring aspect (CPU, memory,...) and is usually splitted into a header part (job-level meta-data) and a data part (holding the actual data).
 
-@section PerfMonEventOverview Class Overview
+@section PerfMonEvent_PerfMonEventOverview Class Overview
   The PerfMonEvent package contains the following data classes:
 
   - PerfMon::CpuHdr and PerfMon::CpuData : stores CPU related monitoring informations. The header stores the names (called tags) of the entities being monitored (ie: the algorithms). The data stores timings (@c PerfMon::CpuData::Timing) for each tag. These timings consist of user/sys/real CPU timings. No unit is enforced (sadly) as it is 'monitoring dependent'. It is recognized, though, that it 'might' be a source of errors and confusion: it is foreseen to enforce a unit-typed system in a near future.
@@ -29,10 +29,8 @@ Each class holds information(s) about a very specialized monitoring aspect (CPU,
 
 /**
 @page used_PerfMonEvent Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_PerfMonEvent Requirements
-@include requirements
 */
diff --git a/Control/PerformanceMonitoring/PerfMonKernel/doc/mainpage.h b/Control/PerformanceMonitoring/PerfMonKernel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from Control/PerformanceMonitoring/PerfMonKernel/doc/mainpage.h
rename to Control/PerformanceMonitoring/PerfMonKernel/doc/packagedoc.h
index 63e517ddfa429578ca11b29d78969239a182b074..6a8c31880ecbddc86f289aab9f54361e9ade96e8
--- a/Control/PerformanceMonitoring/PerfMonKernel/doc/mainpage.h
+++ b/Control/PerformanceMonitoring/PerfMonKernel/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage PerfMonKernel Package
+@page PerfMonKernel_page PerfMonKernel Package
 @author Sebastien Binet
 
-@section PerfMonKernelIntro Introduction
+@section PerfMonKernel_PerfMonKernelIntro Introduction
 
 This package provides the abstract interfaces to the (Gaudi) components (tools and services) needed and used by the performance monitoring packages.
 
-@section PerfMonKernelOverview Class Overview
+@section PerfMonKernel_PerfMonKernelOverview Class Overview
   The PerfMonKernel package contains the following classes:
 
   - IPerfMonSvc : the main service organizing and scheduling a performance monitoring job. Not much is exposed to clients as it is supposed to be a rather opaque black box, but the following methods are heavily suggested to be implemented by derived classes:
@@ -45,10 +45,8 @@ The assumption that performance data is in good shape and may be committed to pe
 
 /**
 @page used_PerfMonKernel Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_PerfMonKernel Requirements
-@include requirements
 */
diff --git a/Control/PileUpComps/doc/mainpage.h b/Control/PileUpComps/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from Control/PileUpComps/doc/mainpage.h
rename to Control/PileUpComps/doc/packagedoc.h
index 0a092843646d4524091568486a8447bcd66f14c9..6ee3109c4de16b5839487ab5bbf020c52d1c402c
--- a/Control/PileUpComps/doc/mainpage.h
+++ b/Control/PileUpComps/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-   @mainpage  
+@page PileUpComps_page 
 
 contains the Gaudi components implementing the pileup framework, in particular
 the PileUpEventLoopMgr. To run a pile-up job one needs to specify that the PileUpEventLoopMgr is to be used in a "bootstrap" option file e.g.
@@ -16,17 +16,15 @@ where Digitization/pileUpBootstrap.py contains
 theApp.EventLoop = "PileUpEventLoopMgr"
 @endcode
 
-@htmlinclude used_packages.html
 
-@section ATN test
+@section PileUpComps_ATN test
 
  - Simulation/Digitization/test/TestPileUp.xml
 
-@section reqs CMT requirements file
+@section PileUpComps_reqs CMT requirements file
 
-@include requirements
 
-@section refs More Documentation
+@section PileUpComps_refs More Documentation
 
 More information is available from the pileup wiki 
 (https://twiki.cern.ch/twiki/bin/view/Atlas/PileupDigitization)
diff --git a/Control/PileUpTools/doc/mainpage.h b/Control/PileUpTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Control/PileUpTools/doc/mainpage.h
rename to Control/PileUpTools/doc/packagedoc.h
index f2db2df592de5d034b8df241d4e58c07f315d318..a41c5118df162f3475a0acde3174423652b0d651
--- a/Control/PileUpTools/doc/mainpage.h
+++ b/Control/PileUpTools/doc/packagedoc.h
@@ -4,22 +4,20 @@
 
 /**
 
-   @mainpage  
+@page PileUpTools_page 
 
 contains the PileUpMergeSvc and a number of related tools. PileUpMergeSvc is the preferred mechanism to access information from the different event stores in a
 pileup job.
 
-@htmlinclude used_packages.html
 
-@section ATN test
+@section PileUpTools_ATN test
 
  - Simulation/Digitization/test/TestPileUp.xml
 
-@section reqs CMT requirements file
+@section PileUpTools_reqs CMT requirements file
 
-@include requirements
 
-@section refs More Documentation
+@section PileUpTools_refs More Documentation
 
 More information is available from the pileup wiki 
 (https://twiki.cern.ch/twiki/bin/view/Atlas/PileupDigitization)
diff --git a/Control/PyKernel/doc/mainpage.h b/Control/PyKernel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 77%
rename from Control/PyKernel/doc/mainpage.h
rename to Control/PyKernel/doc/packagedoc.h
index ac0cf1c3fc7af95ef582584c8c3897192c26fff7..dc62516371f32b94d6fbc03d04476072c029f7a5
--- a/Control/PyKernel/doc/mainpage.h
+++ b/Control/PyKernel/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page PyKernel_page 
 
-@section PyKernelIntro Introduction 
+@section PyKernel_PyKernelIntro Introduction
 
 The PyKernel package contains some python modules 
 and python-bindings for interactive anaysis using Athena.
@@ -14,17 +14,17 @@ Note that this package is for python but doxygen doesn't
 treat python very well. See <a href="http://tmaeno.home.cern.ch/tmaeno/PyKernel/index.html">PyKernel doc</a> instead.
 
 
-@section PyKernelPythonMod Python modules
+@section PyKernel_PyKernelPythonMod Python modules
 
   - PyKernel.py: core module to help StoreGate access, histogramming and visualization
   - PyKHist.py: wrapper module for histograms
 
-@section PyKernelPythonBind Python bindings
+@section PyKernel_PyKernelPythonBind Python bindings
 
   - PyItPatch: contains patches to treat C++ iterators as python's iterator
   - PyReverseProxy: converts a C++ object to a PyObject
 
-@section PyKernelExtras Extra Pages
+@section PyKernel_PyKernelExtras Extra Pages
 
   - @ref PyKernelUsed
   - @ref PyKernelReq
@@ -32,12 +32,10 @@ treat python very well. See <a href="http://tmaeno.home.cern.ch/tmaeno/PyKernel/
 
 /**
 @page PyKernelUsed Used Packages
-@htmlinclude used_packages.html
 */
 
 
 /**
 @page PyKernelReq Requirements
-@include requirements
 
 */
diff --git a/Control/RootUtils/doc/MainPage.h b/Control/RootUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 98%
rename from Control/RootUtils/doc/MainPage.h
rename to Control/RootUtils/doc/packagedoc.h
index 33f01e137390915cbb035342fcd14a004b9faf58..29f71a97c9c7744fdebf55cbbf3b8dd0074e0a99
--- a/Control/RootUtils/doc/MainPage.h
+++ b/Control/RootUtils/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page RootUtils_page 
 
 This package contains code used to work around various problems
 with Root.  It may also contain small pieces of Root code of
diff --git a/Control/SGComps/doc/mainpage.h b/Control/SGComps/doc/packagedoc.h
similarity index 75%
rename from Control/SGComps/doc/mainpage.h
rename to Control/SGComps/doc/packagedoc.h
index 47b034f1f7b6899e9a13ab83dfbe202eab2a4737..4165bcad8f675b37a51eddd85bd0ed570dda2c21 100644
--- a/Control/SGComps/doc/mainpage.h
+++ b/Control/SGComps/doc/packagedoc.h
@@ -4,22 +4,20 @@
 
 /**
 
-   @mainpage  
+@page SGComps_page 
 
 contains the Gaudi components implementing StoreGate.
 
-@htmlinclude used_packages.html
 
-@section test Unit Tests
+@section SGComps_test Unit Tests
 
  - ProxyProviderSvc_test.cxx
  - SGFolder_test.cxx
 
-@section reqs CMT requirements file
+@section SGComps_reqs CMT requirements file
 
-@include requirements
 
-@section refs More Documentation
+@section SGComps_refs More Documentation
 
 More information is available from the Athena wiki 
 (https://twiki.cern.ch/twiki/bin/view/Atlas/AthenaFramework#StoreGate_The_Data_Model_Archite)
diff --git a/Control/SGMon/SGAudSvc/doc/mainpage.h b/Control/SGMon/SGAudSvc/doc/packagedoc.h
similarity index 89%
rename from Control/SGMon/SGAudSvc/doc/mainpage.h
rename to Control/SGMon/SGAudSvc/doc/packagedoc.h
index 9f5cedb871d1c07a9f8d6edcf261798d51edfc6e..c766eec9e4144d27d20e1e327e51c30b58f956e5 100644
--- a/Control/SGMon/SGAudSvc/doc/mainpage.h
+++ b/Control/SGMon/SGAudSvc/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  SGAudSvc
+@page SGAudSvc_page SGAudSvc
 @author ivukotic@cern.ch
 
-@section MyPackageIntro Introduction
+@section SGAudSvc_MyPackageIntro Introduction
 
 This package gives a graphical representation of algorithms accessing StoreGate.
 SGAudSvc instruments retrieve and record functions of StoreGate and from there gets name of object accessed. Upon getting an object name it asks AlgContexSvc for a name of current algorithm. At the end of run, ascii file is produced (default name SGAudSvc.out). 
@@ -23,10 +23,8 @@ Please keep in mind that data are not collected for the first three events.
  
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 */
diff --git a/Control/SGTools/doc/MainPage.h b/Control/SGTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 72%
rename from Control/SGTools/doc/MainPage.h
rename to Control/SGTools/doc/packagedoc.h
index 6e9bb51c0e925b83b5df61ee0c3fc277ac2a868b..fff7422f67c1a0d842045072f9b70428f180dd7a
--- a/Control/SGTools/doc/MainPage.h
+++ b/Control/SGTools/doc/packagedoc.h
@@ -4,19 +4,17 @@
 
 /**
 
-@mainpage
+@page SGTools_page 
 
 This package contains implementation classes for StoreGate.
 
-@section uses Packages used
+@section SGTools_uses Packages used
 
-@htmlinclude used_packages.html
 
-@section requirements requirements 
+@section SGTools_requirements requirements
 
-@include requirements
 
-@section refs More Documentation
+@section SGTools_refs More Documentation
 
 More information is available from the Athena wiki 
 <https://twiki.cern.ch/twiki/bin/view/Atlas/StoreGate>
diff --git a/Control/StoreGate/doc/MainPage.h b/Control/StoreGate/doc/packagedoc.h
similarity index 91%
rename from Control/StoreGate/doc/MainPage.h
rename to Control/StoreGate/doc/packagedoc.h
index 807298d574fd31fede1d3d0779d721e22a1b4a84..3c16a1e2f00cfa639a0a5f1843ed89e6797dd07e 100644
--- a/Control/StoreGate/doc/MainPage.h
+++ b/Control/StoreGate/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-   \mainpage
+@page StoreGate_page 
 
 %StoreGate is a toolkit to implement the Atlas Data Model.
 It consists of four packages %StoreGate(this one), DataModel, SGComps, and SGTools.
@@ -22,23 +22,22 @@ ActiveStoreSvc is not for general use: it allows to
 access the instance of StoreGateSvc which is currently active (this is
 used by classes dealing with multiple event stores, e.g. for pile-up studies).
 
-\section Examples Examples
+@section StoreGate_Examples Examples
 
 The package Control/AthenaExamples/AthExStoreGateExamples contains 
 running examples of algorithms accessing Data Objects using StoreGateSvc.
 This examples are (very close to) the ones described in the tutorial above
 
-\section tests Unit Tests
+@section StoreGate_tests Unit Tests
 
 The directory test contains several test programs that can be run issuing
 a "gmake check". 
  StoreGateSvcClient_test.cxx should cover most of the high-level client API.
 
-@section requirements file
+@section StoreGate_requirements file
 
-@include requirements
 
-@section Documentation
+@section StoreGate_Documentation 
 
 The user guide is part of the Data Model User Guide which is 
 mantained in CVS
diff --git a/Control/StoreGateTests/doc/mainpage.h b/Control/StoreGateTests/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Control/StoreGateTests/doc/mainpage.h
rename to Control/StoreGateTests/doc/packagedoc.h
index a4761c9a6ea39ac07095d89e2bf7d5288ac775d8..ca331a3241da5ea809b9af42d5b904910f617039
--- a/Control/StoreGateTests/doc/mainpage.h
+++ b/Control/StoreGateTests/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
-@mainpage StoreGateTests Package
+@page StoreGateTests_page StoreGateTests Package
 @author Sebastien Binet
 
-@section StoreGateTestsIntro Introduction
+@section StoreGateTests_StoreGateTestsIntro Introduction
 
 This package is part of the ATN tests suite asserting the performances of the @c StoreGateSvc service.
 It bundles a couple of algorithms to benchmark @c StoreGateSvc::record() and @c StoreGateSvc::retrieve() method calls to make sure that nothing goes wrong during the maintenance of this key class of the Athena component model.
 It can also be used (together with the @c PerfMonSvc) to perform timing measurements of new concrete implementations of the @c StoreGateSvc and analyze the impact of new data structures on @c StoreGateSvc performances.
 
-@section StoreGateTestsOverview Class Overview
+@section StoreGateTests_StoreGateTestsOverview Class Overview
   The StoreGateTests package contains the following algorithms:
 
   - SgStressProducer : creates a bunch of @c SgTests::PayLoad objects and puts them into the event store (@c StoreGateSvc). The number and the size of these dummy objects can be modified at the jobOptions level allowing the test to be rather versatile and tweakable.
@@ -21,7 +21,7 @@ It can also be used (together with the @c PerfMonSvc) to perform timing measurem
 
 A typical test job consists of these 2 algorithms chained together in the topSequence. Using the @c PerfMonSvc and its performance toolbox, one can deduce basic performances of the @c StoreGateSvc class and make sure they satisfy the Atlas requirements.
 
-@section StoreGateTestsJobOptions JobOptions
+@section StoreGateTests_StoreGateTestsJobOptions JobOptions
   The tests can be run via the @c share/test_sgProducerConsumer_jobOptions.py file which will run in sequence the @c SgStressProducer and the @c SgStressConsumer algorithms. Performance data will be gathered during the job by the @c PerfMonSvc and saved into a tuple.
 This tuple can be analyzed later on by the @c perfmon.py script provided by the performance toolbox (see @ref PerfMonSvc)
 
@@ -33,10 +33,8 @@ This tuple can be analyzed later on by the @c perfmon.py script provided by the
 
 /**
 @page used_StoreGateTests Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_StoreGateTests Requirements
-@include requirements
 */
diff --git a/Control/Valkyrie/doc/mainpage.h b/Control/Valkyrie/doc/packagedoc.h
similarity index 93%
rename from Control/Valkyrie/doc/mainpage.h
rename to Control/Valkyrie/doc/packagedoc.h
index 9f302fae8dd689c70774b7c940cdfaa01fc0219e..5fd5e8267c803855b69a7e7afa1e86aa35a80d0a 100644
--- a/Control/Valkyrie/doc/mainpage.h
+++ b/Control/Valkyrie/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage Valkyrie
+@page Valkyrie_page Valkyrie
 
 This package contains several classes that facilitate the use of valgrind tools
 within the Atlas software. The following sections describe different use cases.
 General information about using valgrind in Atlas can be found on the
 <a href="https://twiki.cern.ch/twiki/bin/view/Atlas/UsingValgrind">UsingValgrind</a> TWiki.
 
-@section ValkyrieAlgProf Algorithm profiling using callgrind
+@section Valkyrie_ValkyrieAlgProf Algorithm profiling using callgrind
 
 Since code profilers like %callgrind collect a huge amount of data and since you are most likely only
 interested in your particular algorithm it is not a good idea to simply run the profiler on an athena job.
@@ -42,7 +42,7 @@ will profile all algorithms matching this regular expression. If <tt>ProfiledAlg
 default) the entire event loop, i.e. everything between BeginEvent/EndEvent, will be profiled.
 
 
-@section ValkyrieIntervalProf Profiling of arbitrary intervals
+@section Valkyrie_ValkyrieIntervalProf Profiling of arbitrary intervals
 It is possible to profile arbitrary intervals in the lifetime of a Gaudi component.
 For example, you may want to profile only the initialize method of your algorithms,
 or anything that is executed between initialize and finalize, or anything in between the initialize of
@@ -72,7 +72,7 @@ Profile between the BeginRun and EndRun incident.
 In all cases the intervals are closed intervals in the mathematical sense, i.e. the profile always
 includes the start and end point.
 
-@section ValkyrieDump Properties to control profile dumps
+@section Valkyrie_ValkyrieDump Properties to control profile dumps
 The following properties can be set to control whether a new profile is being dumped after
 each event and interval, respectively. The default values are:
 <pre>
@@ -91,7 +91,7 @@ Additonal profiles can be dumped on any "Incident" by setting:
     Frank Winklmeier http://consult.cern.ch/xwho/people/660298
 
     
-@section ValkyrieExtraPages Extra pages
+@section Valkyrie_ValkyrieExtraPages Extra pages
 
   - @ref ValkyrieUsedPackages
   - @ref ValkyrieRequirements
@@ -99,10 +99,8 @@ Additonal profiles can be dumped on any "Incident" by setting:
 
 /**
    @page ValkyrieUsedPackages Uses packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page ValkyrieRequirements Requirements
-   @include requirements
 */
diff --git a/Database/APR/TrigCollQuery/doc/mainpage.h b/Database/APR/TrigCollQuery/doc/packagedoc.h
similarity index 86%
rename from Database/APR/TrigCollQuery/doc/mainpage.h
rename to Database/APR/TrigCollQuery/doc/packagedoc.h
index 824d2241f74e969db5436635e83ab63952f997b9..7bf1df6e1e9b49a340d659fcc06365c05fb89b92 100644
--- a/Database/APR/TrigCollQuery/doc/mainpage.h
+++ b/Database/APR/TrigCollQuery/doc/packagedoc.h
@@ -4,19 +4,19 @@
 
 /**
 
-@mainpage TrigCollQuery Package
+@page TrigCollQuery_page TrigCollQuery Package
 
 The package allowing Athena EventSelect and POOL Collection utilities to query TAG collections using trigger names, even though trigger information is stored in bit arrays.
 
 @author Marcin.Nowak@cern.ch
 
-@section IntroductionTrigCollQuery Introduction
+@section TrigCollQuery_IntroductionTrigCollQuery Introduction
 Due to a large number of triggers, storing each trigger in a separate attribute in TAG collections is impractical (and sometimes even impossible). Because of that, trigger information is stored in bit arrays, which in turn are stored as groups of 32-bit integer attributes in TAG collection.
 
 TrigCollQuery package provides tools that allow Athena EventSelector and the standalone POOL Collection utilities to query TAG collections using well know trigger names without worrying about bit positions and the names of attributes storing the bit arrays.
 
      
-@section TrigCollQueryOverview Class Overview
+@section TrigCollQuery_TrigCollQueryOverview Class Overview
   The TrigCollQuery package contains of following classes:
 
   - TrigCollQuery : The main class that can read the XML trigger configuration file and do the transformation of trigger query string replacing trigger names with bit operations.
@@ -24,11 +24,11 @@ TrigCollQuery package provides tools that allow Athena EventSelector and the sta
   - TrigCollQueryTool : Implementation of IAthenaSelectorTool interface on top of TrigCollQuery. Allows usage of the trigger queries by Athena EventSelector.
 
 
-@section TrigCollQueryExecutables Tools
+@section TrigCollQuery_TrigCollQueryExecutables Tools
 The TrigCollQuery package contains one command line tool - runCollUtil.exe. This tool is a wrapper for all standalone POOL Collection utilities. When put in front of a command that normally executes one of the POOL utilites, it will look for a -query option and search it for any trigger references, replacing them by bit operations.
 If the first option (before the executable name of the collection utility) is -usectpword, queries for L1 trigger decision will use the old name of the L1 trigger attribute - "CTPWord". The current attribute name is "L1PassedTrigMaskTAV"
      
-@section QueryUsageTrigCollQuery Syntax of Trigger Queries
+@section TrigCollQuery_QueryUsageTrigCollQuery Syntax of Trigger Queries
 To query for trigged bit set, add the following statement to the query string:
 
 TriggerPassed(TriggerName1[,TriggerName2,...])
@@ -41,7 +41,7 @@ Both statements may appear more than once in the query string, but grouping them
 
 
      
-@section EventSelectorUsageTrigCollQuery Trigger-based TAG Event selection in Athena
+@section TrigCollQuery_EventSelectorUsageTrigCollQuery Trigger-based TAG Event selection in Athena
 To use a trigger condition in an TAG event selection query in an Athena job, add the following lines to the jonOptions file:
 
 include("TrigCollQuery/TrigCollQuery_jobOptions.py")<br>
@@ -55,18 +55,18 @@ TrigCollQueryTool properties:
 
  - UseCTPWord : Boolean flag that tells the tool to use the old "CTPWord" attribute name for L1 trigger
 
-@section UtilityUsageTrigCollQuery Querying Triggers using POOL command-line Collection Utilities
+@section TrigCollQuery_UtilityUsageTrigCollQuery Querying Triggers using POOL command-line Collection Utilities
 To be able to query triggers when using POOL command line collection utilities like CollAppend, one needs to parse the query and translate trigger names into bit positions before passing it on to the utility. This is achieved using a "wrapper" application called runCollUtil.exe. Simply add the wrapper at the start of the command that invokes a POOL collection utility.
 
 Example:<br>
 runCollUtil.exe CollListAttrib -src fdr08_run1_MinBias_o1_r24_t3 RootCollection  -query 'TriggerPassed(L2_e12)' 
 
 
-@section TrigCollQueryTriggerMap The XML Trigger Configuration File
+@section TrigCollQuery_TrigCollQueryTriggerMap The XML Trigger Configuration File
 Mapping of the trigger names to bit locations in the TAGs is done according to trigger configuration stored by default in TriggerMenuXML/ChainTagMap.xml file. This file is part of Athena release since version 14.2.20 and is provided by Trigger/TriggerCommon/TriggerMenuXML package. It is currently assumed there are 3 trigger levels: L1, L2 and EF, and trigger bits are stored in TAG attributes called CTPWord, L2PassedTrigMask and EFPassedTrigMask.
 
 
-@section ExtrasTrigCollQuery Extra Pages
+@section TrigCollQuery_ExtrasTrigCollQuery Extra Pages
 
  - @ref UsedTrigCollQuery
  - @ref RequirementsTrigCollQuery
@@ -74,10 +74,8 @@ Mapping of the trigger names to bit locations in the TAGs is done according to t
 
 /**
 @page UsedTrigCollQuery Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTrigCollQuery Requirements
-@include requirements
 */
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/doc/MainPage.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/doc/packagedoc.h
similarity index 70%
rename from Database/AthenaPOOL/AthenaPoolCnvSvc/doc/MainPage.h
rename to Database/AthenaPOOL/AthenaPoolCnvSvc/doc/packagedoc.h
index 6b33f432f4474829395caba3c535b2cf71ff1c77..b9359efa4d5342657f4adae610ff18ad6d35a617 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/doc/MainPage.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/doc/packagedoc.h
@@ -4,35 +4,33 @@
 
 /**
 
-   \mainpage
+@page AthenaPoolCnvSvc_page 
 
 %AthenaPoolCnvSvc is part of a toolkit to implement the POOL persistency into Athena.
 It consists of four packages PoolSvc, %AthenaPoolCnvSvc(this one), EventSelectorAthenaPool and AthenaPoolUtilities.
 
-\section Properties Settable AthenaPoolCnvSvc Properties (Job Options)
+@section AthenaPoolCnvSvc_Properties Settable AthenaPoolCnvSvc Properties (Job Options)
 
 Settable AthenaPoolCnvSvc properties are in AthenaPoolCnvSvc_jobOptions.py:
 
 \include AthenaPoolCnvSvc_jobOptions.py
 
-\section Documentation Additional Documentation 
+@section AthenaPoolCnvSvc_Documentation Additional Documentation
 
 See the ATLAS User/Developer HowTo document for additional information.
 
 The code can be browsed using LXR 
 (http://atlassw1.phy.bnl.gov/lxr/source/atlas/Database/AthenaPOOL/AthenaPoolCnvSvc)
    
-\section Examples Examples
+@section AthenaPoolCnvSvc_Examples Examples
 The package Database/AthenaPOOL/AthenaPoolExample contains running examples of algorithms writing and
 reading Data Objects using AthenaPoolCnvSvc. 
 
-\section Requirements Requirements 
+@section AthenaPoolCnvSvc_Requirements Requirements
 
-@include requirements 
 
-\section PackagesUsed Packages Used 
+@section AthenaPoolCnvSvc_PackagesUsed Packages Used
 
-@htmlinclude used_packages.html
 
 @author Peter van Gemmeren <gemmeren@bnl.gov>
 */
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/doc/MainPage.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/doc/MainPage.h
rename to Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/doc/packagedoc.h
index 65e969da51397e8ba8535ff1a1fdafb9eb1fb442..f09f4ee593db48d90dfb47a45ca18b7a5aca886b
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/doc/MainPage.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page AthenaPoolExampleAlgorithms_page 
 
 The package Database/AthenaPOOL/AthenaPoolExample contains running examples of algorithms writing and
 reading Data Objects using AthenaPool. This sub package, AthenaPoolExampleAlgorithms, defines the 
@@ -163,7 +163,7 @@ SimplePoolFile2.root: EventInfo
 SimplePoolFile3.root: EventInfo, Hits (via Navigation), Tracks
 
 
-@section Documentation Additional Documentation
+@section AthenaPoolExampleAlgorithms_Documentation Additional Documentation
 
 See the ATLAS User/Developer HowTo document for additional information.
 
@@ -171,14 +171,12 @@ The code can be browsed using LXR
 (http://alxr.usatlas.bnl.gov/lxr/source/atlas/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/)
 
 
-@section Requirements Requirements
+@section AthenaPoolExampleAlgorithms_Requirements Requirements
 
-@include requirements
 
 
-@section PackagesUsed Packages Used
+@section AthenaPoolExampleAlgorithms_PackagesUsed Packages Used
 
-@htmlinclude used_packages.html
 
 
 @author Peter van Gemmeren <gemmeren@anl.gov>
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/doc/MainPage.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/doc/MainPage.h
rename to Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/doc/packagedoc.h
index 888368511841532e99935fbaab6e179270c8b5ed..884ef83f60e9960814f7b54ea521d67741b385f1
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/doc/MainPage.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page AthenaPoolExampleConverter_page 
 
 The package Database/AthenaPOOL/AthenaPoolExample contains running examples of algorithms writing and
 reading Data Objects using AthenaPool. This sub package, AthenaPoolExampleConverter, defines
@@ -29,7 +29,7 @@ While reading they use the POOL class ID to dispatch the correct T-P converter.
 converter is used.
 
 
-@section Documentation Additional Documentation
+@section AthenaPoolExampleConverter_Documentation Additional Documentation
 
 See the ATLAS User/Developer HowTo document for additional information.
 
@@ -37,14 +37,12 @@ The code can be browsed using LXR
 (http://alxr.usatlas.bnl.gov/lxr/source/atlas/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/)
 
 
-@section Requirements Requirements
+@section AthenaPoolExampleConverter_Requirements Requirements
 
-@include requirements
 
 
-@section PackagesUsed Packages Used
+@section AthenaPoolExampleConverter_PackagesUsed Packages Used
 
-@htmlinclude used_packages.html
 
 
 @author Peter van Gemmeren <gemmeren@anl.gov>
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/doc/MainPage.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 80%
rename from Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/doc/MainPage.h
rename to Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/doc/packagedoc.h
index dee125eb73fd7179d1dd1fde066024209cfad5bf..43b43ac501a698ce1faeea85d7c837a2443a8b5f
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/doc/MainPage.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page AthenaPoolExampleData_page 
 
 The package Database/AthenaPOOL/AthenaPoolExample contains running examples of algorithms writing and
 reading Data Objects using AthenaPool. This sub package, AthenaPoolExampleData, defines two toy data classes
@@ -16,7 +16,7 @@ ExampleTrack will be used for Toy AOD and contains some data plus various links,
 and Navigables, to ExampleHits.
 
 
-@section Documentation Additional Documentation
+@section AthenaPoolExampleData_Documentation Additional Documentation
 
 See the ATLAS User/Developer HowTo document for additional information.
 
@@ -24,14 +24,12 @@ The code can be browsed using LXR
 (http://alxr.usatlas.bnl.gov/lxr/source/atlas/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/)
 
 
-@section Requirements Requirements
+@section AthenaPoolExampleData_Requirements Requirements
 
-@include requirements
 
 
-@section PackagesUsed Packages Used
+@section AthenaPoolExampleData_PackagesUsed Packages Used
 
-@htmlinclude used_packages.html
 
 
 @author Peter van Gemmeren <gemmeren@anl.gov>
diff --git a/Database/AthenaPOOL/AthenaPoolTools/doc/MainPage.h b/Database/AthenaPOOL/AthenaPoolTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from Database/AthenaPOOL/AthenaPoolTools/doc/MainPage.h
rename to Database/AthenaPOOL/AthenaPoolTools/doc/packagedoc.h
index 973daa189cba5affc320f63b50cfafa986f5d4a1..e12ca7da3fcd23804f18534230ec2ae3c36ae295
--- a/Database/AthenaPOOL/AthenaPoolTools/doc/MainPage.h
+++ b/Database/AthenaPOOL/AthenaPoolTools/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page AthenaPoolTools_page 
 
-@section count EventCount
+@section AthenaPoolTools_count EventCount
 
 12 June 2007 J. Cranshaw
 
@@ -65,7 +65,7 @@ EventCount           INFO ----------------------------------------<br>
 Necessarily, any metadata information in the DataHeader is 
 dependent on the output process properly setting it. 
 
-@section RequireUniqueEvent
+@section AthenaPoolTools_RequireUniqueEvent 
 
 Issues a WARNING if a run/event number repeats during an athena job.
 
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/doc/MainPage.h b/Database/AthenaPOOL/AthenaPoolUtilities/doc/packagedoc.h
similarity index 94%
rename from Database/AthenaPOOL/AthenaPoolUtilities/doc/MainPage.h
rename to Database/AthenaPOOL/AthenaPoolUtilities/doc/packagedoc.h
index bf18897ee5db2dec4b4d01a976b8f8b612a7b537..8ea9c99b14f5fa36039e28db5088854c330e3f80 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/doc/MainPage.h
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page AthenaPoolUtilities_page 
 
 AthenaPoolUtilities is a package containing tools for using POOL
 persistency software with Athena. Presently it contains CMT patterns
@@ -15,7 +15,7 @@ is an Athena adapter for [[http://pool.cern.ch/releases/POOL_2_0_0/doc/classRefe
 below. Finally, there are a number of POOL Collection utilities whose
 use are as well described below.
 
-@section converters Generating POOL Converters For Data Packages
+@section AthenaPoolUtilities_converters Generating POOL Converters For Data Packages
 
 15 August 2003  RDS
 
@@ -76,7 +76,7 @@ seen above. Note that this will be automated in the future so that the
 dictionaries will be loaded when needed. When this happens the
 <package>_linkopts will need to be removed.
 
-@section AthenaAttributeList AthenaAttributeList
+@section AthenaPoolUtilities_AthenaAttributeList AthenaAttributeList
 
 The class AthenaAttributeList is used to set the Tag in an Event
 Collection. An !AttributeList represents a logical row of attributes in
@@ -87,7 +87,7 @@ store, e.g. the Event Store. The classes [[http://pool.cern.ch/releases/POOL_2_0
 [[http://pool.cern.ch/releases/POOL_2_0_0/doc/classReference/html/classpool_1_1AttributeListSpecification.html][AttributeListSpecification]] are defined in POOL (and eventually in
 SEAL).
 
-@section TPObjRef  TPObjRef and TPCnvTokenList_p1 classes
+@section AthenaPoolUtilities_TPObjRef TPObjRef and TPCnvTokenList_p1 classes
 
 This package contains 2 classes that are used in Athena TP-separated
 persistent data model: TPObjRef and TPCnvTokenList_p1.
diff --git a/Database/AthenaPOOL/DBDataModel/doc/MainPage.h b/Database/AthenaPOOL/DBDataModel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from Database/AthenaPOOL/DBDataModel/doc/MainPage.h
rename to Database/AthenaPOOL/DBDataModel/doc/packagedoc.h
index 1ece33e97914c6cb8d6022f037f3d2bdfd36fb0d..c845527cda7943a39336a5f42865456cc3f313a9
--- a/Database/AthenaPOOL/DBDataModel/doc/MainPage.h
+++ b/Database/AthenaPOOL/DBDataModel/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page DBDataModel_page 
 
 AthenaPool is a toolkit to support use of LCG POOL as a persistence technology in Athena.
 It consists of several packages:  PoolSvc, AthenaPoolCnvSvc, AthenaPoolUtilities,
@@ -25,12 +25,12 @@ A DataHeader is written automatically by AthenaPOOL for each "event". It is used
 DataObject from POOL and provide support for BackNavigation.
 
 
-@section Properties Settable DBDataModel Properties (Job Options)
+@section DBDataModel_Properties Settable DBDataModel Properties (Job Options)
 
 This package has no properties and no jobOptions.
 
 
-@section Documentation Additional Documentation 
+@section DBDataModel_Documentation Additional Documentation
 
 See the ATLAS User/Developer HowTo document for additional information.
 
@@ -38,19 +38,17 @@ The code can be browsed using LXR
 (http://alxr.usatlas.bnl.gov/lxr/source/atlas/Database/AthenaPOOL/DBDataModel/)
    
 
-@section Examples Examples
+@section DBDataModel_Examples Examples
 The package Database/AthenaPOOL/AthenaPoolExample contains running examples of algorithms writing and
 reading Data Objects using AthenaPool. 
 
 
-@section Requirements Requirements 
+@section DBDataModel_Requirements Requirements
 
-@include requirements 
 
 
-@section PackagesUsed Packages Used 
+@section DBDataModel_PackagesUsed Packages Used
 
-@htmlinclude used_packages.html
 
 
 @author Peter van Gemmeren <gemmeren@anl.gov>
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/doc/MainPage.h b/Database/AthenaPOOL/EventSelectorAthenaPool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 75%
rename from Database/AthenaPOOL/EventSelectorAthenaPool/doc/MainPage.h
rename to Database/AthenaPOOL/EventSelectorAthenaPool/doc/packagedoc.h
index e8a028b52d2aeb37c7a7ff4c8201dac2b48507a0..a89606bd3e1634f8145627e504a8c0f62f88ca0d
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/doc/MainPage.h
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page EventSelectorAthenaPool_page 
 
 AthenaPool is a toolkit to support use of LCG POOL as a persistence technology in Athena.
 It consists of several packages:  PoolSvc, AthenaPoolCnvSvc, AthenaPoolUtilities,
@@ -19,12 +19,12 @@ conditions data input from POOL.
 The EventSelectorAthenaPool implements BackNavigation using the "Provenance" vector in the DataHeader.
 
 
-@section Properties Settable EventSelectorAthenaPool Properties (Job Options)
+@section EventSelectorAthenaPool_Properties Settable EventSelectorAthenaPool Properties (Job Options)
 
 @include EventSelectorAthenaPool_jobOptions.py
 
 
-@section Documentation Additional Documentation
+@section EventSelectorAthenaPool_Documentation Additional Documentation
 
 See the ATLAS User/Developer HowTo document for additional information.
 
@@ -32,19 +32,17 @@ The code can be browsed using LXR
 (http://alxr.usatlas.bnl.gov/lxr/source/atlas/Database/AthenaPOOL/EventSelectorAthenaPool/)
 
 
-@section Examples Examples
+@section EventSelectorAthenaPool_Examples Examples
 The package Database/AthenaPOOL/AthenaPoolExample contains running examples of algorithms writing and
 reading Data Objects using AthenaPool.
 
 
-@section Requirements Requirements
+@section EventSelectorAthenaPool_Requirements Requirements
 
-@include requirements
 
 
-@section PackagesUsed Packages Used
+@section EventSelectorAthenaPool_PackagesUsed Packages Used
 
-@htmlinclude used_packages.html
 
 
 @author Peter van Gemmeren <gemmeren@anl.gov>
diff --git a/Database/AthenaPOOL/PoolSvc/doc/MainPage.h b/Database/AthenaPOOL/PoolSvc/doc/packagedoc.h
similarity index 79%
rename from Database/AthenaPOOL/PoolSvc/doc/MainPage.h
rename to Database/AthenaPOOL/PoolSvc/doc/packagedoc.h
index baec746031d72d5ee912707b801a4cbe4566440d..ec72c3e8c2f13473f46ff43fabafd9f14e6a72f0 100644
--- a/Database/AthenaPOOL/PoolSvc/doc/MainPage.h
+++ b/Database/AthenaPOOL/PoolSvc/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page PoolSvc_page 
 
 AthenaPool is a toolkit to support use of LCG POOL as a persistence technology in Athena.
 It consists of several packages:  PoolSvc(this one), AthenaPoolCnvSvc, AthenaPoolUtilities,
@@ -15,14 +15,14 @@ catalog specification, and querying and control of POOL configuration options.
 PoolSvc is used via its IPoolSvc interface.
 
 
-@section Properties Settable PoolSvc Properties (Job Options)
+@section PoolSvc_Properties Settable PoolSvc Properties (Job Options)
 
 Settable PoolSvc properties are in PoolSvc_jobOptions.py:
 
 @include PoolSvc_jobOptions.py
 
 
-@section Documentation Additional Documentation
+@section PoolSvc_Documentation Additional Documentation
 
 See the ATLAS User/Developer HowTo document for additional information.
 
@@ -30,19 +30,17 @@ The code can be browsed using LXR
 (http://alxr.usatlas.bnl.gov/lxr/source/atlas/Database/AthenaPOOL/PoolSvc)
 
 
-@section Examples Examples
+@section PoolSvc_Examples Examples
 The package Database/AthenaPOOL/AthenaPoolExample contains running examples of algorithms writing and
 reading Data Objects using PoolSvc.
 
 
-@section Requirements Requirements
+@section PoolSvc_Requirements Requirements
 
-@include requirements
 
 
-@section PackagesUsed Packages Used
+@section PoolSvc_PackagesUsed Packages Used
 
-@htmlinclude used_packages.html
 
 
 @author Peter van Gemmeren <gemmeren@anl.gov>
diff --git a/Database/AthenaPOOL/RDBAccessSvc/doc/MainPage.h b/Database/AthenaPOOL/RDBAccessSvc/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from Database/AthenaPOOL/RDBAccessSvc/doc/MainPage.h
rename to Database/AthenaPOOL/RDBAccessSvc/doc/packagedoc.h
index a7e34aa9b3a905dd7f32ab5d5fb71f5cc6d26c69..1c923e1fec514ab00be9d2bad5d560db62be6bfe
--- a/Database/AthenaPOOL/RDBAccessSvc/doc/MainPage.h
+++ b/Database/AthenaPOOL/RDBAccessSvc/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page RDBAccessSvc_page 
 
 RDBAccessSvc is a package providing access to the data into relational
 database with HVS-enabled schema. The data is accessed through POOL 
@@ -39,7 +39,5 @@ of RDBRecord object (depending on the field data type)
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/Database/AtlasSTLAddReflex/doc/mainpage.h b/Database/AtlasSTLAddReflex/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Database/AtlasSTLAddReflex/doc/mainpage.h
rename to Database/AtlasSTLAddReflex/doc/packagedoc.h
index de9ce19e854b6a9ab985da186c0f9dc0449b145e..0a390a8180c1f00c9d87830b73951ecc6a6479e6
--- a/Database/AtlasSTLAddReflex/doc/mainpage.h
+++ b/Database/AtlasSTLAddReflex/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage AtlasSTLAddReflex Package
+@page AtlasSTLAddReflex_page AtlasSTLAddReflex Package
 
 This package contains Reflex dictionary definitions for some STL containers.
 
 @author R.D.Schaffer@cern.ch
 
-@section IntroductionAtlasSTLAddReflex Introduction
+@section AtlasSTLAddReflex_IntroductionAtlasSTLAddReflex Introduction
 
 Most STL-related containers for basics types, e.g. std::vector<float>,
 are defined in ROOT itself or in STLAddRflx from the LCG RELAX
@@ -20,11 +20,9 @@ ATLAS, e.g. std::vector<std::vector<float> >.
 
 /**
 @page UsedAtlasSTLAddReflex Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsAtlasSTLAddReflex Requirements
-@include requirements
 */
 
diff --git a/Database/AtlasSealCLHEP/doc/mainpage.h b/Database/AtlasSealCLHEP/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from Database/AtlasSealCLHEP/doc/mainpage.h
rename to Database/AtlasSealCLHEP/doc/packagedoc.h
index 3cb52d97eacefa3566d54d4d86aea26e4aef89bd..a86a6d770c2a443b530d844659a8161baac403ee
--- a/Database/AtlasSealCLHEP/doc/mainpage.h
+++ b/Database/AtlasSealCLHEP/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage AtlasSealCLHEP Package
+@page AtlasSealCLHEP_page AtlasSealCLHEP Package
 
 This package contains Reflex dictionary definitions for some CLHEP classes used within ATLAS.
 
 @author R.D.Schaffer@cern.ch, Marcin.Nowak@cern.ch
 
-@section IntroductionAtlasSealCLHEP Introduction
+@section AtlasSealCLHEP_IntroductionAtlasSealCLHEP Introduction
 
 CLHEP classes used in ATLAS are defined in this package. This package
 was originally needed when CLHEP classes were being written out
@@ -25,11 +25,9 @@ needed with data written with from release 13 and beyond.
 
 /**
 @page UsedAtlasSealCLHEP Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsAtlasSealCLHEP Requirements
-@include requirements
 */
 
diff --git a/Database/ConnectionManagement/DBReplicaSvc/doc/mainpage.h b/Database/ConnectionManagement/DBReplicaSvc/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Database/ConnectionManagement/DBReplicaSvc/doc/mainpage.h
rename to Database/ConnectionManagement/DBReplicaSvc/doc/packagedoc.h
index f6914705dbf23a8bc44127a0347f667be83f63cc..9e08969252f948ff86e52d8c42faeec8b212f0a3
--- a/Database/ConnectionManagement/DBReplicaSvc/doc/mainpage.h
+++ b/Database/ConnectionManagement/DBReplicaSvc/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage DBReplicaSvc package
+@page DBReplicaSvc_page DBReplicaSvc package
 
-\section introductionDBReplicaSvc Introduction
+@section DBReplicaSvc_introductionDBReplicaSvc Introduction
 
 The DBReplicaSvc is used by ATLAS database applications which make database
 connections through CORAL. It implements the coral::IReplicaSortingAlgorithm
@@ -20,7 +20,7 @@ appropriate for different domains. Those which match the current domain are
 considered as possible replicas when CORAL asks for the list of replicas
 to be filtered and sorted.
 
-\section configurationDBReplicaSvc Configuration file
+@section DBReplicaSvc_configurationDBReplicaSvc Configuration file
 
 The configuration file is normally called dbreplica.config, and is looked for 
 via PathResolver. It will be kept separately, in the AtlasAuthentication
@@ -51,7 +51,7 @@ server-based replicas. This can be turned off separately for COOL replicas
 used to force jobs which would normally read data from the database release
 (which uses SQLite files) to instead use an Oracle (or other server) replica.
 
-\section joboptDBReplicaSvc Job options
+@section DBReplicaSvc_joboptDBReplicaSvc Job options
 
 The following job options are defined:
  - ConfigFile (default 'dbreplica.config') - name of the configuration file
@@ -60,12 +60,10 @@ The following job options are defined:
  - UseGeomSQLIte (default 'True') - use SQLite replicas for geometry if offered
  - DisableFailover (default 'False') - only allow one (primary) Oracle replica
 
-@section requirements requirements
+@section DBReplicaSvc_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section DBReplicaSvc_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
diff --git a/Database/CoolConvUtilities/doc/mainpage.h b/Database/CoolConvUtilities/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 98%
rename from Database/CoolConvUtilities/doc/mainpage.h
rename to Database/CoolConvUtilities/doc/packagedoc.h
index 6b50d2ae497f1b40927efe29a17ad9a1a8367be1..3b3885ad4b746e01d5c6bd35dcc779de3a5a752f
--- a/Database/CoolConvUtilities/doc/mainpage.h
+++ b/Database/CoolConvUtilities/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage CoolConvUtilities package
+@page CoolConvUtilities_page CoolConvUtilities package
 
-\section introductionCoolConvUtilities Introduction
+@section CoolConvUtilities_introductionCoolConvUtilities Introduction
 
 This package provides several standalone utilties which aid the interaction
 with the COOL conditions database.
@@ -32,7 +32,7 @@ source /afs/cern.ch/atlas/software/builds/AtlasConditions/2.0.1/Database/CoolCon
 If you are in another full offline software environment (e.g. RecExCommon),
 the environment should be setup for the utilities to work without problem.
 
-\section DCSTxtToCool
+@section CoolConvUtilities_DCSTxtToCool 
 
 The DCSTxtToCool command is used as follows:
 <pre>
@@ -103,7 +103,7 @@ some subsequent DCS data to a folder already containing earlier DCS data,
 providing all the new data has later timestamps than the old data. This
 is in accordance with the runs for updating COOL single-version folders.
 
-\section LisToCool
+@section CoolConvUtilities_LisToCool 
 
 The LisToCool command is used as follows:
 <pre>
@@ -164,7 +164,7 @@ the COOL tagging convention where a unique folder-based prefix is applied
 to tag names (e.g. MyFolder_MyTag) to ensure they are globally unique. If
 no prefix is supplied, the Lisbon tags will be used unchanged.
 
-\section AtlCoolCopy
+@section CoolConvUtilities_AtlCoolCopy 
 
 Note that full up-to-date documentation for AtlCoolCopy is maintained at:
 http://twiki.cern.ch/twiki/bin/view/Atlas/AtlCoolCopy
@@ -476,7 +476,7 @@ AtlCoolCopy.exe produces the following error codes:
 
 
 
-\section AtlCoolConsole
+@section CoolConvUtilities_AtlCoolConsole 
 
 AtlCoolConsole is an extension to the python shell which allows simple 
 inspection and modifying of data in a COOL database instance, with a 
@@ -537,13 +537,11 @@ Welcome to AtlCoolConsole. Type 'help' for instructions.
   Name              Description       Count     Size        
 </pre>
 
-@section requirements requirements 
+@section CoolConvUtilities_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section CoolConvUtilities_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
 
diff --git a/Database/CoraCool/doc/mainpage.h b/Database/CoraCool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 97%
rename from Database/CoraCool/doc/mainpage.h
rename to Database/CoraCool/doc/packagedoc.h
index 7c2ee8e1eda186f1fc048bbd27bbbe6e1855f49c..a33abdf7e8c9b4acdeea52907f6701fb9fc03ea4
--- a/Database/CoraCool/doc/mainpage.h
+++ b/Database/CoraCool/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage CoraCool package
+@page CoraCool_page CoraCool package
 
-\section introductionCoraCool Introduction
+@section CoraCool_introductionCoraCool Introduction
 
 CoraCool is a utility package that builds on top of the LCG COOL software 
 to create an interval-of-validity indexed storage for sets of 
@@ -23,7 +23,7 @@ can read a CoraCool table and present the data in the TDS as a CondAttrListVec
 class), and also allows the data to be replicated using a centrally-provided
 tool (AtlCoolCopy).
 
-\section schema Data Model
+@section CoraCool_schema Data Model
 
 The data model is that of a COOL folder plus an associated database table 
 containing the payload, managed by CORAL. The API performs coordinated 
@@ -105,7 +105,7 @@ However, due to the use of the COOL API, bulk retrieval still involves many
 separate SQL queries for the payload data (though these are currently 
 combined in groups of 10 to acheieve some speedup).
 
-\section classes Classes
+@section CoraCool_classes Classes
 
 The main classes used in the CoraCool package are discussed below. For 
 a detailed documentation of the API, see the class header files.
@@ -158,12 +158,10 @@ hasNext and next methods.
 a sequence for the generation of primary keys. It should not be used by
 clients.
 
-@section requirements requirements
+@section CoraCool_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section CoraCool_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
diff --git a/Database/IOVDbSvc/doc/mainpage.h b/Database/IOVDbSvc/doc/packagedoc.h
similarity index 96%
rename from Database/IOVDbSvc/doc/mainpage.h
rename to Database/IOVDbSvc/doc/packagedoc.h
index 2c38b88225803d2d0a90fd0670b0f8a06a61f079..f354e1ffa2ead41ddf085ff37a4410579c52d536 100644
--- a/Database/IOVDbSvc/doc/mainpage.h
+++ b/Database/IOVDbSvc/doc/packagedoc.h
@@ -5,7 +5,7 @@
 // Mainpage for doxygen
 
 /**
-@mainpage package IOVDbSvc
+@page IOVDbSvc_page package IOVDbSvc
 
 IOVDbSvc is an Athena service interface to the Interval Of Validity
 (IOV) database access, also known as the conditions database.
@@ -54,7 +54,7 @@ associated tag for a folder (getKeyInfo method) and indicate a particular
 conditions object is no longer required and can be deleted to save memory
 (dropObject method).
 
-@section config Configuration
+@section IOVDbSvc_config Configuration
 
 IOVDbSvc is normally configured using the IOVDbSvc.CondDB helper python class,
 rather than directly setting job options. This is particularly important
@@ -71,7 +71,7 @@ connect to, and the second is the folder name, which is used to set
 IOVDbSvc.Folders as described below. For more details, see 
 <a href=https://twiki.cern.ch/twiki//bin/view/Atlas/CoolIOVDbSvcConfigurable>CoolIOVDbSvcConfigurable</a>
 
-@section jobopts Job option parameters
+@section IOVDbSvc_jobopts Job option parameters
 
 IOVDbSvc supports the following joboption parameters:
 
@@ -130,7 +130,7 @@ when using Frontier - see below.
 for missing channels outside cache IOV.
 
 
-@section HowTo How to qualify the IOVDbSvc.Folders parameters in jobOptions:
+@section IOVDbSvc_HowTo How to qualify the IOVDbSvc.Folders parameters in jobOptions:
 
 There are essentially 5 markups available:
 
@@ -170,7 +170,7 @@ IOVDbSvc.Folders += [ "/Test/* <tag>DC2</tag> <offset>-1</offset> <dbConnection>
 IOVDbSvc.Folders += [ "/Test/ <forceRunNumber>12345</forceRunNumber>" ]
 </pre>
 
-@section ints Internal structure
+@section IOVDbSvc_ints Internal structure
 
 This IOVDbSvc implementation is structured as four classes internally:
  - IOVDbSvc, which implements the service with appropriate interfaces, and 
@@ -226,7 +226,7 @@ point, all other folders associated with this schema will also be checked,
 and their caches updated from the database if neccessary, again making maximum
 use of the database connection while it is open.
 
-@section configcache Configuring cache behaviour
+@section IOVDbSvc_configcache Configuring cache behaviour
 
 The length of the caches can be controlled in various ways. If a &lt;cache&gt; 
 specification is present in the folder meta-data or folder job options, 
@@ -250,7 +250,7 @@ If these parameters are not set, IOVDbSvc will also automatically double the
 length of the internal cache each time it has to be refilled, so trying to 
 dynamically adapt the size of the cache to the job being processed.
 
-@section frontiercache Cacheing and Frontier
+@section IOVDbSvc_frontiercache Cacheing and Frontier
 
 If data is being accessed via Frontier and Squid caches, it is important that
 many Athena jobs make exactly the same data requests, even if their
@@ -276,7 +276,7 @@ queries and more 'redundant' data - N=3 may be optimial. The default value
 of N=0 means no alignment is done, which is appropriate for more traditional
 database servers.
 
-@section dblog Database read logging
+@section IOVDbSvc_dblog Database read logging
 
 IOVDbSvc now prints a summary during finalize of how much data has been 
 read from each folder, which can be used for debugging, spotting unncessary
@@ -326,13 +326,11 @@ Larger numbers indicate the schema was reaccessed later in the job to
 read more data.
 
  
-@section Req The requirements file:
-@include requirements
+@section IOVDbSvc_Req The requirements file:
 
-@section joFile The example jobOptions file:
+@section IOVDbSvc_joFile The example jobOptions file:
 @include IOVDbSvc_jobOptions.py
 
-@section Uses The packages used: 
-@htmlinclude used_packages.html
+@section IOVDbSvc_Uses The packages used:
 
 */
diff --git a/Database/PersistentDataModel/doc/MainPage.h b/Database/PersistentDataModel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Database/PersistentDataModel/doc/MainPage.h
rename to Database/PersistentDataModel/doc/packagedoc.h
index 42a605dd54dabbd9407f96f1ab3e7871d3470d37..edd4fc5ac07cb14f77b3b625c650db1386e1d302
--- a/Database/PersistentDataModel/doc/MainPage.h
+++ b/Database/PersistentDataModel/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page PersistentDataModel_page 
 
 The PersistentDataModel package contains the definition of the persistent Data Model classes such as
 DataHeader and DataHeaderElement.
@@ -21,12 +21,12 @@ A DataHeader is written automatically by AthenaPOOL for each "event". It is used
 DataObject from POOL and provide support for BackNavigation.
 
 
-@section Properties Settable PersistentDataModel Properties (Job Options)
+@section PersistentDataModel_Properties Settable PersistentDataModel Properties (Job Options)
 
 This package has no properties and no jobOptions.
 
 
-@section Documentation Additional Documentation 
+@section PersistentDataModel_Documentation Additional Documentation
 
 See the ATLAS User/Developer HowTo document for additional information.
 
@@ -34,14 +34,12 @@ The code can be browsed using LXR
 (http://alxr.usatlas.bnl.gov/lxr/source/atlas/Database/PersistentDataModel/)
    
 
-@section Requirements Requirements 
+@section PersistentDataModel_Requirements Requirements
 
-@include requirements 
 
 
-@section PackagesUsed Packages Used 
+@section PersistentDataModel_PackagesUsed Packages Used
 
-@htmlinclude used_packages.html
 
 
 @author Peter van Gemmeren <gemmeren@anl.gov>
diff --git a/Database/PersistentDataModelAthenaPool/doc/MainPage.h b/Database/PersistentDataModelAthenaPool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 61%
rename from Database/PersistentDataModelAthenaPool/doc/MainPage.h
rename to Database/PersistentDataModelAthenaPool/doc/packagedoc.h
index dda041dca7bab37303d0d6181f7c751b6a778bff..1e9850f66de216bfdb9c2f758bc39073d924ace3
--- a/Database/PersistentDataModelAthenaPool/doc/MainPage.h
+++ b/Database/PersistentDataModelAthenaPool/doc/packagedoc.h
@@ -4,18 +4,18 @@
 
 /**
 
-@mainpage
+@page PersistentDataModelAthenaPool_page 
 
 The PersistentDataModelAthenaPool package contains the converter for the persistent Data Model classes in
 PersistentDataModel.
 
 
-@section Properties Settable PersistentDataModelAthenaPool Properties (Job Options)
+@section PersistentDataModelAthenaPool_Properties Settable PersistentDataModelAthenaPool Properties (Job Options)
 
 This package has no properties and no jobOptions.
 
 
-@section Documentation Additional Documentation 
+@section PersistentDataModelAthenaPool_Documentation Additional Documentation
 
 See the ATLAS User/Developer HowTo document for additional information.
 
@@ -23,19 +23,17 @@ The code can be browsed using LXR
 (http://alxr.usatlas.bnl.gov/lxr/source/atlas/Database/PersistentDataModelAthenaPool/)
    
 
-@section Examples Examples
+@section PersistentDataModelAthenaPool_Examples Examples
 The package Database/AthenaPOOL/AthenaPoolExample contains running examples of algorithms writing and
 reading Data Objects using AthenaPool. 
 
 
-@section Requirements Requirements 
+@section PersistentDataModelAthenaPool_Requirements Requirements
 
-@include requirements 
 
 
-@section PackagesUsed Packages Used 
+@section PersistentDataModelAthenaPool_PackagesUsed Packages Used
 
-@htmlinclude used_packages.html
 
 
 @author Peter van Gemmeren <gemmeren@anl.gov>
diff --git a/Database/RegistrationServices/doc/MainPage.h b/Database/RegistrationServices/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from Database/RegistrationServices/doc/MainPage.h
rename to Database/RegistrationServices/doc/packagedoc.h
index d37d22d7f019493c0a84684371854289a14e22a0..4fc52c35acf3760c058f87b733a981597a9ab392
--- a/Database/RegistrationServices/doc/MainPage.h
+++ b/Database/RegistrationServices/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page RegistrationServices_page 
 
 RegistrationServices is a package containing services for different
 database-related registrations. Currently there are three services:
@@ -54,7 +54,7 @@ MetaDataStore.</li>
 
 All of these services are documented below.
 
-@section RegistrationStream RegistrationStream 
+@section RegistrationServices_RegistrationStream RegistrationStream
 
 Whenever an AthenaOutputStream writes out an event, there is
 always a DataHeader object written which contains references to all
@@ -188,7 +188,7 @@ desired containers are available in the MetaDataStore, then they will be copied
 output. Key="*" will write all CollectionMetadataContainers in the MetaDataStore</li></ul>
 </ul>
 
-@section IOVRegistrationSvc IOVRegistrationSvc
+@section RegistrationServices_IOVRegistrationSvc IOVRegistrationSvc
 
 The IOVRegistrationSvc is used  used to register conditions objects in
 the Interval of Validity (IOV) database. We consider two steps for the
@@ -292,7 +292,7 @@ which will result in the COOL folder being created with the columns having
 maximum size of 255 characters and 64k characters. The default mapping
 for strings is set to 4k, for compatibility with COOL1.3.
 
-@section OutputConditionsAlg OutputConditionsAlg
+@section RegistrationServices_OutputConditionsAlg OutputConditionsAlg
 
 Storing and registering conditions objects from Athena is normally done in two
 steps - first writing the objects out to a POOL/ROOT file using the 
@@ -377,25 +377,23 @@ to different POOL objects, mapped to COOL folders with several channels)
 can also be written using this tool, by giving the container object name as the
 classname.
 
-@section RegistrationStreamJobOptions RegistrationStream JobOptions
+@section RegistrationServices_RegistrationStreamJobOptions RegistrationStream JobOptions
 
 @include RegistrationStream_jobOptions.py
 
-@section IOVRegistrationSvcJobOptions IOVRegistrationSvc JobOptions
+@section RegistrationServices_IOVRegistrationSvcJobOptions IOVRegistrationSvc JobOptions
 
 @include IOVRegistrationSvc_jobOptions.py
 
-@section OutputConditionsAlgJobOptions OutputConditionsAlg JobOptions
+@section RegistrationServices_OutputConditionsAlgJobOptions OutputConditionsAlg JobOptions
 
 @include OutputConditionsAlg_jobOptions.py
 
-@section requirements requirements 
+@section RegistrationServices_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section RegistrationServices_uses Packages used
 
-@htmlinclude used_packages.html
 
 
 */
diff --git a/DetectorDescription/AtlasDetDescr/doc/MainPage.h b/DetectorDescription/AtlasDetDescr/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 82%
rename from DetectorDescription/AtlasDetDescr/doc/MainPage.h
rename to DetectorDescription/AtlasDetDescr/doc/packagedoc.h
index ee9a159bdb421ba5c97feb20df4b8fbac9b38d63..99116f6f94675ac4da424b22eba5bd0ff1c6054b
--- a/DetectorDescription/AtlasDetDescr/doc/MainPage.h
+++ b/DetectorDescription/AtlasDetDescr/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page AtlasDetDescr_page 
 
 This package contains an implentation base class for all identifier
 helper classes - AtlasDetectorID. This class contains the information
@@ -18,12 +18,10 @@ AtlasDetectorID also provides facilities for printing out identifiers,
 e.g. show_to_string, and maintains the version tags.
 
 
-@section requirements requirements 
+@section AtlasDetDescr_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section AtlasDetDescr_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondExample/doc/mainpage.h b/DetectorDescription/DetDescrCond/DetDescrCondExample/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from DetectorDescription/DetDescrCond/DetDescrCondExample/doc/mainpage.h
rename to DetectorDescription/DetDescrCond/DetDescrCondExample/doc/packagedoc.h
index db1c8d6e5e7ce497f6812aa9ab1fc70dce2541f0..7073deb2635f9aa7cdd66b93acbfb73c19ba32a4
--- a/DetectorDescription/DetDescrCond/DetDescrCondExample/doc/mainpage.h
+++ b/DetectorDescription/DetDescrCond/DetDescrCondExample/doc/packagedoc.h
@@ -4,15 +4,15 @@
 
 /**
 
-@mainpage The DetDescrCondExample package
+@page DetDescrCondExample_page The DetDescrCondExample package
 
-\section introductionDetDescrCondExample Introduction
+@section DetDescrCondExample_introductionDetDescrCondExample Introduction
 
 This package provides a set of examples demonstrating use of various
 functionality related to conditions data in Detector Description. The available
 example algorithms (so far ReadWriteCoolStrFile, ReadTopTrans, ReadAlignTrans and CoolHistExample) are described in more detail below.
 
-\section ReadWriteCoolStrFile
+@section DetDescrCondExample_ReadWriteCoolStrFile 
 
 This algorithm demonstrates the functionality of the CoolStrFileSvc service in
 the package DetDescrCondTools. It also provides a way to get new files of
@@ -68,16 +68,16 @@ The write example can be used with small modifications to actually upload
 data into the conditions database. The read example should be studied to
 see how to access the resulting data in your own algorithms.
 
-\section ReadTopTrans
+@section DetDescrCondExample_ReadTopTrans 
 
 This algorithm provides a simple way to read back DetCondKeyTrans objects, and
 demonstrates the various forms of callbacks that can be used.
 
-@section ReadTopTransJobOptions ReadTopTrans jobOptions
+@section DetDescrCondExample_ReadTopTransJobOptions ReadTopTrans jobOptions
 
 @include ReadTopTrans.py
 
-\section ReadAlignTrans
+@section DetDescrCondExample_ReadAlignTrans 
 
 This algorithm provides an example of setting a callback which is called 
 whenever the inner detector alignment changes. This could be needed for
@@ -97,7 +97,7 @@ way to validate the caching process.
 
 @include ReadAlignTrans.py
 
-\section CoolHistExample
+@section DetDescrCondExample_CoolHistExample 
 
 CoolHistExample is a simple algorithm which demonstrates how to access
 ROOT reference histograms through COOL using callbacks. The COOL data is
@@ -120,12 +120,10 @@ For more details see the ATLAS wiki topic CoolHistograms
 
 @include CoolHistExample_jobOptions.py 
 
-@section requirements Requirements
+@section DetDescrCondExample_requirements Requirements
 
-@include requirements
 
-@section uses Packages used
+@section DetDescrCondExample_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/doc/mainpage.h b/DetectorDescription/DetDescrCond/DetDescrCondTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from DetectorDescription/DetDescrCond/DetDescrCondTools/doc/mainpage.h
rename to DetectorDescription/DetDescrCond/DetDescrCondTools/doc/packagedoc.h
index b5e432928a8209e6f06fbb158ac9dc7ba03e8f16..841bbf8129e8d450361fc2c01253f46734a625d8
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/doc/mainpage.h
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTools/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage The DetDescrCondTools package
+@page DetDescrCondTools_page The DetDescrCondTools package
 
-\section introductionDetDescrCondTools Introduction
+@section DetDescrCondTools_introductionDetDescrCondTools Introduction
 
 This package provides a set of tools and services related to conditions data
 use in Detector Description. The available utilities (so far the services 
 CoolStrFileSvc and CoolHistSvc, and the AlgTool AlignTransTool) 
 are discussed below.
 
-\section CoolStrFileSvc
+@section DetDescrCondTools_CoolStrFileSvc 
 
 The service CoolStrFileSvc provides a service to store and retrieve strings
 of arbitrary length (theoretically up to 16MB) directly into the COOL 
@@ -104,7 +104,7 @@ functionality as the putFile method without the need to run an Athena job. This
 tool can both create a folder (if not already existing) and store a given
 object. Use coolStrFileSvc_set.py without arguments to see the syntax.
 
-\section CoolHistSvc
+@section DetDescrCondTools_CoolHistSvc 
 
 The service CoolHistSvc provides Athena-based access to histograms stored in
 ROOT file, using the COOL conditions database to manage the histograms
@@ -123,18 +123,16 @@ special command, and plays the same role as a POOL file GUID (though it is
 stored as a simple ROOT TObjString under the key 'fileGUID' in the ROOT file,
 rather than being stored using POOL tools.
 
-\section AlignTransTool
+@section DetDescrCondTools_AlignTransTool 
 
 The tool AlignTransTool provides a tool to access HepTransform3Ds stored
 in AlignableTransform objects in the TDS. It sorts the contents of the 
 AlignableTransform objects by Identifier, facilititing rapid access.
 This tool is not widely used, and might be declared obselete.
 
-@section Req The requirements file:
-@include requirements
+@section DetDescrCondTools_Req The requirements file:
 
-@section uses Packages used
-@htmlinclude used_packages.html
+@section DetDescrCondTools_uses Packages used
 
 */
 
diff --git a/DetectorDescription/DetDescrCond/DetDescrConditions/doc/mainpage.h b/DetectorDescription/DetDescrCond/DetDescrConditions/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from DetectorDescription/DetDescrCond/DetDescrConditions/doc/mainpage.h
rename to DetectorDescription/DetDescrCond/DetDescrConditions/doc/packagedoc.h
index 94164a0cec0ae68c761fd00e75008d3c5ecb4bf1..2787df0d8016ec2fd626cae5ffe52fab81957f15
--- a/DetectorDescription/DetDescrCond/DetDescrConditions/doc/mainpage.h
+++ b/DetectorDescription/DetDescrCond/DetDescrConditions/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-\mainpage The DetDescrCondtions package
+@page DetDescrConditions_page The DetDescrCondtions package
 
-\section introductionDetDescrConditions Introduction
+@section DetDescrConditions_introductionDetDescrConditions Introduction
 
 This package collects together conditions database objects used in detector
 description applications. The POOL converters for all the objects are 
 defined in the package InDetCondAthenaPool.
 
-\section AlignableTransform
+@section DetDescrConditions_AlignableTransform 
 
 This class consists of a vector of HepGeom::Transform3Ds each associated with
 an offline Identifier. It is used for example to store the alignment constants
@@ -22,14 +22,14 @@ all the transforms in the class, and to print the contents.
 An AlignableTransformContainer is also defined, consisting of a DataVector
 of AlignableTransforms, allowing them to be read/written as a single entity.
 
-\section DetCondFloat
+@section DetDescrConditions_DetCondFloat 
 
 This class consists of a vector of vectors of floats, each associated
 with an offline Identifier. Several identifiers can be mapped to the same
 set of floats to save space where common constants are required. This
 class is used for example by the TRT calibration data.
 
-\section DetDescrKeyTrans
+@section DetDescrConditions_DetDescrKeyTrans 
 
 This class consists of a vector of HepGeom::Transform3Ds, each associated with
 an artbitrary string identifier. It is similar to AlignableTranform, but
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/doc/mainpage.h b/DetectorDescription/DetDescrCond/DetectorStatus/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from DetectorDescription/DetDescrCond/DetectorStatus/doc/mainpage.h
rename to DetectorDescription/DetDescrCond/DetectorStatus/doc/packagedoc.h
index 953322485d2365034afe843a826975a336101b43..5d350abba4090cd6a4ef2b6f22e65127eb9b38b9
--- a/DetectorDescription/DetDescrCond/DetectorStatus/doc/mainpage.h
+++ b/DetectorDescription/DetDescrCond/DetectorStatus/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage DetectorStatus package
+@page DetectorStatus_page DetectorStatus package
 
-\section introductionDetectorStatus Introduction
+@section DetectorStatus_introductionDetectorStatus Introduction
 
 The DetectorStatus package implements a service to manage detector status 
 information, primarily to flag events where some or all subdetectors are 
@@ -30,7 +30,7 @@ job options:
 include("DetectorStatus/DetStatusSvc_CondDB.py")
 </pre>
 
-\section flagsDetectorStatus Flags and conditions DB storage
+@section DetectorStatus_flagsDetectorStatus Flags and conditions DB storage
 
 Each DetStatus object has a corresponding string identifier, which is stored
 in COOL as the name of a COOL channel in the detector status folder. The
@@ -185,7 +185,7 @@ from IOVDbSvc.CondDB import conddb
 conddb.addOverride('/GLOBAL/DETSTATUS/LBSUMM','DetStatusLBSumm_BadEMB')
 </pre>
 
-\section queryDetectorStatus Querying the Detector Status in Athena algorithms
+@section DetectorStatus_queryDetectorStatus Querying the Detector Status in Athena algorithms
 
 The DetStatusSvc has various methods which provide access to the DetStatus
 object asociated with a particular identifier string. You can retrieve a 
@@ -244,7 +244,7 @@ DetStatusSvc.StringReqs='SCTB 2 SCTEA 3'
 This is of the same form as detector status requirements specifications in 
 the LumiCalc.py tool.
 
-\section algDetectorStatus The DetStatusAlg algorithm
+@section DetectorStatus_algDetectorStatus The DetStatusAlg algorithm
 
 The DetStatusAlg algorithm provides a way to trigger use of the services, and
 also serves as an example for accessing detector status information in user
@@ -254,7 +254,7 @@ code. It has the following joboption properties:
 The veto functionality also sets the DetStatusAlg filterPassed property to
 false, allowing it to be used in algorithm sequences.
 
-\section detStatustools Command-line tools
+@section DetectorStatus_detStatustools Command-line tools
 
 Two command-line tools are provided to interact with the detector status 
 information: detStatus_query.py and detStatus_set.py. They can be used to
@@ -262,7 +262,7 @@ query or set the detector status for one or all of the status flags, and
 print their options if given without arguments. For more
 details, see the CoolDetStatus wiki page.
 
-\section jobOptionsDetectorStatus Job-option files
+@section DetectorStatus_jobOptionsDetectorStatus Job-option files
 
 The package has two main job-options, that setup the DetStatusSvc to 
 enable detector status to be read
@@ -276,12 +276,10 @@ from the conditions database, and write it to file-level meta-data.
 
 @include DetStatusSvc_ToFileMetaData.py
 
-@section requirements Package Requirements
+@section DetectorStatus_requirements Package Requirements
 
-@include requirements
 
-@section uses Packages used
+@section DetectorStatus_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/doc/mainpage.h b/DetectorDescription/GeoModel/AtlasGeoModel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from DetectorDescription/GeoModel/AtlasGeoModel/doc/mainpage.h
rename to DetectorDescription/GeoModel/AtlasGeoModel/doc/packagedoc.h
index 865ee9991e1d76203335abef48b47fed5c7bdb20..8e77328ad07edf6bd1e40f101a0f96bf94175e82
--- a/DetectorDescription/GeoModel/AtlasGeoModel/doc/mainpage.h
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage AtlasGeoModel Package
+@page AtlasGeoModel_page AtlasGeoModel Package
 
 @authors Grant Gorfine, Vakho Tsulaia, Joe Boudreau
 
-@section AtlasGeoModelIntro Introduction
+@section AtlasGeoModel_AtlasGeoModelIntro Introduction
 
 
 This package contains scripts to initialize the GeoModel Detector Description.
@@ -16,7 +16,7 @@ For the migration to Configurables a new python module has been created. All cli
 of AtlasGeoModel package are requested to switch to the scripts in this python module.
 Old python scripts in the share directory have been declared obsolete. 
 
-@section AtlasGeoModelUsage General Usage Notes.
+@section AtlasGeoModel_AtlasGeoModelUsage General Usage Notes.
 
 To initialize the geometry simply put in your joboptions:
 
@@ -63,7 +63,7 @@ GlobalFlags.DetGeo.set_atlas()
 GlobalFlags.DataSource.set_geant3()
 @endverbatim
 
-@section AtlasGeoModelJobOptions Job Options
+@section AtlasGeoModel_AtlasGeoModelJobOptions Job Options
 
  - GeoModelInit.py:		Initializes GeoModel. Loads GeoModelSvc.
 
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/doc/MainPage.h b/DetectorDescription/GeoModel/GeoAdaptors/doc/packagedoc.h
similarity index 83%
rename from DetectorDescription/GeoModel/GeoAdaptors/doc/MainPage.h
rename to DetectorDescription/GeoModel/GeoAdaptors/doc/packagedoc.h
index d13907a6cf187ad96aa039e502b9847ef0519d5e..bb761c574f2b9a10aaa799e955352750ab2dbaa8 100644
--- a/DetectorDescription/GeoModel/GeoAdaptors/doc/MainPage.h
+++ b/DetectorDescription/GeoModel/GeoAdaptors/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page GeoAdaptors_page 
 
 The package contains helper classes which provide access to various types of simulated
 hits, tracking detectors and calorimeters, and also calo cell objects.
@@ -15,7 +15,5 @@ hits, tracking detectors and calorimeters, and also calo cell objects.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/DetectorDescription/GeoModel/GeoModelExamples/doc/MainPage.h b/DetectorDescription/GeoModel/GeoModelExamples/doc/packagedoc.h
similarity index 87%
rename from DetectorDescription/GeoModel/GeoModelExamples/doc/MainPage.h
rename to DetectorDescription/GeoModel/GeoModelExamples/doc/packagedoc.h
index 1ccc50cadae9d94cbd71809c547aed282f89f17f..521acdff95e3c579f57a0ca8765c2001a3acbea2 100644
--- a/DetectorDescription/GeoModel/GeoModelExamples/doc/MainPage.h
+++ b/DetectorDescription/GeoModel/GeoModelExamples/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page GeoModelExamples_page 
 
 This package contains a toy example for GeoModel description of a detector.
 The example includes both material and readout geometry description. It has all
@@ -15,7 +15,5 @@ typical building blocks of GeoModel description: Detector Tool, Detector Factory
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/DetectorDescription/GeoModel/GeoModelKernel/doc/MainPage.h b/DetectorDescription/GeoModel/GeoModelKernel/doc/packagedoc.h
similarity index 84%
rename from DetectorDescription/GeoModel/GeoModelKernel/doc/MainPage.h
rename to DetectorDescription/GeoModel/GeoModelKernel/doc/packagedoc.h
index a9dafe94e5069ebb36d72302846b632b1052a020..e7b866ef33c6744996982ed2b1835bb5f409af77 100644
--- a/DetectorDescription/GeoModel/GeoModelKernel/doc/MainPage.h
+++ b/DetectorDescription/GeoModel/GeoModelKernel/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page GeoModelKernel_page 
 
 The package contains kernel classes of the GeoModel toolkit: physical and logical volumes,
 shapes, transformations, parameterized volumes, volume identifiers, actions.
@@ -14,7 +14,5 @@ shapes, transformations, parameterized volumes, volume identifiers, actions.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/doc/MainPage.h b/DetectorDescription/GeoModel/GeoModelSvc/doc/packagedoc.h
similarity index 83%
rename from DetectorDescription/GeoModel/GeoModelSvc/doc/MainPage.h
rename to DetectorDescription/GeoModel/GeoModelSvc/doc/packagedoc.h
index 378ec63e419afb6efd90d88ebb424f93f8f566b1..1458349f4a07042c50c9674f44a22659466465cb 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/doc/MainPage.h
+++ b/DetectorDescription/GeoModel/GeoModelSvc/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page GeoModelSvc_page 
 
 The package includes GeoModel Service, Material Manager, and other general usage
 classes required by GeoModel descriptions of ATLAS subsystem.
@@ -14,7 +14,5 @@ classes required by GeoModel descriptions of ATLAS subsystem.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/doc/MainPage.h b/DetectorDescription/GeoModel/GeoModelUtilities/doc/packagedoc.h
similarity index 85%
rename from DetectorDescription/GeoModel/GeoModelUtilities/doc/MainPage.h
rename to DetectorDescription/GeoModel/GeoModelUtilities/doc/packagedoc.h
index 22f5e0292edf2908416ee2434c3a3956fccc27de..91585cad77650346d3c928a5e4ae876026c19124 100644
--- a/DetectorDescription/GeoModel/GeoModelUtilities/doc/MainPage.h
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page GeoModelUtilities_page 
 
 The package contains utility classes required for LUCID GeoModel description. These include:
 Extended Materials (pressure, state), Material Properties Table, Optical Surfaces and Logical Borde Surfaces.
@@ -15,7 +15,5 @@ Extended Materials (pressure, state), Material Properties Table, Optical Surface
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/DetectorDescription/GeoModel/GeoSpecialShapes/doc/MainPage.h b/DetectorDescription/GeoModel/GeoSpecialShapes/doc/packagedoc.h
similarity index 78%
rename from DetectorDescription/GeoModel/GeoSpecialShapes/doc/MainPage.h
rename to DetectorDescription/GeoModel/GeoSpecialShapes/doc/packagedoc.h
index 3116966185f044127097dd172e44717b76d7d29d..57a3c33d4da3311af084e8cdfba3789a4f7f4c69 100644
--- a/DetectorDescription/GeoModel/GeoSpecialShapes/doc/MainPage.h
+++ b/DetectorDescription/GeoModel/GeoSpecialShapes/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page GeoSpecialShapes_page 
 
 This package contains definitions of LAr EMEC custom shape
 
@@ -13,7 +13,5 @@ This package contains definitions of LAr EMEC custom shape
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/DetectorDescription/RegionSelector/doc/mainpage.h b/DetectorDescription/RegionSelector/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from DetectorDescription/RegionSelector/doc/mainpage.h
rename to DetectorDescription/RegionSelector/doc/packagedoc.h
index 3c4ee14dd36346b9492322b9fb6f38485c2d7cb1..4d106d44cce0a94bb894d80659634bc658950df5
--- a/DetectorDescription/RegionSelector/doc/mainpage.h
+++ b/DetectorDescription/RegionSelector/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage RegionSelector Package
+@page RegionSelector_page RegionSelector Package
 @author Simon George <S.George@rhul.ac.uk>, Aline Gesualdi Mello, Steve Armstrong
 
-@section RegionSelectorIntro Introduction
+@section RegionSelector_RegionSelectorIntro Introduction
 
 The RegSelSvc translates physical regions within any subdetector system into detector identifiers or Read-Out Buffer (ROB) identifiers.
 
@@ -14,7 +14,7 @@ It has been designed and developed for use in the High Level Trigger, where it i
 
 It is currently maintained by Simon George (general), Mark Sutton (indet), Denis Damazio (calo), Alessandro DiMattia (muon).
 
-@section RegionSelectorOverview Overview
+@section RegionSelector_RegionSelectorOverview Overview
 
   The RegionSelector package contains of following methods to retrieve identifiers:
  
@@ -23,7 +23,7 @@ It is currently maintained by Simon George (general), Mark Sutton (indet), Denis
   - RegionSelector::DetROBIDListUint: translates a geometrical region into @c std::vector<uint32_t> 
     without repeated @c ROBID elements.
 
-@section RegionSelectorUsage Usage
+@section RegionSelector_RegionSelectorUsage Usage
 
 Region Selector execution is like any Service, so in order to be used in a 
 standard Athena Algorithm, some additional lines must be added to the .h and 
@@ -90,7 +90,7 @@ other angle!=pi in the lab frame and the phi wrapping will render phiMin = phiMa
 you will get an roi with deltaphi=0 which is almost certainly not what you want in this
 case.  
 
-@section RegionSelectorConfig Configuration
+@section RegionSelector_RegionSelectorConfig Configuration
 
 RegionSelector is configured by the RegSelSvcDefault
 configurable. Declaring the ServiceHandle as shown above should
@@ -116,11 +116,9 @@ Note that RegionSelector has a run-time dependency on InnerDetector and Calo too
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 */
 
diff --git a/Event/EventInfo/doc/MainPage.h b/Event/EventInfo/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Event/EventInfo/doc/MainPage.h
rename to Event/EventInfo/doc/packagedoc.h
index 2f51fba5f2c6dff098348c19556e9a5eb36bd060..a24f5af9023bcddd235ac33e196cf08aa6139b75
--- a/Event/EventInfo/doc/MainPage.h
+++ b/Event/EventInfo/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page EventInfo_page 
 
 This package contains classes which provide general information about
 an event.  
@@ -33,12 +33,10 @@ begin/end event incidences by the IIncidentSvc. This class provides
 access to the EventInfo object to the object receiving the Incident. 
 
 
-@section requirements requirements 
+@section EventInfo_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section EventInfo_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
diff --git a/Event/EventInfoMgt/doc/MainPage.h b/Event/EventInfoMgt/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from Event/EventInfoMgt/doc/MainPage.h
rename to Event/EventInfoMgt/doc/packagedoc.h
index fbb670fe2c7a443638a6d20a44e9fe7da06cb7c4..c09d85826a42570f3b1d8f22977a4b86ff1c7de3
--- a/Event/EventInfoMgt/doc/MainPage.h
+++ b/Event/EventInfoMgt/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page EventInfoMgt_page 
 
 This package contains TagInfoMgr which is an Athena service that 
 manages detector description tag information. It maintains a TagInfo
@@ -41,19 +41,17 @@ EventInfoMgtInit.py, to set the release version as a tag/value pair:
 Release/<version>. The release version is extracted from an
 environment variable.  
 
-@section jobopt Default values of properties of TagInfoMgr
+@section EventInfoMgt_jobopt Default values of properties of TagInfoMgr
 
 AddEventInfoTags        - true
 OverrideEventInfoTags   - true
 ExtraTagValuePairs      - just add in release version
 TagInfoKey              - ProcessingTags
 
-@section requirements requirements 
+@section EventInfoMgt_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section EventInfoMgt_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
diff --git a/Event/EventKernel/doc/mainpage.h b/Event/EventKernel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 82%
rename from Event/EventKernel/doc/mainpage.h
rename to Event/EventKernel/doc/packagedoc.h
index df2bbd9292651f1109ee81326b9ed3b1449fcc79..e7755194e681105f6b76ba8bf88e257bd05447bd
--- a/Event/EventKernel/doc/mainpage.h
+++ b/Event/EventKernel/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage EventKernel Package
+@page EventKernel_page EventKernel Package
 
 This package provides useful abstract base classes for the Atlas EDM.
 
@@ -14,7 +14,7 @@ This package provides useful abstract base classes for the Atlas EDM.
 @author many others
 
 
-@section EventKernelFourMom I4Momentum
+@section EventKernel_EventKernelFourMom I4Momentum
 
 I4Momentum is an abstract base class providing 4-momentum behavior.
 Concrete base classes and some implementation are provided in package 
diff --git a/Event/FourMom/doc/mainpage.h b/Event/FourMom/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Event/FourMom/doc/mainpage.h
rename to Event/FourMom/doc/packagedoc.h
index 3c34476c9afc50b2d84321b2982559c73744cef2..1686b28fbccc53cb097a5e2488268a6971867048
--- a/Event/FourMom/doc/mainpage.h
+++ b/Event/FourMom/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage FourMom Package
+@page FourMom_page FourMom Package
 
 This package provides base classes to give objects 4-momentum behavior, 
 without introducing new data members. Some implementation classes, and 
@@ -12,14 +12,14 @@ helper classes for 4-momentum manipulation are also provided.
 
 @author David Rousseau rousseau@lal.in2p3.fr
 
-@section FourMomAbs Abstract base class
+@section FourMom_FourMomAbs Abstract base class
 
 The list of kinematics accessors is provided by the abstract base 
 class I4Momentum in a separate package (to minimize dependencies)
 Event/EventKernel. The list of accessors can be extended easily.
  
 
-@section FourMomImpl Implementation base class
+@section FourMom_FourMomImpl Implementation base class
 
 These base classes are P4PxPyPzEBase , P4EEtaPhiMBase, P4IPtCoThPhiMBase .
 The name of these classes lists what are the four basic parameters. Each 
@@ -48,7 +48,7 @@ method to make use of the
 cached values of sinTh in the static CaloDetDescrElement.
 
 
-@section FourMomConc Concrete class.
+@section FourMom_FourMomConc Concrete class.
 
 These classes are P4PxPyPzE, P4EEtaPhiM, P4IPtCoThPhiM. They simply 
 derive from the corresponding P4PxPyPzEBase etc.. base class, providing
@@ -59,14 +59,14 @@ These classes provides set method for their four data members, and only for
 these ones; in many case setting another parameter (like Pt when Px, Py, Pz, 
 E are the data members) is ill-defined and confusing.
 
-@section FourMomHelp P4Help helper class
+@section FourMom_FourMomHelp P4Help helper class
 
 P4Help is a concrete class that provides calculation like invariant mass
 or deltaR (more functions can easily be added). 
 Examples of use can be found in P4DummyTest (this class is also useful 
 to test at compile time all the virtual function are implemented).
 
-@section FourMomCLHEP Note on relation with CLHEP HepLorentzVector
+@section FourMom_FourMomCLHEP Note on relation with CLHEP HepLorentzVector
 
 What's the benefit of these classes w.r.t CLHEP HepLorentzVector ?
 CLHEP HepLorentzVector does not provide inheritance structure, so does not 
diff --git a/Event/xAOD/xAODBPhys/doc/mainpage.h b/Event/xAOD/xAODBPhys/doc/packagedoc.h
similarity index 78%
rename from Event/xAOD/xAODBPhys/doc/mainpage.h
rename to Event/xAOD/xAODBPhys/doc/packagedoc.h
index f3f682970388925552db15c0b520486bfe807805..85467773e495c124de6aee2232fad5ce7c710f0c 100644
--- a/Event/xAOD/xAODBPhys/doc/mainpage.h
+++ b/Event/xAOD/xAODBPhys/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-   @mainpage: xAODBPhys package
+@page xAODBPhys_page xAODBPhys package
 
    @author: Daniel Scheirich <daniel.scheirich@cern.ch>
 
-   @section: xAODBPhys Overview
+@section xAODBPhys_xAODBPhys Overview
 
    This package holds the EDM classes describing the output of ATLAS's
    B decay reconstruction defined by the B-physics group.
diff --git a/Event/xAOD/xAODBase/doc/mainpage.h b/Event/xAOD/xAODBase/doc/packagedoc.h
similarity index 81%
rename from Event/xAOD/xAODBase/doc/mainpage.h
rename to Event/xAOD/xAODBase/doc/packagedoc.h
index a13fe15701e55beb5a1a9297a4c112b09131119d..38fd957881062b9177a979c6ba5448a437fbba30 100644
--- a/Event/xAOD/xAODBase/doc/mainpage.h
+++ b/Event/xAOD/xAODBase/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 /**
-   @mainpage xAODBase package
+@page xAODBase_page xAODBase package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
    $Revision: 567380 $
    $Date: 2013-10-28 11:48:26 +0100 (Mon, 28 Oct 2013) $
 
-   @section xAODBaseOverview Overview
+@section xAODBase_xAODBaseOverview Overview
 
    This is the most base-package of the xAOD EDM. It defines general
    interfaces that are used in all parts of the xAOD code.
 
-   @section xAODBaseClasses Main Types
+@section xAODBase_xAODBaseClasses Main Types
 
    The main enumerations, definitions and classes of the package are
    the following:
@@ -25,7 +25,5 @@
       - xAOD::IParticleContainer: Base class for all the particle-like
         containers in the xAOD EDM.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODCaloEvent/doc/mainpage.h b/Event/xAOD/xAODCaloEvent/doc/packagedoc.h
similarity index 78%
rename from Event/xAOD/xAODCaloEvent/doc/mainpage.h
rename to Event/xAOD/xAODCaloEvent/doc/packagedoc.h
index 4190122cb76f390653aa87fb2f307dada61adb13..b2803228a549433a408fcd6ec9683285899835b2 100644
--- a/Event/xAOD/xAODCaloEvent/doc/mainpage.h
+++ b/Event/xAOD/xAODCaloEvent/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-   @mainpage xAODCaloEvent package
+@page xAODCaloEvent_page xAODCaloEvent package
 
    @author Scott Snyder <Scott.Snyder@cern.ch>
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
@@ -11,12 +11,12 @@
    $Revision: 563319 $
    $Date: 2013-09-27 13:35:45 +0200 (Fri, 27 Sep 2013) $
 
-   @section xAODCaloEventOverview Overview
+@section xAODCaloEvent_xAODCaloEventOverview Overview
 
    This package holds the ROOT-readable implementation of the reconstructed
    calorimeter information of the detector.
 
-   @section xAODCaloEventClasses Main Classes
+@section xAODCaloEvent_xAODCaloEventClasses Main Classes
 
    The main class(es) of the package are the following:
       - xAOD::CaloCluster: Typedef to the latest <code>CaloCluster_vX</code>
@@ -24,7 +24,5 @@
       - xAOD::CaloCluster_v1: The current latest calorimeter cluster
         implementation.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODCaloRings/doc/mainpage.h b/Event/xAOD/xAODCaloRings/doc/packagedoc.h
similarity index 91%
rename from Event/xAOD/xAODCaloRings/doc/mainpage.h
rename to Event/xAOD/xAODCaloRings/doc/packagedoc.h
index 17299b01c0320a6c9abf30c25cea424e6b957212..5753aa5d81a585bb5ebee167febc1711e9009460 100644
--- a/Event/xAOD/xAODCaloRings/doc/mainpage.h
+++ b/Event/xAOD/xAODCaloRings/doc/packagedoc.h
@@ -3,21 +3,21 @@
 */
 
 /**
-  @mainpage xAODCaloRings package
+@page xAODCaloRings_page xAODCaloRings package
 
   @author Werner Freund <wsfreund@cern.ch>
 
   $Revision: 670601 $
   $Date: 2015-05-28 16:22:49 +0200 (Thu, 28 May 2015) $
 
-  @section xAODCaloRingsOverview Overview
+@section xAODCaloRings_xAODCaloRingsOverview Overview
 
   This package holds the Athena/ROOT-readable implementation of the reconstructed
   ringed calorimeter information of the detector. It also holds the
   ROOT-readable information of the configuration used to extract this
   information, which may be saved in the file as metadata.
 
-  @section xAODCaloRingsClasses Main Classes
+@section xAODCaloRings_xAODCaloRingsClasses Main Classes
 
   The main class(es) of the package are the following:
      - xAOD::CaloRings: Typedef to the latest <code>CaloRings</code>
@@ -46,7 +46,5 @@
        non-segmented representation. Its information can be copied into a simpler
        structure <code>RawConf</code>, which allows caching its information.
 
-  @htmlinclude used_packages.html
 
-  @include requirements
 */
diff --git a/Event/xAOD/xAODCore/doc/mainpage.h b/Event/xAOD/xAODCore/doc/packagedoc.h
similarity index 81%
rename from Event/xAOD/xAODCore/doc/mainpage.h
rename to Event/xAOD/xAODCore/doc/packagedoc.h
index 560b5d5b1a6a39100d771a89d22c9bcb703161e0..6b3440d775bd40689f1e20d0dbc1e7b6fa54a2b7 100644
--- a/Event/xAOD/xAODCore/doc/mainpage.h
+++ b/Event/xAOD/xAODCore/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 /**
-   @mainpage xAODCore package
+@page xAODCore_page xAODCore package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
    $Revision: 568227 $
    $Date: 2013-11-01 10:28:22 +0100 (Fri, 01 Nov 2013) $
 
-   @section xAODCoreOverview Overview
+@section xAODCore_xAODCoreOverview Overview
 
    This package is meant to hold code that is useful in multiple xAOD EDM
    packages.
 
-   @section xAODCoreClasses Classes
+@section xAODCore_xAODCoreClasses Classes
 
    The most important classes/functions of the package are the following:
      - xAOD::AuxContainerBase: A common base class for simple container types
@@ -24,7 +24,5 @@
        DataVector types that need to be read/written directly from/to a
        ROOT file.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODCoreCnv/doc/mainpage.h b/Event/xAOD/xAODCoreCnv/doc/packagedoc.h
similarity index 90%
rename from Event/xAOD/xAODCoreCnv/doc/mainpage.h
rename to Event/xAOD/xAODCoreCnv/doc/packagedoc.h
index eb050698e499619f3b9653cb86cca41c4e0c2190..609fd8a7a4480b96458e39d8940966647c8146b5 100644
--- a/Event/xAOD/xAODCoreCnv/doc/mainpage.h
+++ b/Event/xAOD/xAODCoreCnv/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-   @mainpage xAODCoreCnv Package
+@page xAODCoreCnv_page xAODCoreCnv Package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
    $Revision: 583869 $
    $Date: 2014-02-18 12:31:09 +0100 (Tue, 18 Feb 2014) $
 
-   @section xAODCoreCnvOverview Overview
+@section xAODCoreCnv_xAODCoreCnvOverview Overview
 
    This package houses the code that runs as a first step of an xAOD slimming
    job. The code reads in an auxiliary store object of any type (implementing
@@ -22,7 +22,7 @@
    which Athena I/O then writes out into individual branches in the output
    file.
 
-   @section xAODCoreCnvAlgorithms Algorithms
+@section xAODCoreCnv_xAODCoreCnvAlgorithms Algorithms
 
    There is a single useful algorithm in the package at the moment,
    xAODMaker::AuxStoreWrapper. It can be configured to prepare just some
@@ -30,7 +30,7 @@
    as the first algorithm, before any of the auxiliary store objects would
    be read into StoreGate by some other algorithm.
 
-   @section xAODCoreCnvUsage Usage
+@section xAODCoreCnv_xAODCoreCnvUsage Usage
 
    After the algorithm is finished, the event store can no longer retrieve the
    auxiliary store objects as their original, specific type
@@ -56,7 +56,5 @@
    following the latest formalism, now allows us to slim away variables
    which were read in as "static" variables.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODEgamma/doc/mainpage.h b/Event/xAOD/xAODEgamma/doc/packagedoc.h
similarity index 89%
rename from Event/xAOD/xAODEgamma/doc/mainpage.h
rename to Event/xAOD/xAODEgamma/doc/packagedoc.h
index 7813dcecb8d37999303116a29527037b09078647..f4b1b6a1cdf3df8523944a6a82768a9fd428b177 100644
--- a/Event/xAOD/xAODEgamma/doc/mainpage.h
+++ b/Event/xAOD/xAODEgamma/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-   @mainpage xAODEgamma package
+@page xAODEgamma_page xAODEgamma package
 
    @author Jovan Mitrevski <Jovan.Mitrevski@cern.h>
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
@@ -14,12 +14,12 @@
    $Revision: 672987 $
    $Date: 2015-06-06 18:15:13 +0200 (Sat, 06 Jun 2015) $
 
-   @section xAODEgammaOverivew Overview
+@section xAODEgamma_xAODEgammaOverivew Overview
 
    This package holds the EDM classes describing the output of ATLAS's
    egamma reconstruction.
 
-   @section xAODEgammaClasses Main Classes
+@section xAODEgamma_xAODEgammaClasses Main Classes
 
    The main class(es) of the package are the following:
       - xAOD::Egamma: Typedef to the latest <code>Egamma_vX</code> class
@@ -46,7 +46,7 @@
         container version.
       - xAOD::Photon_v1: The current latest egamma implementation.
 
-   @section EgammaHelpers Helpers
+@section xAODEgamma_EgammaHelpers Helpers
    
    Helper functions are provided for the most common routines and used in reconstruction
    and CP tools. Users should request additions in case of need.
@@ -64,11 +64,9 @@
    <code> #include "xAODEgamma/EgammaxAODHelpers.h" </code>
    makes all of them available
 
-   @section EgammaParameters Parameters
+@section xAODEgamma_EgammaParameters Parameters
 
    The Egamma parameters are under this namespace:
    xAOD::EgammaParameters
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODEventFormatCnv/doc/mainpage.h b/Event/xAOD/xAODEventFormatCnv/doc/packagedoc.h
similarity index 83%
rename from Event/xAOD/xAODEventFormatCnv/doc/mainpage.h
rename to Event/xAOD/xAODEventFormatCnv/doc/packagedoc.h
index ad96d7541f33b4014b472048bde8d281183159d3..8fbd9eebc821a46330870663807f84c4265b8902 100644
--- a/Event/xAOD/xAODEventFormatCnv/doc/mainpage.h
+++ b/Event/xAOD/xAODEventFormatCnv/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-   @mainpage xAODEventFormatCnv package
+@page xAODEventFormatCnv_page xAODEventFormatCnv package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
    $Revision: 578438 $
    $Date: 2014-01-15 10:34:19 +0100 (Wed, 15 Jan 2014) $
 
-   @section xAODEventFormatCnvOverview Overview
+@section xAODEventFormatCnv_xAODEventFormatCnvOverview Overview
 
    This package holds the code that creates, and in general handles the
    xAOD::EventFormat metadata in Athena.
@@ -18,7 +18,7 @@
    While some functionality is accessible to the general user, the code
    is expected to be used mostly by RecExCommon.
 
-   @section xAODEventFormatCnvClasses Classes
+@section xAODEventFormatCnv_xAODEventFormatCnvClasses Classes
 
    The package provides a simple interface, xAODMaker::IEventFormatSvc.
    It can be used to interact with the service implemented in the
@@ -33,7 +33,5 @@
    xaodStream.AddMetaDataItem( "xAOD::EventFormat_v1#EventFormat" )
    </code>
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODHIEvent/doc/mainpage.h b/Event/xAOD/xAODEventInfo/doc/packagedoc.h
similarity index 75%
rename from Event/xAOD/xAODHIEvent/doc/mainpage.h
rename to Event/xAOD/xAODEventInfo/doc/packagedoc.h
index 73797a359705dd942c1439b33171cf7a5b531321..d221cd15765fab2e2927e10d72c05296ed55f810 100644
--- a/Event/xAOD/xAODHIEvent/doc/mainpage.h
+++ b/Event/xAOD/xAODEventInfo/doc/packagedoc.h
@@ -3,25 +3,23 @@
 */
 
 /**
-   @mainpage xAODEventInfo package
+@page xAODEventInfo_page xAODEventInfo package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
    $Revision: 568284 $
    $Date: 2013-11-01 14:31:06 +0100 (Fri, 01 Nov 2013) $
 
-   @section xAODEventInfoOverview Overview
+@section xAODEventInfo_xAODEventInfoOverview Overview
 
    This package holds EDM classes for describing the basic event properties
    in an xAOD file.
 
-   @section xAODEventInfoClasses Classes
+@section xAODEventInfo_xAODEventInfoClasses Classes
 
    The most important classes of the package are the following:
      - xAOD::EventInfo: The main event information class. It should be used
        to access information like the run and lumiblock number in an analysis.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODForward/doc/mainpage.h b/Event/xAOD/xAODForward/doc/packagedoc.h
similarity index 93%
rename from Event/xAOD/xAODForward/doc/mainpage.h
rename to Event/xAOD/xAODForward/doc/packagedoc.h
index 4afc3b28e1bb27c17ddb1cbb31addb232e73dfcf..5210e3f046e738ddb0431f7305c9973182c478f1 100644
--- a/Event/xAOD/xAODForward/doc/mainpage.h
+++ b/Event/xAOD/xAODForward/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-   @mainpage xAODForward package
+@page xAODForward_page xAODForward package
 
-   @section rcRetrive Retriving object in Root Core
+@section xAODForward_rcRetrive Retriving object in Root Core
 
    @subsection rcContainer Retriving ALFADataContainer
 
@@ -64,7 +64,7 @@
    variables contain information in which tree the variable is
    stored.
 
-   @section athena Retriving data in Athena
+@section xAODForward_athena Retriving data in Athena
 
    In the xAOD file ALFADataContainer object is stored and it has to
    be retrived first. It is stored in eventStore. In the xAOD file
@@ -80,7 +80,7 @@
    Retriving ALFAData objects from the container object is common
    for Athena and RootCore, so please consult subsection @ref rcData
 
-   @section array2D Decrypting vector index from serialised 2D array for tracks
+@section xAODForward_array2D Decrypting vector index from serialised 2D array for tracks
 
    All arrays stored in xAOD are one dimensional. It means that data
    saved in 2D arrays has to be transformed into 1D array.
@@ -117,7 +117,7 @@
    int trackIndex = index%maxTrackCnt();
    @endcode
 
-   @section array2DFibers Decrypting vector index from serialised 2D array for plates
+@section xAODForward_array2DFibers Decrypting vector index from serialised 2D array for plates
 
    All arrays stored in xAOD are one dimensional. It means that data
    saved in 2D arrays has to be transformed into 1D array.
@@ -148,7 +148,7 @@
    int trackIndex = index%numberOfPlates;
    @endcode
 
-   @section array3Dtracks Decrypting vector index with track information from serialised 3D array
+@section xAODForward_array3Dtracks Decrypting vector index with track information from serialised 3D array
 
    All arrays stored in xAOD are one dimensional. It means that data
    saved in 3D arrays has to be transformed into 1D array.
@@ -195,7 +195,7 @@
    int plateIndex = index%numberOfPlates;
    @endcode
 
-   @section array3DFibers Decrypting vector index with fibers information from serialised 3D array
+@section xAODForward_array3DFibers Decrypting vector index with fibers information from serialised 3D array
 
    All arrays stored in xAOD are one dimensional. It means that data
    saved in 3D arrays has to be transformed into 1D array.
@@ -235,7 +235,5 @@
    int layerIndex = index%numberOfLayers;
    @endcode
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODEventInfo/doc/mainpage.h b/Event/xAOD/xAODHIEvent/doc/packagedoc.h
similarity index 75%
rename from Event/xAOD/xAODEventInfo/doc/mainpage.h
rename to Event/xAOD/xAODHIEvent/doc/packagedoc.h
index 73797a359705dd942c1439b33171cf7a5b531321..41a5f3ebb5a89064c6cad0ad15d9e0128e4785cb 100644
--- a/Event/xAOD/xAODEventInfo/doc/mainpage.h
+++ b/Event/xAOD/xAODHIEvent/doc/packagedoc.h
@@ -3,25 +3,23 @@
 */
 
 /**
-   @mainpage xAODEventInfo package
+@page xAODHIEvent_page xAODEventInfo package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
    $Revision: 568284 $
    $Date: 2013-11-01 14:31:06 +0100 (Fri, 01 Nov 2013) $
 
-   @section xAODEventInfoOverview Overview
+@section xAODHIEvent_xAODEventInfoOverview Overview
 
    This package holds EDM classes for describing the basic event properties
    in an xAOD file.
 
-   @section xAODEventInfoClasses Classes
+@section xAODHIEvent_xAODEventInfoClasses Classes
 
    The most important classes of the package are the following:
      - xAOD::EventInfo: The main event information class. It should be used
        to access information like the run and lumiblock number in an analysis.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODJet/doc/mainpage.h b/Event/xAOD/xAODJet/doc/packagedoc.h
similarity index 80%
rename from Event/xAOD/xAODJet/doc/mainpage.h
rename to Event/xAOD/xAODJet/doc/packagedoc.h
index 8c36b95c889b83c235195102841fe00743404c24..475071fc7b8adf5eecfa063b187a2cbfbe84a943 100644
--- a/Event/xAOD/xAODJet/doc/mainpage.h
+++ b/Event/xAOD/xAODJet/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-   @mainpage xAODJet package
+@page xAODJet_page xAODJet package
 
    @author Pierre-Antoine Delsart <delsart@in2p3.fr>
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
@@ -11,12 +11,12 @@
    $Revision: 561982 $
    $Date: 2013-09-18 09:54:10 +0200 (Wed, 18 Sep 2013) $
 
-   @section xAODJetOverivew Overview
+@section xAODJet_xAODJetOverivew Overview
 
    This package holds the EDM classes describing the output of ATLAS's
    jet reconstruction.
 
-   @section xAODJetClasses Main Classes
+@section xAODJet_xAODJetClasses Main Classes
 
    The main class(es) of the package are the following:
       - xAOD::Jet: Typedef to the latest <code>Jet_vX</code> class
@@ -25,7 +25,5 @@
         version.
       - xAOD::Jet_v1: The current latest jet implementation.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODLuminosity/doc/mainpage.h b/Event/xAOD/xAODLuminosity/doc/packagedoc.h
similarity index 82%
rename from Event/xAOD/xAODLuminosity/doc/mainpage.h
rename to Event/xAOD/xAODLuminosity/doc/packagedoc.h
index d7e7dc28544808b0b40c55378448d49f938b394d..d17fe912029e4cb11dac4d6faf129970380b65a2 100644
--- a/Event/xAOD/xAODLuminosity/doc/mainpage.h
+++ b/Event/xAOD/xAODLuminosity/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-   @mainpage xAODLuminosity package
+@page xAODLuminosity_page xAODLuminosity package
 
    @author Marjorie Shapiro <mdshapiro@lbl.gov>
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
-   @section xAODLuminosityOverview Overview
+@section xAODLuminosity_xAODLuminosityOverview Overview
 
    This package holds the xAOD EDM code for the metadata saved into ESD/xAOD
    files about which lumiblocks, and in what percentage were processed to
@@ -16,7 +16,7 @@
    in the offline and analysis releases to provide luminosity measurements for
    analysis.
 
-   @section xAODLuminosityClasses Main Classes
+@section xAODLuminosity_xAODLuminosityClasses Main Classes
 
    The main class(es) of the package are the following:
       - xAOD::LumiBlockRange: Type describing a single continuous luminosity
@@ -25,7 +25,5 @@
         This is the format that the information is written into the xAOD files
         in.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
  */
diff --git a/Event/xAOD/xAODMissingET/doc/mainpage.h b/Event/xAOD/xAODMissingET/doc/packagedoc.h
similarity index 98%
rename from Event/xAOD/xAODMissingET/doc/mainpage.h
rename to Event/xAOD/xAODMissingET/doc/packagedoc.h
index f36e445e26a971b4650f05a43f1eac7b8804ae90..cea439cc68ded4a8907fabcd45b94696509bfb5b 100644
--- a/Event/xAOD/xAODMissingET/doc/mainpage.h
+++ b/Event/xAOD/xAODMissingET/doc/packagedoc.h
@@ -4,14 +4,14 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-/*! @mainpage Data objects for Missing Transverse Momentum reconstruction
+@page xAODMissingET_page @mainpage Data objects for Missing Transverse Momentum reconstruction
  *
  *  @tableofcontents
  *
  *  The event data model provided in this package supports the reconstruction of missing transverse energy in ATLAS, and provides the
  *  data containers to represent the results of this reconstruction.
  * 
- *  @section met_intro Introduction 
+@section xAODMissingET_@section met_intro Introduction
  * 
  *  Missing transverse momentum (MET, @f$ E_{\rm T}^{\rm miss}) @f$ reconstruction in ATLAS is actually represented by the three 
  *  kinematic components @f$ (p_{x}^{\rm miss},p_{y}^{\rm miss},\Sigma E_{\rm T}) @f$, which are the missing momentum components
@@ -52,7 +52,7 @@
  *  @link xAOD::MissingETComponent_v1 MissingETComponent @endlink object is stored in its own container 
  *  (@link xAOD::MissingETComponentMap_v1 MissingETComponentMap @endlink, one per MET term). 
  * 
- *  @section met_edm Missing Transverse Momentum Event Data Model 
+@section xAODMissingET_@section met_edm Missing Transverse Momentum Event Data Model
  * 
  *  The MET EDM is tailored to support a dynamic (MET reconstruction in the precision reconstruction and analysis context) and static (mostly 
  *  MET related data retrieval in an analysis context) phase. This means that the data objects in this EDM need to (among others) 
diff --git a/Event/xAOD/xAODMuon/doc/mainpage.h b/Event/xAOD/xAODMuon/doc/packagedoc.h
similarity index 74%
rename from Event/xAOD/xAODMuon/doc/mainpage.h
rename to Event/xAOD/xAODMuon/doc/packagedoc.h
index 1e54b167adb91fd95c53b5ed2e9f1166f4349763..6e1b11e83e92ab83ddd3fa808b96f94a2e1147de 100644
--- a/Event/xAOD/xAODMuon/doc/mainpage.h
+++ b/Event/xAOD/xAODMuon/doc/packagedoc.h
@@ -3,25 +3,23 @@
 */
 
 /**
-@mainpage xAODMuon package
+@page xAODMuon_page xAODMuon package
 
 @author Edward Moyse <Edward.Moyse@cern.ch>
 
 $Revision:$
 $Date:$
 
-@section xAODMuonOverview Overview
+@section xAODMuon_xAODMuonOverview Overview
 
 This package holds the data model to describe the output of the
 muon combined performance reconstruction for analysis users.
 
-@section xAODMuonClasses Classes
+@section xAODMuon_xAODMuonClasses Classes
 
 The main classes of the package are the following:
   - xAOD::Muon: Class describing a chaged track.
   - xAOD::Segment: Class describing a neutral particle;
 
-@htmlinclude used_packages.html
 
-@include requirements
 */
diff --git a/Event/xAOD/xAODPFlow/doc/mainpage.h b/Event/xAOD/xAODPFlow/doc/packagedoc.h
similarity index 81%
rename from Event/xAOD/xAODPFlow/doc/mainpage.h
rename to Event/xAOD/xAODPFlow/doc/packagedoc.h
index 420b0ced1d7c4f3d7032c923f97d5fca07ae2d84..79c3700dcba20dc11c89b876b944cf369001dc15 100644
--- a/Event/xAOD/xAODPFlow/doc/mainpage.h
+++ b/Event/xAOD/xAODPFlow/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 
-@mainpage xAODPFlow package
+@page xAODPFlow_page xAODPFlow package
 
 @author Michel Janus <janus@cern.h>
 
 $Revision: 577912 $
 $Date: 2014-01-11 14:31:58 +0100 (Sat, 11 Jan 2014) $
 
- @section xAODPFlow Overview
+@section xAODPFlow_xAODPFlow Overview
 
  This package holds the EDM classes describing the output of ATLAS's
  particle flow reconstruction.
 
- @section xAODPFlowClasses Main Classes
+@section xAODPFlow_xAODPFlowClasses Main Classes
 
  The main class(es) of the package are the following:
      - xAOD::PFO: Typedef to the latest <code>PFO_vX</code> class
@@ -26,6 +26,4 @@ $Date: 2014-01-11 14:31:58 +0100 (Sat, 11 Jan 2014) $
       container version.
     - xAOD::PFO_v1: The current latest pfo implementation.
 
- @htmlinclude used_packages.html
 
- @include requirements
diff --git a/Event/xAOD/xAODPrimitives/doc/mainpage.h b/Event/xAOD/xAODPrimitives/doc/packagedoc.h
similarity index 78%
rename from Event/xAOD/xAODPrimitives/doc/mainpage.h
rename to Event/xAOD/xAODPrimitives/doc/packagedoc.h
index bccf08f9714142ec72a1eb737dca4902e0bba7ca..a213aac29fbfe466ad45c52d1116ca5afea604d1 100644
--- a/Event/xAOD/xAODPrimitives/doc/mainpage.h
+++ b/Event/xAOD/xAODPrimitives/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-   @mainpage xAODPrimitives Package
+@page xAODPrimitives_page xAODPrimitives Package
 
    @author Edward Moyse <Edward.Moyse@cern.ch>
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
@@ -11,26 +11,24 @@
    $Revision: 582418 $
    $Date: 2014-02-10 16:03:46 +0100 (Mon, 10 Feb 2014) $
 
-   @section xAODPrimitivesOverview Overview
+@section xAODPrimitives_xAODPrimitivesOverview Overview
 
    This package holds some definitions/helper code that is used by the
    different packages to describe similar properties of the reconstructed
    objects, like their isolation.
 
-   @section xAODPrimitivesDefinitions Main Definitions
+@section xAODPrimitives_xAODPrimitivesDefinitions Main Definitions
 
    The following are the main enumerations defined in the package:
      - xAOD::Iso::IsolationType: The types of all known isolation values
        saved into xAOD files.
 
-   @section xAODPrimitivesHelpers Helper Functions
+@section xAODPrimitives_xAODPrimitivesHelpers Helper Functions
 
    The following are functions that are mainly supposed to be used by the
    xAOD EDM packages, and not the xAOD users directly:
      - xAOD::getIsolationAccessor: Helper function for accessing an
        Accessor object handling one of the isolation types.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODTau/doc/mainpage.h b/Event/xAOD/xAODTau/doc/packagedoc.h
similarity index 81%
rename from Event/xAOD/xAODTau/doc/mainpage.h
rename to Event/xAOD/xAODTau/doc/packagedoc.h
index 19f893f18471b7e1090013a1930c041d2bc32320..9d7ac6a0f0265b0f3c8e6333b250956e51c72052 100644
--- a/Event/xAOD/xAODTau/doc/mainpage.h
+++ b/Event/xAOD/xAODTau/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 
-@mainpage xAODTau package
+@page xAODTau_page xAODTau package
 
 @author Michel Janus <janus@cern.h>
 
 $Revision: 570247 $
 $Date: 2013-11-13 18:03:12 +0100 (Wed, 13 Nov 2013) $
 
- @section xAODTauOverivew Overview
+@section xAODTau_xAODTauOverivew Overview
 
  This package holds the EDM classes describing the output of ATLAS's
  tau reconstruction.
 
- @section xAODTauClasses Main Classes
+@section xAODTau_xAODTauClasses Main Classes
 
  The main class(es) of the package are the following:
     - xAOD::TauJet: Typedef to the latest <code>TauJet_vX</code> class
@@ -26,6 +26,4 @@ $Date: 2013-11-13 18:03:12 +0100 (Wed, 13 Nov 2013) $
       container version.
     - xAOD::TauJet_v1: The current latest tau jet implementation.
 
- @htmlinclude used_packages.html
 
- @include requirements
diff --git a/Event/xAOD/xAODTracking/doc/mainpage.h b/Event/xAOD/xAODTracking/doc/packagedoc.h
similarity index 82%
rename from Event/xAOD/xAODTracking/doc/mainpage.h
rename to Event/xAOD/xAODTracking/doc/packagedoc.h
index cf10564455893d3e0c1be810368f4ef93a30d114..8521af6a6a82637266cda61a43f399dd76c54584 100644
--- a/Event/xAOD/xAODTracking/doc/mainpage.h
+++ b/Event/xAOD/xAODTracking/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-   @mainpage xAODTracking package
+@page xAODTracking_page xAODTracking package
 
    @author Edward Moyse <Edward.Moyse@cern.ch>
    @author Andreas Salzburger <Andreas.Salzburger@cern.ch>
@@ -14,19 +14,17 @@
    $Revision: 588420 $
    $Date: 2014-03-19 15:15:25 +0100 (Wed, 19 Mar 2014) $
 
-   @section xAODTrackingOverview Overview
+@section xAODTracking_xAODTrackingOverview Overview
 
    This package holds the data model to describe the output of the
    tracking/vertexing reconstruction for analysis users.
 
-   @section xAODTrackingClasses Classes
+@section xAODTracking_xAODTrackingClasses Classes
 
    The main classes of the package are the following:
      - xAOD::TrackParticle: Class describing a chaged track.
      - xAOD::NeutralParticle: Class describing a neutral particle;
      - xAOD::Vertex: Class describing a reconstructed vertex.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODTrigCalo/doc/mainpage.h b/Event/xAOD/xAODTrigCalo/doc/packagedoc.h
similarity index 71%
rename from Event/xAOD/xAODTrigCalo/doc/mainpage.h
rename to Event/xAOD/xAODTrigCalo/doc/packagedoc.h
index 74eedb71ab11b87f9b31b9bba7fde8700fc019d7..a80ffd5701d95db7c88672974e7d1948158226d9 100644
--- a/Event/xAOD/xAODTrigCalo/doc/mainpage.h
+++ b/Event/xAOD/xAODTrigCalo/doc/packagedoc.h
@@ -3,25 +3,23 @@
 */
 
 /**
-   @mainpage xAODTrigCalo package
+@page xAODTrigCalo_page xAODTrigCalo package
 
    @author Arantxa Ruiz Martinez <aranzazu.ruiz.martinez@cern.ch>
 
    $Revision: 592214 $
    $Date: 2014-04-09 21:27:48 +0200 (Wed, 09 Apr 2014) $
 
-   @section xAODTrigCaloOverview Overview
+@section xAODTrigCalo_xAODTrigCaloOverview Overview
 
    This package holds the central EDM classes used by the calorimeter
    trigger in xAOD files.
 
-   @section xAODTrigCaloClasses Main Classes
+@section xAODTrigCalo_xAODTrigCaloClasses Main Classes
 
    The following classes are included in this package:
      - xAOD::TrigCaloCluster
      - xAOD::TrigEMCluster
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODTrigCaloCnv/doc/mainpage.h b/Event/xAOD/xAODTrigCaloCnv/doc/packagedoc.h
similarity index 84%
rename from Event/xAOD/xAODTrigCaloCnv/doc/mainpage.h
rename to Event/xAOD/xAODTrigCaloCnv/doc/packagedoc.h
index 9a5e0c8ff6f43dc661b3af83a44e07373f0e2daf..fe9821a50f18bbff57bede52afebdfbacd19e886 100644
--- a/Event/xAOD/xAODTrigCaloCnv/doc/mainpage.h
+++ b/Event/xAOD/xAODTrigCaloCnv/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-   @mainpage xAODTrigCaloCnv package
+@page xAODTrigCaloCnv_page xAODTrigCaloCnv package
 
    @author Arantxa Ruiz Martinez <aranzazu.ruiz.martinez@cern.ch>
 
    $Revision: 575635 $
    $Date: 2014-03-18 11:58:41 +0100 (Tue, 18 Mar 2014) $
 
-   @section xAODTrigCaloCnvOverview Overview
+@section xAODTrigCaloCnv_xAODTrigCaloCnvOverview Overview
 
    This package holds the components (algorithms and tools) that can be used
    to translate the TrigCaloCluster and TrigEMCluster objects that were used in AOD files, into the
@@ -20,14 +20,12 @@
    xAODTrigCaloClusterCreator and xAODTrigEMClusterCreator. But it is also possible to make use of the converter tools
    of the package from the outside if necessary.
 
-   @section xAODTrigCaloCnvTools Tool Interfaces
+@section xAODTrigCaloCnv_xAODTrigCaloCnvTools Tool Interfaces
 
    It is possible to use the following tool interfaces to create xAOD objects
    out of AOD ones, from other packages as well:
      - xAODMaker::ITrigCaloClusterCnvTool: Tool creating xAOD::TrigCaloClusterContainer.
      - xAODMaker::ITrigEMClusterCnvTool: Tool creating xAOD::TrigEMClusterContainer.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODTrigL1CaloCnv/doc/mainpage.h b/Event/xAOD/xAODTrigL1CaloCnv/doc/packagedoc.h
similarity index 79%
rename from Event/xAOD/xAODTrigL1CaloCnv/doc/mainpage.h
rename to Event/xAOD/xAODTrigL1CaloCnv/doc/packagedoc.h
index a30904ece48c27e3725fc6f71cf36c7c7f32e925..f883933ee85976f04a1f39ff51e223fec437821d 100644
--- a/Event/xAOD/xAODTrigL1CaloCnv/doc/mainpage.h
+++ b/Event/xAOD/xAODTrigL1CaloCnv/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-   @mainpage xAODTrigL1CaloCnv package
+@page xAODTrigL1CaloCnv_page xAODTrigL1CaloCnv package
 
    @author John Morris <john.morris@cern.ch>
 
    $Revision: 575874 $
    $Date: 2013-12-17 13:39:55 +0100 (Tue, 17 Dec 2013) $
 
-   @section xAODTrigL1CaloCnvOverview Overview
+@section xAODTrigL1CaloCnv_xAODTrigL1CaloCnvOverview Overview
 
    This package holds the components (algorithms and tools) that can be used
    to translate the Trigger/TrigT1/TrigT1CaloEvent objects that were used in ESD files, into the
@@ -20,14 +20,12 @@
    xAODTrigL1CaloCreator. But it is also possible to make use of the converter tools
    of the package from the outside if necessary.
 
-   @section xAODTrigL1CaloCnvTools Tool Interfaces
+@section xAODTrigL1CaloCnv_xAODTrigL1CaloCnvTools Tool Interfaces
    
    It is possible to use the following tool interfaces to create xAOD objects
    out of ESD ones, from other packages as well:
    
    
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
    
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/doc/mainpage.h b/Event/xAOD/xAODTrigMinBiasCnv/doc/packagedoc.h
similarity index 74%
rename from Event/xAOD/xAODTrigMinBiasCnv/doc/mainpage.h
rename to Event/xAOD/xAODTrigMinBiasCnv/doc/packagedoc.h
index 3e37da0509948a2b1fe6be4b23359b8fc96606cf..b7c5d0784136daa734f40e33d5747883c2ba573f 100644
--- a/Event/xAOD/xAODTrigMinBiasCnv/doc/mainpage.h
+++ b/Event/xAOD/xAODTrigMinBiasCnv/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-   @mainpage xAODTrigMinBiasCnv package
+@page xAODTrigMinBiasCnv_page xAODTrigMinBiasCnv package
 
    @author Gordon Watts <gwatts@uw.edu>
 
    $Revision: 575635 $
    $Date: 2013-12-16 02:58:41 -0800 (Mon, 16 Dec 2013) $
 
-   @section xAODTrigMinBiasCnvOverview Overview
+@section xAODTrigMinBiasCnv_xAODTrigMinBiasCnvOverview Overview
 
    This package holds the components (algorithms and tools) that can be used
    to translate the xAOD objects that are used in AOD files, into the
@@ -20,9 +20,7 @@
    xAODxAODTrigMinBiasCreator. But it is also possible to make use of the converter tools
    of the package from the outside if necessary.
 
-   @section xAODTrigMinBiasCnvTools Tool Interfaces
+@section xAODTrigMinBiasCnv_xAODTrigMinBiasCnvTools Tool Interfaces
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODTrigMissingET/doc/mainpage.h b/Event/xAOD/xAODTrigMissingET/doc/packagedoc.h
similarity index 75%
rename from Event/xAOD/xAODTrigMissingET/doc/mainpage.h
rename to Event/xAOD/xAODTrigMissingET/doc/packagedoc.h
index 611314078fb1030822c52793847abf3b322cd309..650e9549f4744c4ff9630bc67d85822a672a92c2 100644
--- a/Event/xAOD/xAODTrigMissingET/doc/mainpage.h
+++ b/Event/xAOD/xAODTrigMissingET/doc/packagedoc.h
@@ -6,10 +6,8 @@
 
 This package contains the EDM classes for the missing ET in the trigger, in particular, TrigMissingET.
 
-@mainpage
+@page xAODTrigMissingET_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Event/xAOD/xAODTrigMissingETCnv/doc/mainpage.h b/Event/xAOD/xAODTrigMissingETCnv/doc/packagedoc.h
similarity index 74%
rename from Event/xAOD/xAODTrigMissingETCnv/doc/mainpage.h
rename to Event/xAOD/xAODTrigMissingETCnv/doc/packagedoc.h
index 762be361fa8600207d763be23bad6e7624f34a88..046d0ca554f172c81c1ee5b104630ae092cbebec 100644
--- a/Event/xAOD/xAODTrigMissingETCnv/doc/mainpage.h
+++ b/Event/xAOD/xAODTrigMissingETCnv/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-   @mainpage xAODTrigMissingETCnv package
+@page xAODTrigMissingETCnv_page xAODTrigMissingETCnv package
 
    @author Gordon Watts <gwatts@uw.edu>
 
    $Revision: 592539 $
    $Date: 2014-04-11 12:17:29 +0200 (Fri, 11 Apr 2014) $
 
-   @section xAODTrigMissingETCnvOverview Overview
+@section xAODTrigMissingETCnv_xAODTrigMissingETCnvOverview Overview
 
    This package holds the components (algorithms and tools) that can be used
    to translate the xAOD objects that are used in AOD files, into the
@@ -20,9 +20,7 @@
    xAODxAODTrigMissingETCreator. But it is also possible to make use of the converter tools
    of the package from the outside if necessary.
 
-   @section xAODTrigMissingETCnvTools Tool Interfaces
+@section xAODTrigMissingETCnv_xAODTrigMissingETCnvTools Tool Interfaces
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODTrigMuon/doc/mainpage.h b/Event/xAOD/xAODTrigMuon/doc/packagedoc.h
similarity index 57%
rename from Event/xAOD/xAODTrigMuon/doc/mainpage.h
rename to Event/xAOD/xAODTrigMuon/doc/packagedoc.h
index 052439104312e717949061c3349b3dfc49d4e955..f5528d4b04ebf1f45b146b67bef29c3dfde9bd48 100644
--- a/Event/xAOD/xAODTrigMuon/doc/mainpage.h
+++ b/Event/xAOD/xAODTrigMuon/doc/packagedoc.h
@@ -3,11 +3,9 @@
 */
 
 /**
-   @mainpage xAODTrigMuon Package
+@page xAODTrigMuon_page xAODTrigMuon Package
 
    Documentation to be written...
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODTrigger/doc/mainpage.h b/Event/xAOD/xAODTrigger/doc/packagedoc.h
similarity index 79%
rename from Event/xAOD/xAODTrigger/doc/mainpage.h
rename to Event/xAOD/xAODTrigger/doc/packagedoc.h
index 5dba09c128f9ca31eb73710aac12fc215e51344d..491a02364d4ae4e33c47e4309784a1ca1552b7f3 100644
--- a/Event/xAOD/xAODTrigger/doc/mainpage.h
+++ b/Event/xAOD/xAODTrigger/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-   @mainpage xAODTrigger package
+@page xAODTrigger_page xAODTrigger package
 
    @author Lukas Heinrich <Lukas.Heinrich@cern.ch>
    @author Gordon Watts <gwatts@uw.edu>
@@ -12,12 +12,12 @@
    $Revision: 570358 $
    $Date: 2013-11-14 10:06:15 +0100 (Thu, 14 Nov 2013) $
 
-   @section xAODTriggerOverview Overview
+@section xAODTrigger_xAODTriggerOverview Overview
 
    This package holds the central EDM classes used by the trigger in xAOD
    files.
 
-   @section xAODTriggerClasses Main Classes
+@section xAODTrigger_xAODTriggerClasses Main Classes
 
    The following classes should be interesting to the EDM developers:
      - xAOD::ByteStreamAuxContainer_v1: Base class for trigger-specific
@@ -26,7 +26,5 @@
    The following classes should be interesting to the general audience:
      - To be filled in...
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Event/xAOD/xAODTriggerCnv/doc/mainpage.h b/Event/xAOD/xAODTriggerCnv/doc/packagedoc.h
similarity index 85%
rename from Event/xAOD/xAODTriggerCnv/doc/mainpage.h
rename to Event/xAOD/xAODTriggerCnv/doc/packagedoc.h
index 47d97f05d76ba17a302e8176ec049a07bf12eb2b..2c67ec7c19ce738bbea2171d5afe28c6dc82af3a 100644
--- a/Event/xAOD/xAODTriggerCnv/doc/mainpage.h
+++ b/Event/xAOD/xAODTriggerCnv/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-   @mainpage xAODTriggerCnv package
+@page xAODTriggerCnv_page xAODTriggerCnv package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
    $Revision: 575635 $
    $Date: 2013-12-16 11:58:41 +0100 (Mon, 16 Dec 2013) $
 
-   @section xAODTriggerCnvOverview Overview
+@section xAODTriggerCnv_xAODTriggerCnvOverview Overview
 
    This package holds the components (algorithms and tools) that can be used
    to translate the LVL1_ROI object that was used in AOD files, into the
@@ -20,7 +20,7 @@
    xAODRoICreator. But it is also possible to make use of the converter tools
    of the package from the outside if necessary.
 
-   @section xAODTriggerCnvTools Tool Interfaces
+@section xAODTriggerCnv_xAODTriggerCnvTools Tool Interfaces
 
    It is possible to use the following tool interfaces to create xAOD objects
    out of AOD ones, from other packages as well:
@@ -30,7 +30,5 @@
      - xAODMaker::IEnergySumRoICnvTool: Tool creating xAOD::EnergySumRoI.
      - xAODMaker::IJetEtRoICnvTool: Tool creating xAOD::JetEtRoI.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/doc/mainpage.h b/ForwardDetectors/ALFA/ALFA_BeamTransport/doc/packagedoc.h
similarity index 78%
rename from ForwardDetectors/ALFA/ALFA_BeamTransport/doc/mainpage.h
rename to ForwardDetectors/ALFA/ALFA_BeamTransport/doc/packagedoc.h
index ab5652571939b2bc9d32e4ae0984daa2b4df078f..ee16e4f1ad1de11a13ac24b59a08704e1785bb19 100644
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/doc/mainpage.h
+++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage  ALFA_BeamTransport
+@page ALFA_BeamTransport_page ALFA_BeamTransport
 @author daniel.pelikan@cern.ch
 
-@section ALFA_BeamTransportIntro Introduction
+@section ALFA_BeamTransport_ALFA_BeamTransportIntro Introduction
 
 This package is to transport the particles from the IP to the RP of the ALFA detector.
 It uses as beam transport library the FPTracker library.
 
-@section ALFA_BeamTransportOverview Class Overview
+@section ALFA_BeamTransport_ALFA_BeamTransportOverview Class Overview
   The ALFA_BeamTransport package contains of following classes:
 
   - ALFA_BeamTransport : main class which handels initialization(), execution() and finalize()
@@ -24,11 +24,9 @@ It uses as beam transport library the FPTracker library.
 
 /**
 @page used_ALFA_BeamTransport Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_ALFA_BeamTransport Requirements
-@include requirements
 */
  
diff --git a/Generators/AcerMC_i/doc/mainpage.h b/Generators/AcerMC_i/doc/packagedoc.h
similarity index 92%
rename from Generators/AcerMC_i/doc/mainpage.h
rename to Generators/AcerMC_i/doc/packagedoc.h
index cfd77b6c39ee18b2bf11790f8702ad0cfb41f2d3..7d1c259d52e011e819cb5626b4a88a5c46986e5b 100644
--- a/Generators/AcerMC_i/doc/mainpage.h
+++ b/Generators/AcerMC_i/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  AcerMC_i
+@page AcerMC_i_page AcerMC_i
 @author  Borut.Kersevan@cern.ch, Giorgios.Stavropoulos@cern.ch, Ian.Hinchliffe@cern.ch,  Judith.Katzy@cern.ch
 
-@section  The interface between AcerMC and Athena
+@section AcerMC_i_The interface between AcerMC and Athena
  
 This package runs AcerMC  from within Athena. See the example
 in AcerMC_i/share/jobOptions.AcerMCPythia.py  and 
@@ -43,10 +43,8 @@ https://twiki.cern.ch/twiki/bin/view/AtlasProtected/AcerMCForAtlas
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 */
diff --git a/Generators/AlpGen_i/doc/mainpage.h b/Generators/AlpGen_i/doc/packagedoc.h
similarity index 94%
rename from Generators/AlpGen_i/doc/mainpage.h
rename to Generators/AlpGen_i/doc/packagedoc.h
index 535a7e3f5717b79a105d6d693c537922d5fe3728..79d5311a5db348e437d8d6659d842267e7a3e1f0 100644
--- a/Generators/AlpGen_i/doc/mainpage.h
+++ b/Generators/AlpGen_i/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage AlpGen_i
+@page AlpGen_i_page AlpGen_i
 
 @author Ian Hinchliffe, Georgios Stavropoulos, Jon Butterworth and Judith Katzy
       
-@section  An interface between AlpGen and Athena
+@section AlpGen_i_An interface between AlpGen and Athena
 
 This package runs AlpGen from within Athena.
 
@@ -22,7 +22,7 @@ The events must be made with a version of AlpGen that is compatible with LesHouc
 
 Within the GeneratorModuls, m_ExternalProcess=4 is used to signify AlpGen to both the HERWIG and Pythia interfaces.
 
-@section AlpGen and Pythia
+@section AlpGen_i_AlpGen and Pythia
 To hadronize AlpGen generated events with Pythia, you need to link the file with the input parameters 
 and the one with the unweighted events produced by Alpgen to the files inparmAlpGen.dat and alpgen.unw_events 
 respectively. Then you only need to run athena with the jobOptions file jobOptions.AlpgenPythia.py by typing 
@@ -31,7 +31,7 @@ in the prompt
 athena jobOptions.AlpgenPythia.py
 
 
-@section Alpgen and Herwig
+@section AlpGen_i_Alpgen and Herwig
 
 To hadronize Alpgen generated events with Herwig, you need to
 link the file with the input parameters and the one with the
@@ -74,9 +74,7 @@ would force any Higgs particles present in your input events to decay to two pho
 
 
 last update Feb.28, 2008
-@htmlinclude used_packages.html
 
-@include requirements
 
 
 */
diff --git a/Generators/Charybdis_i/doc/mainpage.h b/Generators/Charybdis_i/doc/packagedoc.h
similarity index 88%
rename from Generators/Charybdis_i/doc/mainpage.h
rename to Generators/Charybdis_i/doc/packagedoc.h
index ff954d4da6e5ab890df35e6f9a7fef5c0ffb66b2..37833d98f1643e4d9479290d6a0df98de47384c5 100644
--- a/Generators/Charybdis_i/doc/mainpage.h
+++ b/Generators/Charybdis_i/doc/packagedoc.h
@@ -13,10 +13,8 @@ https://svnweb.cern.ch/trac/atlasoff/browser/Generators/Charybdis_i/trunk/doc/Ch
 @author Nick Brett (n.brett1@physics.ox.ac.uk)
 </i>
 
-@mainpage
+@page Charybdis_i_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/CompHep_i/doc/mainpage.h b/Generators/CompHep_i/doc/packagedoc.h
similarity index 94%
rename from Generators/CompHep_i/doc/mainpage.h
rename to Generators/CompHep_i/doc/packagedoc.h
index 283ec02996e6bda1214e857b4fe3410f3bad6ee7..73bf2173b8797d10c51b08431e1e5bbdd5bef9b9 100644
--- a/Generators/CompHep_i/doc/mainpage.h
+++ b/Generators/CompHep_i/doc/packagedoc.h
@@ -32,10 +32,8 @@ put into doxygen by E. Lobodzinska (Jan. 2008)
 
 </i>
 
-@mainpage
+@page CompHep_i_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/CosmicGenerator/doc/mainpage.h b/Generators/CosmicGenerator/doc/packagedoc.h
similarity index 94%
rename from Generators/CosmicGenerator/doc/mainpage.h
rename to Generators/CosmicGenerator/doc/packagedoc.h
index 994980b336d11825d1270c121821c18981d8571b..82eed8384893a83755d2f7bf4f8765c701ef4d8b 100644
--- a/Generators/CosmicGenerator/doc/mainpage.h
+++ b/Generators/CosmicGenerator/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  CosmicGenerator
+@page CosmicGenerator_page CosmicGenerator
 @author W. Seligman, M. Shapiro, I. Hinchliffe, M. Zdrazil,
 
-@section General information
+@section CosmicGenerator_General information
 
 CosmicGenerator package is a generator used for the cosmic particle production.
 The output will is stored in the transient event store so it can be passed to t
@@ -42,8 +42,6 @@ ons pointing inside a sphere centered in the IP with the given radius will be a
 ccepted.
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/EmbeddedTrackGenerator/doc/mainpage.h b/Generators/EmbeddedTrackGenerator/doc/packagedoc.h
similarity index 87%
rename from Generators/EmbeddedTrackGenerator/doc/mainpage.h
rename to Generators/EmbeddedTrackGenerator/doc/packagedoc.h
index f87f1b5f8e9f00c8dac41115074dae63fe801a0c..07cac51173a5c438a7aa601b89fd1a1746187948 100644
--- a/Generators/EmbeddedTrackGenerator/doc/mainpage.h
+++ b/Generators/EmbeddedTrackGenerator/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage EmbeddedTrackGenerator
+@page EmbeddedTrackGenerator_page EmbeddedTrackGenerator
 
 @author Andrei Gaponenko <andrei.gaponenko@cern.ch>
 
@@ -19,8 +19,6 @@ file) for input event data.
 For more details see individual generator pages of
 EmbeddedTrackGenerator and VertexedTrackGenerator.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/Exhume_i/doc/mainpage.h b/Generators/Exhume_i/doc/packagedoc.h
similarity index 91%
rename from Generators/Exhume_i/doc/mainpage.h
rename to Generators/Exhume_i/doc/packagedoc.h
index 216995de73178fb704c5479ca658f9170de72ab5..27b7423a06e05b47580ebcf7a186d2732ba193b9 100644
--- a/Generators/Exhume_i/doc/mainpage.h
+++ b/Generators/Exhume_i/doc/packagedoc.h
@@ -21,10 +21,8 @@ http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=find+t+exhume&FORMAT=WWW
 
 Andrew Pilkington (Jan 2008)
 
-@mainpage 
+@page Exhume_i_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/GenAnalysisTools/EventBoost/doc/mainpage.h b/Generators/GenAnalysisTools/EventBoost/doc/packagedoc.h
similarity index 82%
rename from Generators/GenAnalysisTools/EventBoost/doc/mainpage.h
rename to Generators/GenAnalysisTools/EventBoost/doc/packagedoc.h
index 0d1bf853e75f613a2235d898a5b55d268c7e2cca..8c72c2b8851c69a4ba12852187e2ba07839f223f 100644
--- a/Generators/GenAnalysisTools/EventBoost/doc/mainpage.h
+++ b/Generators/GenAnalysisTools/EventBoost/doc/packagedoc.h
@@ -4,15 +4,13 @@
 
 /**
 
-@mainpage
+@page EventBoost_page 
 
 @author Esben Klinky (klinkby@nbi.dk)
 
 EventBoost is an Athena algorithm which modifies the McEventCollection according to the nonzero beam crossing angle.
 See www.nbi.dk/~klinkby/EventBoost.pdf for details
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/GenAnalysisTools/TruthHelper/doc/mainpage.h b/Generators/GenAnalysisTools/TruthHelper/doc/packagedoc.h
similarity index 97%
rename from Generators/GenAnalysisTools/TruthHelper/doc/mainpage.h
rename to Generators/GenAnalysisTools/TruthHelper/doc/packagedoc.h
index c31c1c7af433fcdcc2592eee13ec9719727d7694..120b2dff0920978a3167741e22ba14336f672c29 100644
--- a/Generators/GenAnalysisTools/TruthHelper/doc/mainpage.h
+++ b/Generators/GenAnalysisTools/TruthHelper/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page TruthHelper_page 
 @author Ian Hinchliffe (I_Hinchliffe@lbl.gov) Jan 29, 2003
 
         updated Ewelina Lobodzinska (ewelina@mail.desy.de) Jan 12, 2008
@@ -57,8 +57,6 @@ g process
 
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/GeneratorFilters/doc/mainpage.h b/Generators/GeneratorFilters/doc/packagedoc.h
similarity index 94%
rename from Generators/GeneratorFilters/doc/mainpage.h
rename to Generators/GeneratorFilters/doc/packagedoc.h
index 1b39e6cd220f1bcd5fa667cb7af64f07f1e8d85b..f5e7e0632813967c6cab44594118767339d69dcb 100644
--- a/Generators/GeneratorFilters/doc/mainpage.h
+++ b/Generators/GeneratorFilters/doc/packagedoc.h
@@ -26,11 +26,9 @@ Storegate).
 
 </i>
 
-@mainpage
+@page GeneratorFilters_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 
 
diff --git a/Generators/GeneratorObjects/doc/mainpage.h b/Generators/GeneratorObjects/doc/packagedoc.h
similarity index 79%
rename from Generators/GeneratorObjects/doc/mainpage.h
rename to Generators/GeneratorObjects/doc/packagedoc.h
index 886735f9e390c6d45c1d7fe224cd3d1630f789b7..a82ac6d462a2c99a14e5a29359b8692ca92a07e9 100644
--- a/Generators/GeneratorObjects/doc/mainpage.h
+++ b/Generators/GeneratorObjects/doc/packagedoc.h
@@ -8,10 +8,8 @@
 To make them persisten also the package  GeneratorObjectsTPCn is needed.
 </i>
 
-@mainpage
+@page GeneratorObjects_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/GeneratorObjectsAthenaPool/doc/mainpage.h b/Generators/GeneratorObjectsAthenaPool/doc/packagedoc.h
similarity index 80%
rename from Generators/GeneratorObjectsAthenaPool/doc/mainpage.h
rename to Generators/GeneratorObjectsAthenaPool/doc/packagedoc.h
index 0d15bd5f381ba8f55cb0fe2cb67ed07727e114f5..02448b401a65fd05b3cb1961e2800117f4feb4d1 100644
--- a/Generators/GeneratorObjectsAthenaPool/doc/mainpage.h
+++ b/Generators/GeneratorObjectsAthenaPool/doc/packagedoc.h
@@ -3,24 +3,22 @@
 */
 
 /**
-@mainpage GeneratorObjectsAthenaPool Package
+@page GeneratorObjectsAthenaPool_page GeneratorObjectsAthenaPool Package
 
 The package which defines POOL converters for general Monte-Carlo classes.
 
 @authors Sebastien Binet, Georgios Stavropoulos, Davide Costanzo
 
-@section GeneratorObjectsAthenaPoolIntro Introduction
+@section GeneratorObjectsAthenaPool_GeneratorObjectsAthenaPoolIntro Introduction
 
 The MonteCarlo classes (e.g. @c HepMC::GenEvent ) are stored on disk through the so-called POOL persistification technology which insulates client code (Athena) from technology details and provides transparent switch of different storage backends (ROOT, MySQL,...)
 
 This package provides the needed boilerplate code to use the T/P converters provided by the GeneratorObjectsTPCnv package (see twiki page about Transient/Persistent separation: https://twiki.cern.ch/twiki/bin/view/Atlas/TransientPersistentSeparation) and make them available to the GAUDI framework.
 
-@section GeneratorObjectsAthenaPoolSeeAlso See also
+@section GeneratorObjectsAthenaPool_GeneratorObjectsAthenaPoolSeeAlso See also
 
 You may also be interested in having a look at the GeneratorObjectsTPCnv package which defines and provides various T/P converters for the MonteCarlo classes.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/GeneratorObjectsTPCnv/doc/mainpage.h b/Generators/GeneratorObjectsTPCnv/doc/packagedoc.h
similarity index 90%
rename from Generators/GeneratorObjectsTPCnv/doc/mainpage.h
rename to Generators/GeneratorObjectsTPCnv/doc/packagedoc.h
index 6ed5f2dc871dcd500ad4dddfe08d752921278609..a789abdb29f7eab902582e1a0d74edb0657d9e76 100644
--- a/Generators/GeneratorObjectsTPCnv/doc/mainpage.h
+++ b/Generators/GeneratorObjectsTPCnv/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage GeneratorObjectsTPCnv Package
+@page GeneratorObjectsTPCnv_page GeneratorObjectsTPCnv Package
 
 This package defines the so-called T/P converters for Monte-Carlo classes.
 
 @authors Sebastien Binet, Georgios Stavropoulos, Davide Costanzo
 
-@section GeneratorObjectsTPCnvIntro Introduction
+@section GeneratorObjectsTPCnv_GeneratorObjectsTPCnvIntro Introduction
 
 The ATLAS software, in order to provide backward compatibility (and extensive schema evolution) of on-disk stored data, decouples the transient classes that one manipulates in-memory and the persistent classes that one writes on disk.
 To achieve this, a robust (and quite performant) Transient/Persistent separation library has been written.
@@ -21,8 +21,6 @@ As other transient (and hence persistent) classes may also need to re-use that f
 
 See https://twiki.cern.ch/twiki/bin/view/Atlas/TransientPersistentSeparation for a broader and more detailed of how the T/P separation of classes is working and implemented.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/GravADD_i/doc/mainpage.h b/Generators/GravADD_i/doc/packagedoc.h
similarity index 93%
rename from Generators/GravADD_i/doc/mainpage.h
rename to Generators/GravADD_i/doc/packagedoc.h
index deeca73380f2d83b5224f28f8be84300819a4542..835effaf7907f3a28ca16eab10edb6516b512fec 100644
--- a/Generators/GravADD_i/doc/mainpage.h
+++ b/Generators/GravADD_i/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage GravADD_i
+@page GravADD_i_page GravADD_i
 @author Nele Boelaert  (at_cern.ch)
 
-@section introductionGravADD_i Introduction
+@section GravADD_i_introductionGravADD_i Introduction
 
 GravADD is a generator for gravitational scattering (GS) and black hole (BH) production in large extra dimensions. It has been implemented in the ATLAS software framework and has become available from release 15.6 onwards.
 
@@ -26,7 +26,7 @@ In hadron collisions, BHs are expected to form when the interacting partons come
 The BH generation is done with the Charybdis generator. The current version of Charybdis is 1.003, but an upgrade to Charybdis 2 is foreseen (soon). There is the possibility to switch of BH production in GravADD. 
 
 
-@section paramsGravADD_i Parameters
+@section GravADD_i_paramsGravADD_i Parameters
 
 - MP = the fundamental Planck Scale defined as in (hep-ph/0608210). This is the default definition in GravADD, but the user can change via the jobOption to the definition used by the Particle Data Group.
 - Ms = Kaluza Klein mass cutoff (1/Ms = measure of the width of the membrane)
@@ -36,7 +36,7 @@ The BH generation is done with the Charybdis generator. The current version of C
 Orthogonal set of parameters: Meff, Ms/MP (relative KK mass cutoff) and total number of dimensions.
 
 
-@section implementationGravADD_i Implementation in Athena
+@section GravADD_i_implementationGravADD_i Implementation in Athena
 
 The code is split over two separate packages, namely Generators/PythiaExo_i and Generators/GravADD_i. 
 
@@ -49,7 +49,7 @@ The QCD processes are selected in the normal way, using the MSUB array in PYTHIA
 The package Generators/GravADD_i has been created to contain the code for the BH production and for reading in the parameters. 
 
 
-@section ExampleGravADD_i Example JobOption
+@section GravADD_i_ExampleGravADD_i Example JobOption
 
 jobOption file to initialize ("pyinit user GRAVADD") and set model parameters (a list with all options will be given later on)
 
@@ -60,7 +60,7 @@ jobOption file to initialize ("pyinit user GRAVADD") and set model parameters (a
 Warning: GravADD only generates weighted events, so you should always fill your analysis histograms with pari(10), which is stored in the weight container.
 
 
-@section ModelparamsGravADD_i JobOption Parameters
+@section GravADD_i_ModelparamsGravADD_i JobOption Parameters
 
 Model parameters are set in the JobOption file, GravADD_i contains code to read them in
 
@@ -76,7 +76,7 @@ All complete list of all parameters: index, name, type, default, description:
 
 
 
-@section TipsGravADD_i Tips for analysis
+@section GravADD_i_TipsGravADD_i Tips for analysis
 
 Note that since GravADD generates weighted events, the user should always fill analysis histograms with the event weight pari(10), which is stored as third entry in the event weight container. At the end of the event loop, the histograms need to be divided by the bin width and the sum of weights of all events, and multiplied with the total integrated cross section, in order to convert the results to nb/(dimension of the horizontal axis). The total integrated cross section of event samples generated in Athena, is stored as MetaData in the file. 
 
@@ -88,9 +88,7 @@ The flag gravev that GravADD uses to distinguish the three types of events (QCD,
 */
 /**
 @page usedGravADD_i Used Packages
-@htmlinclude used_packages.html
 */
 /**
 @page requirementsGravADD_i Requirements
-@include requirements
 */
diff --git a/Generators/Herwig7_i/doc/mainpage.h b/Generators/Herwig7_i/doc/packagedoc.h
similarity index 95%
rename from Generators/Herwig7_i/doc/mainpage.h
rename to Generators/Herwig7_i/doc/packagedoc.h
index 2fbd8280a7597e790dbbebe53ba97786c83c613f..c7695719a2dfb5a4234b816ccd9982533f809c2f 100644
--- a/Generators/Herwig7_i/doc/mainpage.h
+++ b/Generators/Herwig7_i/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage  Herwig7_i
+@page Herwig7_i_page Herwig7_i
 
-@section Herwig7ForATLAS Herwig 7 for ATLAS
+@section Herwig7_i_Herwig7ForATLAS Herwig 7 for ATLAS
 
 Herwig 7 is a general-purpose event generator written in C++.
 It provides a significant amount of improvements and new features with respect
diff --git a/Generators/Herwig_i/doc/mainpage.h b/Generators/Herwig_i/doc/packagedoc.h
similarity index 95%
rename from Generators/Herwig_i/doc/mainpage.h
rename to Generators/Herwig_i/doc/packagedoc.h
index 0a71dc19da83a76e5c2e226930248be9803e98e4..c057ed32f73dd621d84f9426c2bd0889e4916cef 100644
--- a/Generators/Herwig_i/doc/mainpage.h
+++ b/Generators/Herwig_i/doc/packagedoc.h
@@ -24,11 +24,9 @@ Vojtech Juranek for Dpemc
 
 Georgios Stavropoulos for Jimmy        
 
-@mainpage
+@page Herwig_i_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 
 */
diff --git a/Generators/Herwigpp_i/doc/mainpage.h b/Generators/Herwigpp_i/doc/packagedoc.h
similarity index 85%
rename from Generators/Herwigpp_i/doc/mainpage.h
rename to Generators/Herwigpp_i/doc/packagedoc.h
index 1a22d9b41470385771997d135716f80b5b90374a..2a5d88d9ae06c1aeae5a980f8f1413e3e5642cac 100644
--- a/Generators/Herwigpp_i/doc/mainpage.h
+++ b/Generators/Herwigpp_i/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  Herwigpp_i
+@page Herwigpp_i_page Herwigpp_i
 @author Andy.Buckley@cern.ch,  judith.katzy@cern.ch
 
-@section  The interface between Herwig++ and Athena
+@section Herwigpp_i_The interface between Herwig++ and Athena
 
 Herwig++ is a general-purpose generator written in c++ with many 
 modifications and improvements on fortran Herwig. 
@@ -26,7 +26,6 @@ since rel.14.
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
diff --git a/Generators/Hijing_i/doc/mainpage.h b/Generators/Hijing_i/doc/packagedoc.h
similarity index 87%
rename from Generators/Hijing_i/doc/mainpage.h
rename to Generators/Hijing_i/doc/packagedoc.h
index 851a956238bcc8a80851923f1b7290da50769847..2277533fc2e14736eb3fb2939f98c7cdb737190c 100644
--- a/Generators/Hijing_i/doc/mainpage.h
+++ b/Generators/Hijing_i/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage
+@page Hijing_i_page 
 
 @author Georgios Stavropoulos (George.Stavropoulos@cern.ch)
 
@@ -14,8 +14,6 @@ The Hijing interface documentation and explanations how to use Hijing in Athena
 https://svnweb.cern.ch/trac/atlasoff/browser/Generators/Hijing_i/trunk/doc/Hijing.pdf
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/HvGen_i/doc/mainpage.h b/Generators/HvGen_i/doc/packagedoc.h
similarity index 94%
rename from Generators/HvGen_i/doc/mainpage.h
rename to Generators/HvGen_i/doc/packagedoc.h
index fbf38baaf0ec7021c4f6b1d7eb2315fe122b4b7e..783a12fadf4c0ed703eca273ae58375636b833cd 100644
--- a/Generators/HvGen_i/doc/mainpage.h
+++ b/Generators/HvGen_i/doc/packagedoc.h
@@ -31,10 +31,8 @@ http://www.phys.washington.edu/users/strasslr/hv/hv.htm
 
 @author Stefano Giagu (Stefano.Giagu@cern.ch) </i>
 
-@mainpage
+@page HvGen_i_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/MCTester_i/doc/mainpage.h b/Generators/MCTester_i/doc/packagedoc.h
similarity index 97%
rename from Generators/MCTester_i/doc/mainpage.h
rename to Generators/MCTester_i/doc/packagedoc.h
index b194d31bc56d49c7458f293b490c14733ec95768..c195350bd210de6223e8953e9ce1467f5e9357a8 100644
--- a/Generators/MCTester_i/doc/mainpage.h
+++ b/Generators/MCTester_i/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-   @mainpage  MCTester_i
+@page MCTester_i_page MCTester_i
    @author  MCTester_i: Nadia Davidson nadia.davidson@cern.ch
    @author MC-TESTER tool: Nadia Davidson, Piotr Golonka, Tomasz Pierzchala, Tomasz Przedzinski and Zbigniew Was 
 
-   @section  general  General Notes about MC-TESTER
+@section MCTester_i_general General Notes about MC-TESTER
 
    MC-TESTER in a tool external to Athena that allows the comparison of particle
    or resonance decay between two Monte-Carlo Generators. It produces a latex (or pdf)
@@ -30,7 +30,7 @@
 
    <hr>
 
-   @section use Example of using MCTester_i
+@section MCTester_i_use Example of using MCTester_i
 
    Running a comparison using MC-TESTER is a two step process: "Generation and Analysis".
    Within Athena, the Generation Step runs on any MCEventColletion in StoreGate and produces
diff --git a/Generators/Photos_i/doc/mainpage.h b/Generators/Photos_i/doc/packagedoc.h
similarity index 86%
rename from Generators/Photos_i/doc/mainpage.h
rename to Generators/Photos_i/doc/packagedoc.h
index e9729bf690ce02a0ed431ef2fac43c4cb0a7acc1..de2e2bf78a44d2c401f0676fcece03ced1e1c7b0 100644
--- a/Generators/Photos_i/doc/mainpage.h
+++ b/Generators/Photos_i/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page Photos_i_page 
 
 <i>
 
@@ -20,9 +20,7 @@ Borut Paul Kersevan, Elzbieta Richter-Was
 
        Ewelina Lobodzinska (Jan 2008) doxygen docu
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
 
diff --git a/Generators/PythiaB/doc/mainpage.h b/Generators/PythiaB/doc/packagedoc.h
similarity index 92%
rename from Generators/PythiaB/doc/mainpage.h
rename to Generators/PythiaB/doc/packagedoc.h
index 2b8dc6c564d43192d28a5a17886534f208fe2a00..9d1c72b0d37b009acbebddca77a338bc938481b7 100644
--- a/Generators/PythiaB/doc/mainpage.h
+++ b/Generators/PythiaB/doc/packagedoc.h
@@ -24,10 +24,8 @@ http://atlas-sw.cern.ch/cgi-bin/viewcvs-atlas.cgi/offline/Generators/PythiaB/doc
 
     doxygen doc - Ewelina Lobodzinska (Jan. 2008)
 
-@mainpage
+@page PythiaB_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Generators/Pythia_i/doc/mainpage.h b/Generators/Pythia_i/doc/packagedoc.h
similarity index 97%
rename from Generators/Pythia_i/doc/mainpage.h
rename to Generators/Pythia_i/doc/packagedoc.h
index e33c4b02b4a4aa1efa9275fccba8b407a06ef671..14ca2dd95cf2c45ef5a82c1560ffc09804bf978d 100644
--- a/Generators/Pythia_i/doc/mainpage.h
+++ b/Generators/Pythia_i/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage  Pythia_i
+@page Pythia_i_page Pythia_i
 
 @author  Giorgios.Stavropoulos@cern.ch, Ian.Hinchliffe@cern.ch,  Judith.Katzy@cern.ch, Liza Mijovic (at_cern.ch)
 
-@section introductionPythia_i The interface between Pythia and Athena
+@section Pythia_i_introductionPythia_i The interface between Pythia and Athena
  
 This package runs Pythia  from within Athena, puts the events into the
 transient store in HepMC format. See the documentation on Generators/GeneratorModules and <a href="https://twiki.cern.ch/twiki/bin/view/AtlasProtected/McGeneratorsOverview">ATLAS MC group wiki pages</a>
@@ -132,7 +132,7 @@ once with print-level 1.
 - "pydat2 pmas 4000011 1 1000." will set the mass of particle with KF code 4000011 to 1000 GeV.
 - WARNING: Someone has to give the KF and NOT the KC code. The KF code is converted (via a call to PYCOMP) to the KC code internally in Pythia.cxx
 
-@section defaultparamsPythia_i Default Parameters
+@section Pythia_i_defaultparamsPythia_i Default Parameters
 
 The ATLAS settings for MC08 production were set in 
 Generators/EvgenJobOptions/share/MC8_Pythia_Common.py and some are inside Pythia.cxx. PYLIST is called as PYLIST(11) after initialization. Common parameters 
@@ -149,7 +149,7 @@ see Pythia_i/share/xxxx_tune_test_Zmumu_jO.py for examples.
 More info is available on the Atlas WiKi Pythia pages https://twiki.cern.ch/twiki/bin/view/AtlasProtected/PythiaForAtlas .
 
 
-@section randomPythia_i Random Numbers
+@section Pythia_i_randomPythia_i Random Numbers
 
  Pythia.cxx is using the AtRndmGenSvc Athena Service to provide to Pythia (via the pyr function,
  found in Pythia_i/src/pyr.F) the necessary random numbers. This service is using the RanecuEngine of CLHEP,
@@ -186,7 +186,7 @@ AtRndmGenSvc.ReadFromFile = True
  
  The  Pythia_i/share/jobOptions.pythia.py  contains the above options.
  
-@section User User modifications
+@section Pythia_i_User User modifications
 
 Two types of user modifications are common
 
@@ -215,7 +215,7 @@ place. For Pythia, here is the example.
 
   "pyinit user user''
 
-@section LHApdfPythia_i Note on LHApdf stucture functions
+@section Pythia_i_LHApdfPythia_i Note on LHApdf stucture functions
 
 In the case you want to run Pythia with the LHAPDF structure functions you need to
 set the mstp(52), mstp(54) and mstp(56) variables equal to 2 and the mstp(51),
@@ -227,10 +227,8 @@ of the Generators/Lhapdf_i package for the LHAPDF set/member index settings).
 
 /**
 @page usedPythia_i Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsPythia_i Requirements
-@include requirements
 */
diff --git a/Generators/Tauola_i/doc/mainpage.h b/Generators/Tauola_i/doc/packagedoc.h
similarity index 86%
rename from Generators/Tauola_i/doc/mainpage.h
rename to Generators/Tauola_i/doc/packagedoc.h
index 12097e8046d9e043094c9aa70e3d47c22592ac09..e29e453e3ec520ba21498d2e3e904c543121e19a 100644
--- a/Generators/Tauola_i/doc/mainpage.h
+++ b/Generators/Tauola_i/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page Tauola_i_page 
 The usage of Tauola and Photos in the Athena environment is described in the following note:
 http://atlas-sw.cern.ch/cgi-bin/viewcvs-atlas.cgi/offline/Generators/Tauola_i/doc/athena_TauolaPhotos.pdf
 
@@ -12,8 +12,6 @@ http://atlas-sw.cern.ch/cgi-bin/viewcvs-atlas.cgi/offline/Generators/Tauola_i/do
 
        Ewelina Lobodzinska (Jan 2008) doxygen docu
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/mainpage.h b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 98%
rename from InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/mainpage.h
rename to InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/packagedoc.h
index 8164149d3d8b4bf4e82d0c1757b823003fe7fdb3..f0c4a1484752d1645b04903a9f085d1cbaac5216
--- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/mainpage.h
+++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage The InDetAligGenAlgs package
+@page InDetAlignGenAlgs_page The InDetAligGenAlgs package
 
-\section introduction Introduction
+@section InDetAlignGenAlgs_introduction Introduction
 
 This package provides 
 
@@ -46,7 +46,7 @@ This document provides details of how the silicon alignment data is stored,
 more details on each algorithm itself, followed by discussion of the 
 job options available in the example subdirectory.
 
-\section dbsInDetAlignGenAlgs Alignment Data Storage
+@section InDetAlignGenAlgs_dbsInDetAlignGenAlgs Alignment Data Storage
 
 The alignment database for the SCT and pixels provides a hierarchy of 
 transformation matrices (HepTransform3D) for all the modules in the silicon
@@ -200,7 +200,7 @@ TestSCT_Alignment=Service("TestSCT_Alignment")
 TestSCT_Alignment.ManagerName="SCT"
 </pre>
 
-\section IndetAlignNt The InDetAlignNt algorithm
+@section InDetAlignGenAlgs_IndetAlignNt The InDetAlignNt algorithm
 
 This algorithmn produces the alignment ntuple containing the SCT/pixel and
 optionally TRT information. The ntuple is produced first as a transient
@@ -278,7 +278,7 @@ InDetAlignNt.BField(20.83) - assumed B-field at centre of ID for analytic
                             derivative calculation
 </pre>
 
-\section InDetAlignWrt The InDetAlignWrt algorithm
+@section InDetAlignGenAlgs_InDetAlignWrt The InDetAlignWrt algorithm
 
 This algorithm provides tools to create the transient objects for ID alignment
 in the TDS, to modify them (applying systematic or random misalignments)
@@ -480,7 +480,7 @@ where
 This can be used to set up a set of random or systematic misalignments
 fr the different layers of detector.
 
-\section InDetAlignARes The InDetAlignARes algorithm
+@section InDetAlignGenAlgs_InDetAlignARes The InDetAlignARes algorithm
 
 The InDetAlignARes algorithm is an end-user algorithm for studying the effects
 of module distortions and other alignment-related problems on tracking 
@@ -531,7 +531,7 @@ The RMS parameters par1 and par2 are used to choose values randomly for each
 module, which are stored and used for all tracks in all events passing through
 the module.
 
-\section SiDistWriteAlg The SiDistWriteAlg algorithm
+@section InDetAlignGenAlgs_SiDistWriteAlg The SiDistWriteAlg algorithm
 
 The SiWriteDistAlg algorithm provides a simple way to store distortion 
 parameters (basically an array of floats per module) into the conditions
@@ -568,7 +568,7 @@ for any particular module can then be read in Athena by using the following:
 For a concrete example, see the methods CreateModuleNtuple in AlignNtuple.cxx
 and getDistPars in AlignCore.cxx (both in the InDetAlignGenAlgs package).
 
-\section Examples Examples of use
+@section InDetAlignGenAlgs_Examples Examples of use
 
 The example directory contains a number of complete Athena joboptions 
 to perform various tasks. Note that the alignjobOption.py and 
diff --git a/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/doc/mainpage.h b/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/doc/mainpage.h
rename to InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/doc/packagedoc.h
index 921ebd159cbaa68e0cca89ee2271e614c337c26d..b5b4545dfc7fc77819b2f8c8150af61a3471328d
--- a/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/doc/mainpage.h
+++ b/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage The InDetAligTrkInfo package
+@page InDetAlignTrkInfo_page The InDetAligTrkInfo package
 
-\section introductionInDetAlignTrkInfo Introduction
+@section InDetAlignTrkInfo_introductionInDetAlignTrkInfo Introduction
 
 This package provides transient classes to hold the ID aligment tracking
 informtion produced by the algorithms in InDetAlignAlgs, which also provides
diff --git a/InnerDetector/InDetAlignTools/InDetAlignGenTools/doc/mainpage.h b/InnerDetector/InDetAlignTools/InDetAlignGenTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 98%
rename from InnerDetector/InDetAlignTools/InDetAlignGenTools/doc/mainpage.h
rename to InnerDetector/InDetAlignTools/InDetAlignGenTools/doc/packagedoc.h
index 235e459fbfb32a016a0a279971ab3b633491ad39..daf9d273121e777054f1cd38f6fd2a4c0c9d93ca
--- a/InnerDetector/InDetAlignTools/InDetAlignGenTools/doc/mainpage.h
+++ b/InnerDetector/InDetAlignTools/InDetAlignGenTools/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-\mainpage The InDetAlignGenTools package
+@page InDetAlignGenTools_page The InDetAlignGenTools package
 
-\section introductionInDetAlignGenTools Introduction
+@section InDetAlignGenTools_introductionInDetAlignGenTools Introduction
 
 This package provides a place to put AlgTools related to ID alignment. 
 The available AlgTools (so far InDetAlignDBTool and InDetAlignTrackSelTool) 
 are discussed below.
 
-\section InDetAlignDBTool
+@section InDetAlignGenTools_InDetAlignDBTool 
 
 The InDetAlignDBTool AlgTool provides tools (methods) to manipulate the
 set of AlignableTransform objects which make up the ID alignment database.
@@ -101,7 +101,7 @@ This can be used for example to store the SCT/pixel survey data
 database in the folder /Indet/SiSurvey. For more details of this, see
 the documentation of the InDetAlignWrt algorithm in InDetAlignGenAlgs.
 
-\section DispCSC
+@section InDetAlignGenTools_DispCSC 
 
 The DispCSC method inside InDetAlignDBTool allows to generate the misalignments 
 of the Pixel and SCT detectors for the CSC exercise. The misalignments are generated at 
@@ -676,7 +676,7 @@ Note the different suffix for level 3 misalignments (lowercase) with respect lev
      InDetDBTool.SCT_EcC_G(0.40*0.001)  - fixed value for Gamma rotation, SCT-EcA
 \endverbatim
 
-\section InDetAlignTrackSelTool
+@section InDetAlignGenTools_InDetAlignTrackSelTool 
 
 This tool provides a standard track selection for 'alignment quality' tracks
 (for the SCT and pixels),
@@ -718,17 +718,15 @@ on shared hits.
 An example of the use of this tool can be found in the InDetAlignNt
 algorithm in InnerDetector/InDetAlignment/InDetAlignAlgs.
 
-@section InDetAlignTrackSelToolJobOptions InDetAlignTrackSelTool JobOptions
+@section InDetAlignGenTools_InDetAlignTrackSelToolJobOptions InDetAlignTrackSelTool JobOptions
 
 @include InDetAlignTrackSelTool_jobOptions.py
 
-@section requirements requirements 
+@section InDetAlignGenTools_requirements requirements
 
-@include requirements
 
-@section uses Packages used
+@section InDetAlignGenTools_uses Packages used
 
-@htmlinclude used_packages.html
 
 */
 
diff --git a/InnerDetector/InDetAlignTools/InDetAlignToolInterfaces/doc/mainpage.h b/InnerDetector/InDetAlignTools/InDetAlignToolInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 75%
rename from InnerDetector/InDetAlignTools/InDetAlignToolInterfaces/doc/mainpage.h
rename to InnerDetector/InDetAlignTools/InDetAlignToolInterfaces/doc/packagedoc.h
index f7e30ad512033af6f8fd35d43805139034683124..113d7d686f3c707edc1101f0502239df9a1e4719
--- a/InnerDetector/InDetAlignTools/InDetAlignToolInterfaces/doc/mainpage.h
+++ b/InnerDetector/InDetAlignTools/InDetAlignToolInterfaces/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage InDetAlignInterfaces Package
+@page InDetAlignToolInterfaces_page InDetAlignInterfaces Package
 
 This package contains all interface classes
 to be used in the inner detector alignment algorithms and tools.
@@ -11,7 +11,7 @@ Concrete implementations can be found in InDetAlignGenTools
 
 @author tobias.goettfert@cern.ch
 
-@section TrkExInterfacesIntro Introduction
+@section InDetAlignToolInterfaces_TrkExInterfacesIntro Introduction
 
 The following interface classes are defined
 
@@ -20,8 +20,7 @@ which are used to prepare track collections prior to alignment.
 
 This package is not going to be built as any library, it is a simple include package.   
       
-@section InDetAlignIntReq Requirements
+@section InDetAlignToolInterfaces_InDetAlignIntReq Requirements
 
-@include requirements
 
  */
\ No newline at end of file
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/doc/mainpage.h b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/doc/packagedoc.h
similarity index 80%
rename from InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/doc/mainpage.h
rename to InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/doc/packagedoc.h
index 2cfde7e5f5baf003d3df320b51a923f35f0e5c4d..5d324b33b088d5ef9b99baac91c3cd374dee08b9 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/doc/mainpage.h
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage InDetBeamSpotFinder Package
+@page InDetBeamSpotFinder_page InDetBeamSpotFinder Package
 
 Package for the offline determination of the beamspot position, width, slope, for the ATLAS experiment.
 
@@ -13,9 +13,7 @@ Package for the offline determination of the beamspot position, width, slope, fo
 See TWiki page InDetBeamSpot for general information.
 
 @page UsedInDetBeamSpotFinder Used Packages
-@htmlinclude used_packages.html
 
 @page RequirementsInDetBeamSpotFinder Requirements
-@include requirements
 
 */
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/doc/mainpage.h b/InnerDetector/InDetCalibTools/TRT_CalibTools/doc/packagedoc.h
similarity index 93%
rename from InnerDetector/InDetCalibTools/TRT_CalibTools/doc/mainpage.h
rename to InnerDetector/InDetCalibTools/TRT_CalibTools/doc/packagedoc.h
index 6f254c57971f8e6056ab4949e908c8ff6dc88f16..801a9ee2266449c3c2c1cc9b8fed3144ecf0cb72 100644
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/doc/mainpage.h
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  TRT_CalibTools
+@page TRT_CalibTools_page TRT_CalibTools
 @author johan.lundquist@nbi.dk
 
-@section MyPackageIntro Introduction
+@section TRT_CalibTools_MyPackageIntro Introduction
 
 This package is used to calibrate the %TRT. For calibration purposes The %TRT is divided into 7 sub-levels:<br>
 
@@ -35,7 +35,7 @@ It is also possible to make configurations in order to calibrate only a part of
 calibration of various parts to be made in parallel. The output files can then be merged into calibration results for the 
 whole detector. 
 
-@section MyPackageOverview Class Overview
+@section TRT_CalibTools_MyPackageOverview Class Overview
   The TRT_CalibTools package contains of following classes:
   
   FillAlignTRTHits
@@ -50,11 +50,9 @@ whole detector.
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 */
 
diff --git a/InnerDetector/InDetConditions/InDetBeamSpotService/doc/mainpage.h b/InnerDetector/InDetConditions/InDetBeamSpotService/doc/packagedoc.h
similarity index 90%
rename from InnerDetector/InDetConditions/InDetBeamSpotService/doc/mainpage.h
rename to InnerDetector/InDetConditions/InDetBeamSpotService/doc/packagedoc.h
index ec5af39a53e15a89a373def7de4e1a8f4be5a3af..be9b83051e7d5d3e6e08a320c8a6d8397c45492a 100644
--- a/InnerDetector/InDetConditions/InDetBeamSpotService/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/InDetBeamSpotService/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage The InDetBeamSpotService package
+@page InDetBeamSpotService_page The InDetBeamSpotService package
 
-\section introductionInDetCondServicesIntroduction
+@section InDetBeamSpotService_introductionInDetCondServicesIntroduction 
 
 Remark: This package used to be called InDetCondServices but was renamed to
 InDetBeamSpotService shortly after release 14.0.0 was out.
@@ -13,7 +13,7 @@ InDetBeamSpotService shortly after release 14.0.0 was out.
 This package provides services (in the Athena sense) related to inner
 detector conditions data. So far, there is a single service, BeamCondSvc
 
-\section BeamCondSvc
+@section InDetBeamSpotService_BeamCondSvc 
 
 The BeamCondSvc (accessed through the abstract interface IBeamCondSvc.h) 
 provides a service to return the beamspot position and error matrix, for
@@ -52,7 +52,7 @@ The service provides the following joboption parameters (default in brackets)
  - tiltX(0.)     - x tilt of beamline
  - tiltY(0.)     - y tilt of beamline
 
-\section Setting the beamspot position
+@section InDetBeamSpotService_Setting the beamspot position
 
 A simple python script utils/beamSpot_set.py is provided to update the beamspot
 position in the conditions database. Use --help for parameters.
diff --git a/InnerDetector/InDetConditions/InDetCondServices/doc/mainpage.h b/InnerDetector/InDetConditions/InDetCondServices/doc/packagedoc.h
similarity index 54%
rename from InnerDetector/InDetConditions/InDetCondServices/doc/mainpage.h
rename to InnerDetector/InDetConditions/InDetCondServices/doc/packagedoc.h
index 53adaeb95c13a8ee52d9f0147b3e1115f5d3908e..2fd4231caf0d52b3d62eb8e5de07dd815feb3838 100644
--- a/InnerDetector/InDetConditions/InDetCondServices/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/InDetCondServices/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage InDetCondServices package
+@page InDetCondServices_page InDetCondServices package
 
-@section InDetCondServicesIntroduction Introduction
+@section InDetCondServices_InDetCondServicesIntroduction Introduction
 
 This package provides interfaces to conditions services.
 
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/doc/mainpage.h b/InnerDetector/InDetConditions/PixelConditionsData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from InnerDetector/InDetConditions/PixelConditionsData/doc/mainpage.h
rename to InnerDetector/InDetConditions/PixelConditionsData/doc/packagedoc.h
index 3b79247231cf2870d4336317dc0252afc5a9d831..1e5a86dea67b1a185c3c635d349341189816e96f
--- a/InnerDetector/InDetConditions/PixelConditionsData/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/PixelConditionsData/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage PixelConditionsData
+@page PixelConditionsData_page PixelConditionsData
 
 @author Wei-Ming.Yao@cern.ch, ruwiedel@physik.uni-bonn.de
 
-@section PixelConditionsDataIntroduction Introduction
+@section PixelConditionsData_PixelConditionsDataIntroduction Introduction
 
 The calibration and conditions data for the pixel detector in the offline COOL database is stored in a format
 that is not directly useful or easily accessible in an athena component. Hence, after reading the data from
@@ -19,7 +19,7 @@ The data objects can be created and managed using the tools and services provide
 PixelConditionsTools and PixelConditionsServices. The package PixelConditionsServices provides some example
 algorithms that illustrate the usage of the services.
 
-@section PixelConditionsDataPixelCalibData PixelCalibData 
+@section PixelConditionsData_PixelConditionsDataPixelCalibData PixelCalibData
 
 The PixelCalibData is a class that designed to hold the calibration data for each module that contains
 16 FE PixelChipSummaryData. The calibration data consist of threshold, timewalk information and Time over
@@ -27,7 +27,7 @@ threshold calibration that averages per FE chip. The details can be found at
 https://twiki.cern.ch/twiki/bin/view/Atlas/PixelCOOLoffline#Calibrations
 .
 
-@section PixelConditionsDataSpecialPixelMap Special Pixel Map
+@section PixelConditionsData_PixelConditionsDataSpecialPixelMap Special Pixel Map
 
 There are two classes that are used together to hold the data about pixels with special properties,
 DetectorSpecialPixelMap and ModuleSpecialPixelMap. A DetectorSpecialPixelMap is a std::vector of pointers to
@@ -43,7 +43,7 @@ https://twiki.cern.ch/twiki/bin/view/Atlas/PixelCOOLoffline#Modified_proposal_18
 More technical details about the format of the various unsigned integers can be found in the README file in
 the doc directory of the package PixelConditionsServices.
 
-@section PixelConditionsDataExtras Extra Pages
+@section PixelConditionsData_PixelConditionsDataExtras Extra Pages
 
  - @ref PixelConditionsDataUsedPackages
  - @ref PixelConditionsDataRequirements
@@ -51,10 +51,8 @@ the doc directory of the package PixelConditionsServices.
 
 /**
 @page PixelConditionsDataUsedPackages Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page PixelConditionsDataRequirements Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetConditions/PixelConditionsServices/doc/mainpage.h b/InnerDetector/InDetConditions/PixelConditionsServices/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from InnerDetector/InDetConditions/PixelConditionsServices/doc/mainpage.h
rename to InnerDetector/InDetConditions/PixelConditionsServices/doc/packagedoc.h
index 0c241fa13f593be282664efe751c0c8ba652eda1..32c3f6520ba8baaa1a24f82caffa4f981ece2da0
--- a/InnerDetector/InDetConditions/PixelConditionsServices/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/PixelConditionsServices/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage PixelConditionsServices
+@page PixelConditionsServices_page PixelConditionsServices
 
 @author Wei-Ming.Yao@cern.ch, ruwiedel@physik.uni-bonn.de
 
-@section PixelConditionsServicesIntroduction Introduction
+@section PixelConditionsServices_PixelConditionsServicesIntroduction Introduction
 
 The package PixelConditionsServices provides services to create and manage the data objects holding the
 calibration and conditions data from the offline COOL database for the pixel detector. The service
@@ -18,12 +18,12 @@ PixelMapTestAlg.
 
 The classes for the data objects are defined in the package PixelConditionsData.
 
-@section PixelConditionsServicesPixelCalibSvc PixelCalibSvc 
+@section PixelConditionsServices_PixelConditionsServicesPixelCalibSvc PixelCalibSvc
 The PixelCalibSvc provides a set of services to access pixel calibration data objects in the detector store.
 The creation of pixel calibration data is handled by PixelCalibDbTool via a callback function from the
 cool database.
 
-@section PixelConditionsServicesSpecialPixelMapSvc SpecialPixelMapSvc
+@section PixelConditionsServices_PixelConditionsServicesSpecialPixelMapSvc SpecialPixelMapSvc
 
 This service can be used to create and manage several special pixel map objects in the detector store. The
 service provides a callback function that, unless switched off in the job options, is registered in the
@@ -36,7 +36,7 @@ create() can be used to construct a special pixel map on demand, using data eith
 text files. The method print() is used to print pixel maps for a list of modules specified in the job options
 to the screen.
 
-@section PixelConditionsServicesExtras Extra Pages
+@section PixelConditionsServices_PixelConditionsServicesExtras Extra Pages
 
  - @ref PixelConditionsServicesUsedPackages
  - @ref PixelConditionsServicesRequirements
@@ -44,11 +44,9 @@ to the screen.
 
 /**
 @page PixelConditionsServicesUsedPackages Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page PixelConditionsServicesRequirements Requirements
-@include requirements
 */
 
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/doc/mainpage.h b/InnerDetector/InDetConditions/PixelConditionsTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from InnerDetector/InDetConditions/PixelConditionsTools/doc/mainpage.h
rename to InnerDetector/InDetConditions/PixelConditionsTools/doc/packagedoc.h
index 92b6684e44eb49b7a4fee39062e2074369d16805..377ca7c01ed4b5d330c7f2670bf81b5b3ea9e0bc
--- a/InnerDetector/InDetConditions/PixelConditionsTools/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage PixelConditionsTools 
+@page PixelConditionsTools_page PixelConditionsTools
 @author Wei-Ming.Yao@cern.ch, ruwiedel@physik.uni-bonn.de
 
-@section PixelConditionsToolsIntro Introduction
+@section PixelConditionsTools_PixelConditionsToolsIntro Introduction
 
  The package PixelConditionsTools provides tools to create and manage the data objects holding the calibration 
  and conditions data from the offline COOL database for the pixel detector. The PixelCalibDbTool is used to 
@@ -16,18 +16,18 @@
 
  The classes for the data objects are defined in the package PixelConditionsData.
 
-@section PixelConditionsToolsPixelCalibDbTool PixelCalibDbTool 
+@section PixelConditionsTools_PixelConditionsToolsPixelCalibDbTool PixelCalibDbTool
 
     The PixelCalibDbTool is used to create and manage the data objects holding the calibration data for the
     Pixel detector. It reads the calibration data from the offline COOL database via a callback and converts
     to PixelCalibData objects stored in the detector store in Athena. It also provides a tool to read/write
     a text file from/to the COOL database.
 
-@section PixelConditionsToolsPixelCalibDbTestWriteRead PixelCalibDbTestWriteRead
+@section PixelConditionsTools_PixelConditionsToolsPixelCalibDbTestWriteRead PixelCalibDbTestWriteRead
    The PixelCalibDbTestWriteRead provides an algorithm how to read/write the calibration data in a text file
    from/to the COOL database.
 
-@section PixelConditionsToolsExtras Extra Pages
+@section PixelConditionsTools_PixelConditionsToolsExtras Extra Pages
 
  - @ref PixelConditionsToolsUsedPackages
  - @ref PixelConditionsToolsRequirements
@@ -35,11 +35,9 @@
 
 /**
 @page PixelConditionsToolsUsedPackages Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page PixelConditionsToolsRequirements Requirements
-@include requirements
 */
 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsData/doc/mainpage.h b/InnerDetector/InDetConditions/SCT_ConditionsData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from InnerDetector/InDetConditions/SCT_ConditionsData/doc/mainpage.h
rename to InnerDetector/InDetConditions/SCT_ConditionsData/doc/packagedoc.h
index 9e6d15b142d634a640e2026cbb0f8e9cdfdb468b..861dceb0d68f35ff923d0d7701d4cc89eff069f5
--- a/InnerDetector/InDetConditions/SCT_ConditionsData/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsData/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage SCT_ConditionsData package
+@page SCT_ConditionsData_page SCT_ConditionsData package
 @author Shaun.Roe@cern.ch, Jorgen.Dalmau@cern.ch
 
 
-@section SCT_ConditionsDataIntro Introduction
+@section SCT_ConditionsData_SCT_ConditionsDataIntro Introduction
 This package provides data classes used to access data in the conditions
  database or derived from the datastream in some way. Access to these underlying data classes is
  provided by the AlgTools in SCT_ConditionsAlgs, and more documentation can be found there.
@@ -16,7 +16,7 @@ This package provides data classes used to access data in the conditions
 
 
 
-@section SCT_ConditionsDataOverview Class overview 
+@section SCT_ConditionsData_SCT_ConditionsDataOverview Class overview
  
 
   - SCT_DCSConditionsData: Container for DCS conditions, such as module temperature.
@@ -27,7 +27,7 @@ This package provides data classes used to access data in the conditions
   
   - StringifyVector: Local utility function to tokenise and stream a string to a vector.
 
-@section SCT_ConditionsDataRefs Reference pages
+@section SCT_ConditionsData_SCT_ConditionsDataRefs Reference pages
   - @ref used_SCT_ConditionsData
   - @ref requirements_SCT_ConditionsData
 */
@@ -35,11 +35,9 @@ This package provides data classes used to access data in the conditions
 
 /**
 @page used_SCT_ConditionsData Used packages
-@htmlinclude used_packages.html
 */
 
 
 /**
 @page requirements_SCT_ConditionsData Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/doc/mainpage.h b/InnerDetector/InDetConditions/SCT_ConditionsServices/doc/packagedoc.h
similarity index 94%
rename from InnerDetector/InDetConditions/SCT_ConditionsServices/doc/mainpage.h
rename to InnerDetector/InDetConditions/SCT_ConditionsServices/doc/packagedoc.h
index cfc06e8540f60ebed71ce2fb511e4f3bf5f77115..6b8513d787fa06e2e6f6c6fc53ceafad0be5cc99 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-@mainpage SCT_ConditionsServices Package
+@page SCT_ConditionsServices_page SCT_ConditionsServices Package
 @author shaun.roe@cern.ch
 
 
-@section SCT_ConditionsServices Introduction
+@section SCT_ConditionsServices_SCT_ConditionsServices Introduction
 
 This package contains services which access and provide conditions data for SCT detector elements: modules, wafers and strips. The various services each have a 
 specific purpose, but all inherit from ISCT_ConditionsSvc, which provides an interface (specifically, the isGood(...) methods) which can be used by the 
 SCT_ConditionsSummarySvc to summarise the total status and report this to clients. SCT_ConditionsSummaryService in turn inherits from IInDetConditionsSvc, the
 common interface for Pixels and TRT as well as SCT.
 
-@section SCT_ConditionsOverview Class Overview
+@section SCT_ConditionsServices_SCT_ConditionsOverview Class Overview
 SCT_ConditionsServices contains the following classes:
 
    - ISCT_ConditionsSvc: Base class for the various conditions services, the interface provides the isGood() methods to be used by clients and fill methods (via 
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/mainpage.h b/InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h
similarity index 92%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/mainpage.h
rename to InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h
index fd74cd66e496199ad3900bdae996d7bb85aa3fc9..55382e88eb39647eda406c63286f66ef1f54c4a1 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage SiLorentzAngleSvc Package
+@page SiLorentzAngleSvc_page SiLorentzAngleSvc Package
 
 @authors Grant Gorfine
 
-@section SiLorentzAngleSvcIntro Introduction 
+@section SiLorentzAngleSvc_SiLorentzAngleSvcIntro Introduction
 
 Service for providing Lorentz angle (and the corresponding shift of the measurement)
 for each detector element. 
 
-@section SiLorentzAngleSvcUsage Usage Notes
+@section SiLorentzAngleSvc_SiLorentzAngleSvcUsage Usage Notes
 
 A python module has been provided for easy setup.
 To load simply include the following in your job options.
@@ -107,8 +107,7 @@ or
 @endverbatim
 
 
-@section SiLorentzAngleSvcReq Requirements
+@section SiLorentzAngleSvc_SiLorentzAngleSvcReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetConditions/SiPropertiesSvc/doc/mainpage.h b/InnerDetector/InDetConditions/SiPropertiesSvc/doc/packagedoc.h
similarity index 75%
rename from InnerDetector/InDetConditions/SiPropertiesSvc/doc/mainpage.h
rename to InnerDetector/InDetConditions/SiPropertiesSvc/doc/packagedoc.h
index 01edf64b31f9499dec56919ab121210d2e75005c..9b315f8d31d885aded61dc975a15461f6c8c1143 100644
--- a/InnerDetector/InDetConditions/SiPropertiesSvc/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/SiPropertiesSvc/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage SiPropertiesSvc Package
+@page SiPropertiesSvc_page SiPropertiesSvc Package
 
 @authors Grant Gorfine
 
-@section SiPropertiesSvcIntro Introduction 
+@section SiPropertiesSvc_SiPropertiesSvcIntro Introduction
 
 Service for providing silicon properties for each detector element.
 The properties are available via the SiliconProperties class from
@@ -17,8 +17,7 @@ number of electron hole pairs per deposited energy.  Some of these
 are dependent on temperature and voltages which are obtained via the
 appropriate service and updated via a call back.
 
-@section SiPropertiesReq Requirements
+@section SiPropertiesSvc_SiPropertiesReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/doc/mainpage.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from InnerDetector/InDetConditions/TRT_ConditionsAlgs/doc/mainpage.h
rename to InnerDetector/InDetConditions/TRT_ConditionsAlgs/doc/packagedoc.h
index 8d356973526fc1c543c6d91be4ed9dcf06665764..4f7f68abcd1c9464ba8a28fe8194c9f7e9236f42
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/doc/packagedoc.h
@@ -4,18 +4,18 @@
 
 /**
 
-@mainpage The TRT_ConditionsAlgs package
+@page TRT_ConditionsAlgs_page The TRT_ConditionsAlgs package
 
 @author phansen@nbi.dk
 
-@section CondAlgIntro Introduction
+@section TRT_ConditionsAlgs_CondAlgIntro Introduction
 
 TRT_ConditionsAlgs contains tools and algorithms for storing and managing TRT conditions data
 in the TDS and for persistifying them with the IOV service or on flat files.
 It also provides the basic RDO-to-RIO conversion as well
 as convenient accessor methods.
 
-@section CondAlgOverview Class Overview
+@section TRT_ConditionsAlgs_CondAlgOverview Class Overview
 
  - TRT_TestWrite    : Alg to write CTB conditions data to DB 
  - TRT_TestRead     : Alg to read CTB conditions data from DB 
@@ -24,10 +24,10 @@ as convenient accessor methods.
  - TRT_ConditionsSummaryExAlg : example of use of TRT_ConditionsSummaryTool
 
 
-@section TRT_ConditionsSummaryExAlg TRT_ConditionsSummaryExAlg
+@section TRT_ConditionsAlgs_TRT_ConditionsSummaryExAlg TRT_ConditionsSummaryExAlg
 Example algorithm illustrating use of the TRT_ConditionsSummaryTool from the TRT_ConditionsTools package.
 
-@section jobOptions jobOptions
+@section TRT_ConditionsAlgs_jobOptions jobOptions
   - TRT_CoolTB.py          include this in the InDetTestBeamRecExample
                            to read CTB RT conditions from DB.
   - TRT_CoolCosmic.py      include this in the InDetCosmicRecExample
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/doc/mainpage.h b/InnerDetector/InDetConditions/TRT_ConditionsData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from InnerDetector/InDetConditions/TRT_ConditionsData/doc/mainpage.h
rename to InnerDetector/InDetConditions/TRT_ConditionsData/doc/packagedoc.h
index 02a77a80391723bf64e87cec4f717217b2bf58da..7b0070a2cd73de1410266777d6bb44d808b86590
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage TRT_ConditionsData package
+@page TRT_ConditionsData_page TRT_ConditionsData package
 
 @author phansen@nbi.dk
 
-@section TRT_ConditionsDataIntro Introduction
+@section TRT_ConditionsData_TRT_ConditionsDataIntro Introduction
 
 This package provides TDS objects for storing TRT Conditions data.
 
-@section  TRT_ConditionsDataOverview Class Overview
+@section TRT_ConditionsData_TRT_ConditionsDataOverview Class Overview
 
   -  ArrayStore: Templated indexed storage of objects
   -  FloatArrayStore : Specialization to a float array object and  an Identifier index
@@ -48,11 +48,9 @@ This package provides TDS objects for storing TRT Conditions data.
 /**
 @page used_TRT_ConditionsData Used Packages
 
-@htmlinclude used_packages.html
 
 */
 /**
 @page requirements_TRT_ConditionsData requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/doc/mainpage.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/doc/packagedoc.h
similarity index 85%
rename from InnerDetector/InDetConditions/TRT_ConditionsServices/doc/mainpage.h
rename to InnerDetector/InDetConditions/TRT_ConditionsServices/doc/packagedoc.h
index 5d282100996dfc84b6f630ca9aa1b7682953345d..b4f3dae2a7f0c7dfca6c10f63e2f9327e37b75a4 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/doc/mainpage.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/doc/packagedoc.h
@@ -4,15 +4,15 @@
 
 /**
 
-@mainpage The TRT_ConditionsServices package
+@page TRT_ConditionsServices_page The TRT_ConditionsServices package
 
 @author Denver.Whittington@cern.ch
 
-@section CondSvcIntro Introduction
+@section TRT_ConditionsServices_CondSvcIntro Introduction
 
 TRT_ConditionsServices contains tools for accessing and managing TRT conditions data
 
-@section CondSvcOverview Class Overview
+@section TRT_ConditionsServices_CondSvcOverview Class Overview
 
  - TRT_ConditionsSummarySvc : provides summary of status from all tools
  - TRT_ConditionsTestSvc : returns InDet::TRT_COND_GOOD for testing
@@ -26,33 +26,33 @@ TRT_ConditionsServices contains tools for accessing and managing TRT conditions
  - TRTStrawNeighbourSvc : mapping of straws to electronic pads 
  - TRT_HWMappingSvc: mapping of straws to COOL DCS HV channel names/numbers
 
-@section TRT_ConditionsSummarySvc TRT_ConditionsSummarySvc
+@section TRT_ConditionsServices_TRT_ConditionsSummarySvc TRT_ConditionsSummarySvc
  This Service provides an overall assessment of an identifier, determined
  by considering the TRT Conditions status flags returned by a list of services
  of type ITRT_ConditionsSvc.
 
-@section TRT_ConditionsTestSvc TRT_ConditionsTestSvc
+@section TRT_ConditionsServices_TRT_ConditionsTestSvc TRT_ConditionsTestSvc
  This Service provides a simple example of a service which inherets from
  ITRT_ConditionsSvc.  It returns a TRT Conditions status flag (GOOD)
  for an identifier.
 
-@section TRT_DCS_ConditionsSvc TRT_DCS_ConditionsSvc
+@section TRT_ConditionsServices_TRT_DCS_ConditionsSvc TRT_DCS_ConditionsSvc
  This Service provides access to DCS conditions information read from the
  COOL offline database.  It inherets from ITRT_ConditionsSvc and
  returns a TRT Conditions status flag for an identifier indicating whether
  its straw voltage was within tolerance range.
 
-@section TRT_DAQ_ConditionsSvc TRT_DAQ_ConditionsSvc
+@section TRT_ConditionsServices_TRT_DAQ_ConditionsSvc TRT_DAQ_ConditionsSvc
  This Service provides access to DAQ conditions information from the DAQ
  configuration database. It inherits from ITRT_ConditionsSvc and
  returns a TRT Conditions status flag for an identifier indicating
  whether the ROD it is read out from participated in the run.
 
-@section TRT_ByteStream_ConditionsSvc TRT_ByteStream_ConditionsSvc
+@section TRT_ConditionsServices_TRT_ByteStream_ConditionsSvc TRT_ByteStream_ConditionsSvc
  This Service provides access and management of TRT ByteStream errors,
  stored in StoreGate containers.
 
-@section TRT_CalDbSvc TRT_CalDbSvc
+@section TRT_ConditionsServices_TRT_CalDbSvc TRT_CalDbSvc
 
  This Service manages TRT calibration data stored in
  TRTCond::NestedContainer classes.
@@ -91,7 +91,7 @@ TRT_ConditionsServices contains tools for accessing and managing TRT conditions
   is to write the constants to database, call the tool
   from the TRT_AlignAlgs package.
 
-@section TRT_AlignDbSvc TRT_AlignDbSvc
+@section TRT_ConditionsServices_TRT_AlignDbSvc TRT_AlignDbSvc
 
  This Service manages TRT alignment data stored in
  AlignableTransform classes.
@@ -133,21 +133,21 @@ TRT_ConditionsServices contains tools for accessing and managing TRT conditions
   is to write the constants to database call the tool from
   the TRT_CalibAlgs package. 
 
-@section TRT_StrawAlignDbSvc TRT_StrawAlignDbSvc
+@section TRT_ConditionsServices_TRT_StrawAlignDbSvc TRT_StrawAlignDbSvc
 Like TRT_CalDbSvc, but the stored data are here two independent
 Rphi rotations of each end of a straw.
 
-@section TRTStrawStatusSummarySvc TRTStrawStatusSummarySvc
+@section TRT_ConditionsServices_TRTStrawStatusSummarySvc TRTStrawStatusSummarySvc
  This Service provides access to the dead/noisy straw lists.
 
-@section TRT_HWMappingSvc TRT_HWMappingSvc
+@section TRT_ConditionsServices_TRT_HWMappingSvc TRT_HWMappingSvc
  This Service provides a mapping of straws to COOL DCS HV channel
  names/numbers.  The barrel HV-line map can be created by accessing the
  HW Mapping Database by Serguei Oleshko, or by a hard-coded mapping scheme
  defined in the tool's source code.  The endcap map is currently only available
  through the hard-coded mapping scheme.
 
-@section jobOptions jobOptions
+@section TRT_ConditionsServices_jobOptions jobOptions
 
 */
 
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsFilters/doc/mainpage.h b/InnerDetector/InDetCosmics/InDetCosmicsFilters/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 69%
rename from InnerDetector/InDetCosmics/InDetCosmicsFilters/doc/mainpage.h
rename to InnerDetector/InDetCosmics/InDetCosmicsFilters/doc/packagedoc.h
index 208068499f20d92786d0717d7f24940bc9afb929..06685ebb55770d030858ca2af114beb4f336d48b
--- a/InnerDetector/InDetCosmics/InDetCosmicsFilters/doc/mainpage.h
+++ b/InnerDetector/InDetCosmics/InDetCosmicsFilters/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage Event filters for Cosmic events
+@page InDetCosmicsFilters_page Event filters for Cosmic events
 
-@section IntroductionInDetCosmicsFilters Introduction
+@section InDetCosmicsFilters_IntroductionInDetCosmicsFilters Introduction
 
 This package contains currently one filter for Cosmic events. 
 
@@ -16,7 +16,6 @@ those events that contain at least one good track in any specified trackcollecti
 @author Christian.Schmitt@cern.ch
 @author Wouter.Hulsbergen@cern.ch
 
-@section requirementsInDetCosmicsFilters Requirements
-@include requirements
+@section InDetCosmicsFilters_requirementsInDetCosmicsFilters Requirements
 
 */
diff --git a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/doc/mainpage.h b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 70%
rename from InnerDetector/InDetCosmics/TRT_SegmentsToTrack/doc/mainpage.h
rename to InnerDetector/InDetCosmics/TRT_SegmentsToTrack/doc/packagedoc.h
index 77cd5892a225233bdf3157816eef2569df1f0765..2fd80f810bdebe3db5d2d5884dae14a6798a6478
--- a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/doc/mainpage.h
+++ b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage Segment to track converter for Cosmics
+@page TRT_SegmentsToTrack_page Segment to track converter for Cosmics
 
-@section IntroductionTRT_SegmentsToTrack Introduction
+@section TRT_SegmentsToTrack_IntroductionTRT_SegmentsToTrack Introduction
 
 This package converts TRT segments into full tracks by feeding them into a TrackFitter. At the same time,
 it can try to combine the TRT segment with a Si only track to produce combined tracks.
@@ -16,7 +16,6 @@ the eventphase correction and the per wheel t0 correction (TRT endcap).
 
 @author Christian.Schmitt@cern.ch
 
-@section requirementsTRT_SegmentsToTrack Requirements
-@include requirements
+@section TRT_SegmentsToTrack_requirementsTRT_SegmentsToTrack Requirements
 
 */
diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/doc/mainpage.h b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from InnerDetector/InDetDetDescr/InDetReadoutGeometry/doc/mainpage.h
rename to InnerDetector/InDetDetDescr/InDetReadoutGeometry/doc/packagedoc.h
index 170f513437a985bc4a134ff2040203c59de1612f..30536507a5f0333c9aa226f5d8660be1c57f4c7f
--- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/doc/mainpage.h
+++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/doc/packagedoc.h
@@ -4,12 +4,12 @@
 
 /**
 
-@mainpage InDetReadoutGeometry Package
+@page InDetReadoutGeometry_page InDetReadoutGeometry Package
 
 @authors Grant Gorfine, Joe Boudreau, Thomas Kittlemann, 
          Davide Costanzo, David Calvet, Alessandro Fornaini
 
-@section InDetReadoutGeometryIntro Introduction 
+@section InDetReadoutGeometry_InDetReadoutGeometryIntro Introduction
 
 This package contains the readout classes for
 the inner detector. These are mainly used by digitization and
@@ -30,7 +30,7 @@ The detector element is the object where geometrical information of the readout
 As well as the detector element there are design and descriptor classes which contain information common to several elements.
 
 
-@section InDetReadoutGeometryClassOverview  Class Overview
+@section InDetReadoutGeometry_InDetReadoutGeometryClassOverview Class Overview
 
 Described here are just the classes that clients will 
 normally use.
@@ -61,13 +61,12 @@ normally use.
   - InDetDD::TRT_Numerology: TRT numerology 
   - InDetDD::SiNumerology: Pixel and SCT numerology
 
-@section InDetReadoutGeometryUsage Usage Notes
+@section InDetReadoutGeometry_InDetReadoutGeometryUsage Usage Notes
 The managers are retrieved from storegate. Their names are Pixel, SCT and TRT.
 From the manager, one can get the id helpers and access the detector elements using various methods. 
 
-@section InDetReadoutGeometryReq Requirements
+@section InDetReadoutGeometry_InDetReadoutGeometryReq Requirements
 
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/doc/mainpage.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from InnerDetector/InDetDetDescr/InDetRegionSelector/doc/mainpage.h
rename to InnerDetector/InDetDetDescr/InDetRegionSelector/doc/packagedoc.h
index 032a4e5e096678ec6d1a1c6b087723b85aa4a3ac..a99284b3fdd221f7a41686759edbb8493447fcf8
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/doc/mainpage.h
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage InDetRegionSelector Package
+@page InDetRegionSelector_page InDetRegionSelector Package
 
 @authors Grant Gorfine, Aline Gesualdi Mello, Seregy Sivoklokov, Mark Sutton
 
-@section InDetRegionSelectorIntro Introduction 
+@section InDetRegionSelector_InDetRegionSelectorIntro Introduction
 
 This package contains code to generate the tables of element extents
 used by the region selector. 
@@ -34,7 +34,7 @@ of the roi along the beamline. The default z range (DeltaZ in the old version)
 is now more properly a property of the calling algorithm. 
 
 
-@section InDetRegionSelectorClassOverview  Class Overview
+@section InDetRegionSelector_InDetRegionSelectorClassOverview Class Overview
 
 The package contains the two tools:
 
@@ -42,14 +42,13 @@ The package contains the two tools:
   - TRT_RegionSelectorTable:  For TRT.
 
 
-@section InDetRegionSelectorJobOptions  Job Options
+@section InDetRegionSelector_InDetRegionSelectorJobOptions Job Options
 
 
  - InDetRegionSelectorTable_jobOptions.py: Job option fragment for initializing all tools using genConf. 
    Makes use of DetFlags to control which tables will be created.
 
-@section InDetRegionSelectorReq Requirements
+@section InDetRegionSelector_InDetRegionSelectorReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/doc/mainpage.h b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 73%
rename from InnerDetector/InDetDetDescr/InDetServMatGeoModel/doc/mainpage.h
rename to InnerDetector/InDetDetDescr/InDetServMatGeoModel/doc/packagedoc.h
index cc1537db2a37a1a0ceec5a10e6b3a28e996c45e1..6e23f527c3c1a9057ffbd606342bd0d85da6ac87
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/doc/mainpage.h
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage  InDetServMatGeoModel Package
+@page InDetServMatGeoModel_page InDetServMatGeoModel Package
 
 @authors Davide Costanzo, Grant Gorfine
 
-@section InDetServMatGeoModelIntro Introduction
+@section InDetServMatGeoModel_InDetServMatGeoModelIntro Introduction
 
 
 This package contains the factories for building the GeoModel Detector
@@ -19,7 +19,7 @@ The creation of the geometry is initiated by the DetectorTool
 calls a top level factory (eg InDetServMatFactory) which starts the
 building process.
 
-@section InDetServMatGeoModelClassOverview Class Overview
+@section InDetServMatGeoModel_InDetServMatGeoModelClassOverview Class Overview
 
  - InDetServMatTool: Tool called by GeoModelSvc to start the building process.
  - InDetServMatManager: The manager allows access to the geometry (needed by Geo2G4 for example).
@@ -28,15 +28,14 @@ building process.
  - SCT_ServMatFactory: Build SCT services.
  - TRT_ServMatFactory: Build TRT services.
 
-@section InDetServMatGeoModelLayout Service Material layout.
+@section InDetServMatGeoModel_InDetServMatGeoModelLayout Service Material layout.
  
 The following diagram illustrates the location of the service materials.
 
 @image html inafpp.gif
 
-@section InDetServMatGeoModelReq Requirements
+@section InDetServMatGeoModel_InDetServMatGeoModelReq Requirements
 
-@include requirements
 
 */
 
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/doc/mainpage.h b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 82%
rename from InnerDetector/InDetDetDescr/InDetTrackingGeometry/doc/mainpage.h
rename to InnerDetector/InDetDetDescr/InDetTrackingGeometry/doc/packagedoc.h
index c84dfa7191537efa43e8bebc4d99952a79924387..0372a61e1d5e7bbacdcf26df625eb63c3eeb6530
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/doc/mainpage.h
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage InDetTrackingGeometry Package
+@page InDetTrackingGeometry_page InDetTrackingGeometry Package
 
 This Package contains the Layer and VolumeBuilder AlgTools that 
 inherit from the Trk::IVolumeBuilder and Trk::ILayerBuilder interface classes.
@@ -12,7 +12,7 @@ is created for navigation and material update in the Extrapolation realm.
 
 @author Andreas.Salzburger@cern.ch
 
-@section InDetTrackingGeometryDescr Description
+@section InDetTrackingGeometry_InDetTrackingGeometryDescr Description
 
 Following classes are currently implemented:
   - InDet::BeamPipeBuilder: build a cylindrical Layer representing the BeamPipe.
@@ -23,7 +23,7 @@ Following classes are currently implemented:
   
 The dedicated Trk::TrackingVolume and Trk::Layer classes can be found in the TrkGeometry package in the Tracking/TrkDetDescr realm.
 
-@section InDetTrackinGeometryDocu Material Comparison for DC2
+@section InDetTrackingGeometry_InDetTrackinGeometryDocu Material Comparison for DC2
 
 The following plots show the comparison between the material distribution gathered from Geant4 simulation and the Trk::TrackingGeometry 
 material description for DC2 Layout and default values. Fine-tuning of the values can be done by jobOptions acess.
@@ -43,8 +43,7 @@ material description for DC2 Layout and default values. Fine-tuning of the value
 </tr>
 </table>
   
-@section InDetTrackingGeometryReq Requirements
+@section InDetTrackingGeometry_InDetTrackingGeometryReq Requirements
 
-@include requirements
 
 */
\ No newline at end of file
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/doc/mainpage.h b/InnerDetector/InDetDetDescr/PixelGeoModel/doc/packagedoc.h
similarity index 87%
rename from InnerDetector/InDetDetDescr/PixelGeoModel/doc/mainpage.h
rename to InnerDetector/InDetDetDescr/PixelGeoModel/doc/packagedoc.h
index cfbfb4daf45e40832f049ec5b4ea4032be14e239..36c4b9bc6c9adead52f94c8d7346da72cf32bdb8 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/doc/mainpage.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage PixelGeoModel Package
+@page PixelGeoModel_page PixelGeoModel Package
 
 @authors Davide Costanzo. Contributions from Grant Gorfine.
 
-@section PixelGeoModelIntro Introduction
+@section PixelGeoModel_PixelGeoModelIntro Introduction
 
 This package contains the factories for building the GeoModel Detector
 Description of the Pixel detector. It builds both the material
@@ -28,7 +28,7 @@ See https://uimon.cern.ch/twiki/bin/view/Atlas/InDetGeometryVersions for current
 See the InDetDetDescrExample package for examples of how to load the geometry 
 and access detector elements.
 
-@section PixelGeoModelClassOverview Class Overview
+@section PixelGeoModel_PixelGeoModelClassOverview Class Overview
   
 The package contains several helper factories which build the different components of the Pixel.
 Some of the other classes are described here:
@@ -39,8 +39,7 @@ Some of the other classes are described here:
  - PixelGeometryManager: %Base class for interfaces to primary numbers. 
  - OraclePixGeoManager: Interface to primary numbers from the Detector Description Database.
 
-@section PixelGeoModelReq Requirements
+@section PixelGeoModel_PixelGeoModelReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/doc/mainpage.h b/InnerDetector/InDetDetDescr/SCT_Cabling/doc/packagedoc.h
similarity index 93%
rename from InnerDetector/InDetDetDescr/SCT_Cabling/doc/mainpage.h
rename to InnerDetector/InDetDetDescr/SCT_Cabling/doc/packagedoc.h
index b91ad839db55133ad0c3bacb71b77cb000a02dea..77dea34a5e6cde713ad17ad754d491cd964fe4e0 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/doc/mainpage.h
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage SCT_Cabling Package
+@page SCT_Cabling_page SCT_Cabling Package
 @author shaun.roe@cern.ch
 
 
-@section SCT_CablingIntro Introduction
+@section SCT_Cabling_SCT_CablingIntro Introduction
 
 This package is meant to provide the mapping between online and offline 
 identifiers for each detector element. By online identifier we mean the
@@ -18,7 +18,7 @@ between a ROB and the offline identifiers which are included in that ROB.
 The present clients are the BS converters and the Region Selector used in the 
 HLT. 
 
-@section SCT_CablingOverview Class Overview
+@section SCT_Cabling_SCT_CablingOverview Class Overview
   SCT_Cabling contains the following classes:
   
    - ISCT_CablingSvc: Pure Abstract Baseclass giving accessor methods for SCT_CablingSvc. This is
@@ -51,7 +51,7 @@ HLT.
  
 @image html structureDiag.png "SCT_Cabling class structure" width=8cm
    
-@section SCT_CablingSvcDetail SCT_CablingSvc in Detail
+@section SCT_Cabling_SCT_CablingSvcDetail SCT_CablingSvc in Detail
   SCT_CablingSvc is accessed by clients through its ISCT_CablingSvc interface. This provides access only to the 'getter' methods. In addition, it inherits from the IIncidentListener so that it can fill data (if appropriate) at the BeginRun incident. The 'setter' method is only accessible to users of the full class, in this case the fillers: SCT_FillCablingFromText and SCT_FillCablingFromCoraCool. These share a common baseclass and they are passed a pointer to the full SCT_CablingSvc to enable them to fill it. The decision as to which filler is to be instantiated is made by job options: the property 'DataSource' may be set to CORACOOL, in which case the database filler is used, or to a text filename, in which case the text filler is used.
   The filler classes may report whether they can fill during the initialize phase, or need to wait for 'BeginRun'. 
 
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/doc/mainpage.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from InnerDetector/InDetDetDescr/SCT_GeoModel/doc/mainpage.h
rename to InnerDetector/InDetDetDescr/SCT_GeoModel/doc/packagedoc.h
index 6e64769ccc404a31a34fc62fcd4a973fbd4d7e7b..c72234e553d21ea6d512f658ac1ddec6a4594574
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/doc/mainpage.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage SCT_GeoModel Package
+@page SCT_GeoModel_page SCT_GeoModel Package
 
 @authors Grant Gorfine
 
-@section SCT_GeoModelIntro Introduction
+@section SCT_GeoModel_SCT_GeoModelIntro Introduction
 
 This package contains the factories for building the GeoModel Detector
 Description of the SCT. It builds both the material geometry  using the
@@ -28,7 +28,7 @@ See https://uimon.cern.ch/twiki/bin/view/Atlas/InDetGeometryVersions for current
 See the InDetDetDescrExample package for examples of how to load the geometry 
 and access detector elements.
 
-@section SCT_GeoModelClassOverview Class Overview
+@section SCT_GeoModel_SCT_GeoModelClassOverview Class Overview
   
 The package contains several helper factories which build the different components of the SCT.
 Some of the other classes are described here:
@@ -45,8 +45,7 @@ Some of the other classes are described here:
  - SCT_Options: Class to contain various building options.
  - SCT_DefaultConditions: Class to store default conditions data.
 
-@section SCT_GeoModelReq Requirements
+@section SCT_GeoModel_SCT_GeoModelReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/doc/mainpage.h b/InnerDetector/InDetDetDescr/TRT_GeoModel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from InnerDetector/InDetDetDescr/TRT_GeoModel/doc/mainpage.h
rename to InnerDetector/InDetDetDescr/TRT_GeoModel/doc/packagedoc.h
index 6af8b6bf93d646f62e68bce90a79fdd1aed6332f..7077c606255bb8ca95c77b589b8206c9a34d0f17
--- a/InnerDetector/InDetDetDescr/TRT_GeoModel/doc/mainpage.h
+++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/doc/packagedoc.h
@@ -4,12 +4,12 @@
 
 /**
 
-@mainpage TRT_GeoModel Package
+@page TRT_GeoModel_page TRT_GeoModel Package
 
 @authors Thomas Kittlemann, Joe Boudreau.
 
 
-@section TRT_GeoModelIntro Introduction
+@section TRT_GeoModel_TRT_GeoModelIntro Introduction
 
 This package contains the factories for building the GeoModel Detector
 Description of the TRT detector. It builds both the material
@@ -29,7 +29,7 @@ See https://uimon.cern.ch/twiki/bin/view/Atlas/InDetGeometryVersions for current
 See the InDetDetDescrExample package for examples of how to load the geometry 
 and access detector elements.
 
-@section TRT_GeoModelClassOverview Class Overview
+@section TRT_GeoModel_TRT_GeoModelClassOverview Class Overview
   
 The package contains the following main classes:
 
@@ -39,9 +39,8 @@ The package contains the following main classes:
  - TRTParameterInterface: %Base class for Interface to primary numbers.
  - TRT_DetDescrDB_ParameterInterface: Interface to primary numbers from the Detector Description Database.
 
-@section TRT_GeoModelReq Requirements
+@section TRT_GeoModel_TRT_GeoModelReq Requirements
 
-@include requirements
 
 
 */
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/doc/mainpage.h b/InnerDetector/InDetDigitization/BCM_Digitization/doc/packagedoc.h
similarity index 88%
rename from InnerDetector/InDetDigitization/BCM_Digitization/doc/mainpage.h
rename to InnerDetector/InDetDigitization/BCM_Digitization/doc/packagedoc.h
index 4a3fbea4c375d37eb06d251d16a100640b362dc0..e953ea0a66ca09cc8e0cd864ae9d43835a77b979 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/doc/mainpage.h
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage BCM_Digitization Package
+@page BCM_Digitization_page BCM_Digitization Package
 @author Dominique.Tardif@cern.ch
 
-@section BCMDigitizationOverview Overview
+@section BCM_Digitization_BCMDigitizationOverview Overview
 
 This package is used to simulate the electronics response of the 8 ATLAS Beam Conditions Monitor (BCM) modules. The GEANT4 BCM hit collection(s) is/are first retrieved from the simulation store. For each hit in the collection, a pulse whose height is linearly correlated with the energy deposit is added to the corresponding channel waveform, which has been pre-filled with Gaussian noise. This is then split into two parts, which correspond to high- and low-gain channels. A time-over-threshold is used to digitize the analog pulses, and the positions and widths of the first two digital pulses in each channel are recorded in a raw data object. The 16 RDOs are packed into a container which is then saved to the output store.
 
@@ -18,11 +18,9 @@ This package is used to simulate the electronics response of the 8 ATLAS Beam Co
 
 /**
 @page used_BCM_Digitization Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_BCM_Digitization Requirements
-@include requirements
 */
 
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/doc/mainpage.h b/InnerDetector/InDetDigitization/PixelDigitization/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from InnerDetector/InDetDigitization/PixelDigitization/doc/mainpage.h
rename to InnerDetector/InDetDigitization/PixelDigitization/doc/packagedoc.h
index 4c603ca87b83bff69107c692d9a3823a74a72bd0..79b9dc0776830ff6df16b36599e2401b54a2ae65
--- a/InnerDetector/InDetDigitization/PixelDigitization/doc/mainpage.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage PixelDigitization
+@page PixelDigitization_page PixelDigitization
 @author fredrik.tegenfeldt@cern.ch
 
-@section PixelDigitizationIntro Introduction
+@section PixelDigitization_PixelDigitizationIntro Introduction
 
 The package PixelDigitization provides the simulation of the pixel
 detector response. It reads the pixel detector hits generated by
@@ -16,7 +16,7 @@ result is output as so called RDO objects. These are then read by e.g
 the clustering and tracking algorithm further upstream of the
 processing.
 
-@section PixelDigitizationClasses Classes
+@section PixelDigitization_PixelDigitizationClasses Classes
 
 The package consists of three groups of classes:
 -# main class PixelDigitization : the user interface, reads the input hits and generates the output RDOs
@@ -119,7 +119,7 @@ diodes.
   </tr>
 </table>
 
-@section PixelDigitizationFromTOTtoRDO From TOT to RDO
+@section PixelDigitization_PixelDigitizationFromTOTtoRDO From TOT to RDO
 The order of the following subsections follow the actual order they are executed.
 
 @subsection PixelDigitizationSurfaceCharge 1. Surface charge
@@ -232,7 +232,7 @@ fixed ToT and time. Its name is derived by adding the postfix "_SPM"
 to the RDO collection name. Both RDO collections can be viewed using
 for example the PixelMonitoring package.
 
-@section PixelDigitizationExtras Extra Pages
+@section PixelDigitization_PixelDigitizationExtras Extra Pages
 
  - @ref PixelDigitizationUsedPackages
  - @ref PixelDigitizationRequirements
@@ -240,11 +240,9 @@ for example the PixelMonitoring package.
 
 /**
 @page PixelDigitizationUsedPackages Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page PixelDigitizationRequirements Requirements
-@include requirements
 */
 
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/doc/mainpage.h b/InnerDetector/InDetDigitization/SCT_Digitization/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from InnerDetector/InDetDigitization/SCT_Digitization/doc/mainpage.h
rename to InnerDetector/InDetDigitization/SCT_Digitization/doc/packagedoc.h
index 7da28ecaaecded49fcceb6baed2062bebd3919a2..181dfc005ec0411313136788e4090940348156a5
--- a/InnerDetector/InDetDigitization/SCT_Digitization/doc/mainpage.h
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage SCT_Digitization package
+@page SCT_Digitization_page SCT_Digitization package
 @author Szymon.Gadomski@cern.ch,
         Awatif.Belymam@cern.ch,
         Davide.Costanzo@cern.ch,
@@ -15,7 +15,7 @@
         and others
 
 
-@section SCT_DigitizationIntro Introduction
+@section SCT_Digitization_SCT_DigitizationIntro Introduction
 The SCT_Digitization package processes the GEANT4 hits in each SCT sensitive detector element (wafer),
 simulates the detector response, and generates the SCT RDO's.
 The model used is documented in the note ATL-SOFT-2001-005 by Szymon Gadomski.
@@ -29,14 +29,14 @@ and an RDO created and stored for each strip above threshold.
 Detector noise is included in the model, and pure noise hits are also generated.
 Crosstalk between neighbouring channels is also taken into account.
 
-@section SCT_DigitizationOverview Class overview
+@section SCT_Digitization_SCT_DigitizationOverview Class overview
 The SCT_Digitization package contains the following classes:
  - SCT_Amp: Models an SCT amplifier and shaper, giving CRRC response to a list of charges with times.
  - SCT_Digitization: Athena algorithm inheriting from SiDigitization.
  - SCT_FrontEnd: Models response of ABCD chip amplifiers.
  - SCT_SurfaceChargesGenerator: Drifts charge from hits to SCT wafer surface.
 
-@section SCT_DigitizationRefs Reference pages
+@section SCT_Digitization_SCT_DigitizationRefs Reference pages
  - @ref used_SCT_Digitization
  - @ref requirements_SCT_Digitization
  - @ref notes_SCT_Digitization
@@ -44,12 +44,10 @@ The SCT_Digitization package contains the following classes:
 
 /**
 @page used_SCT_Digitization Used packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_SCT_Digitization Requirements
-@include requirements
 */
 
 /**
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/doc/mainpage.h b/InnerDetector/InDetDigitization/TRT_Digitization/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from InnerDetector/InDetDigitization/TRT_Digitization/doc/mainpage.h
rename to InnerDetector/InDetDigitization/TRT_Digitization/doc/packagedoc.h
index 6464a1b20ba2e3fa32d5261aafd872202c4a716c..6408b721a643f8b60147b25dbb8396dde51769e1
--- a/InnerDetector/InDetDigitization/TRT_Digitization/doc/mainpage.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage TRT_Digitization Package
+@page TRT_Digitization_page TRT_Digitization Package
 
 Digitization of the TRT simulation.
 
 @author Thomas Kittelmann (doxygen comments: Mogens Dam)
 
-@section IntroductionTRT_Digitization Introduction
+@section TRT_Digitization_IntroductionTRT_Digitization Introduction
 
 The purpose of the TRT_Digitization package is to turn @e hits from the Geant4
 simulation into @e digits, which is a reflection of the event format
@@ -58,7 +58,7 @@ The TRT digitization is divided into several steps:
 In addition, the package handles detector noise, which is modelled
 after the detector performance in the 2004 combined test beam.
 
-@section OverviewTRTDigitization Class Overview
+@section TRT_Digitization_OverviewTRTDigitization Class Overview
   The TRTDigitization package contains of following classes:
 
   - TRTDigitization: main class for the TRT digitization.
@@ -90,10 +90,8 @@ after the detector performance in the 2004 combined test beam.
 
 /**
 @page used_Package Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TRT_Digitization Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/doc/mainpage.h b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/doc/packagedoc.h
similarity index 79%
rename from InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/doc/mainpage.h
rename to InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/doc/packagedoc.h
index 19779817d1bb1579ca1ce3fcfc98b4fffb2e660b..670d3825d733b7d8739020beb304267d22ad94d2 100644
--- a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/doc/mainpage.h
+++ b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage InDetBCM_EventAthenaPool Package
+@page InDetBCM_EventAthenaPool_page InDetBCM_EventAthenaPool Package
 @author Dominique.Tardif@cern.ch
 
-@section InDetBCMEventAthenaPoolOverview Overview
+@section InDetBCM_EventAthenaPool_InDetBCMEventAthenaPoolOverview Overview
 
 This package contains the persistent representations of the Beam Conditions Monitor (BCM) raw data objects (RDOs), as well as converters between these persistent forms and their transient analogues, which are found in the package InDetBCM_RawData.
 
@@ -18,11 +18,9 @@ This package contains the persistent representations of the Beam Conditions Moni
 
 /**
 @page used_InDetBCM_EventAthenaPool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_InDetBCM_EventAthenaPool Requirements
-@include requirements
 */
 
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/doc/mainpage.h b/InnerDetector/InDetEventCnv/InDetEventCnvTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from InnerDetector/InDetEventCnv/InDetEventCnvTools/doc/mainpage.h
rename to InnerDetector/InDetEventCnv/InDetEventCnvTools/doc/packagedoc.h
index 5045486393ea1564133ca9e14caeae633bb65753..dfc3e7c68d3ca7544d4a0ec3b2e08c093d2a81ec
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/doc/mainpage.h
+++ b/InnerDetector/InDetEventCnv/InDetEventCnvTools/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage InDetEventCnvTool
+@page InDetEventCnvTools_page InDetEventCnvTool
 
-@section InDetEventCnvTool_intro Introduction
+@section InDetEventCnvTools_InDetEventCnvTool_intro Introduction
 
 The InDetEventCnvTool package provides the InDetEventCnvTool AlgTool, which is used by TrkTrackCollectionCnv as it recreates persistified tracks.
 
@@ -16,7 +16,7 @@ Specifically, it's job is to return pointers to the TrkDetElementBase and PrepRa
 
 See the code documentation for more details.
 
-@section InDetEventCnvTool_prop Properties
+@section InDetEventCnvTools_InDetEventCnvTool_prop Properties
 The properties declared to jobOptions are (defaults in brackets):
    - "PixelMgrLocation" : the location of the pixel ID manager ("Pixel")
    - SCT_MgrLocation" : the location of the SCT ID manager ("SCT")
@@ -36,6 +36,5 @@ ToolSvc = Service( "ToolSvc" )
 InDetEventCnvTool=Algorithm( "ToolSvc.InDet::InDetEventCnvTool" )
 InDetEventCnvTool.RecreatePRDLinks=TRUE
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/doc/mainpage.h b/InnerDetector/InDetEventCnv/InDetJiveXML/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from InnerDetector/InDetEventCnv/InDetJiveXML/doc/mainpage.h
rename to InnerDetector/InDetEventCnv/InDetJiveXML/doc/packagedoc.h
index 8edd53e39e80e4a79ad93a9b598758118f12c38e..9dfbde70bfd305a10c3d99f51f0892fd9d9b7c45
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/doc/mainpage.h
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/doc/packagedoc.h
@@ -4,15 +4,15 @@
 
 /**
 
-@mainpage InDetJiveXML
+@page InDetJiveXML_page InDetJiveXML
 @author Nikos.Konstantinidis -at- cern.ch, Eric.Jansen -at- cern.ch, Juergen.Thomas -at- cern.ch, Sebastian.Boeser -at- cern.ch
 
-@section InDetJiveXMLIntro Introduction
+@section InDetJiveXML_InDetJiveXMLIntro Introduction
 
 This package contains the @c AthAlgTools that retrieve inner detector data (Pixel- , SCT- and TRT-hits, clusters, etc. ) from @c StoreGate and 
 forward them to the formatting tool. Each tool implements the IDataRetriever interface, through which it is called from the @c AlgoJiveXML.
 
-@section InDetJiveXMLTools Retrievers
+@section InDetJiveXML_InDetJiveXMLTools Retrievers
 
 - JiveXML::SiSpacePointRetriever @copydoc JiveXML::SiSpacePointRetriever
 
@@ -24,7 +24,7 @@ forward them to the formatting tool. Each tool implements the IDataRetriever int
 
 - JiveXML::SCTRDORetriever @copydoc JiveXML::SCTRDORetriever
 
-@section InDetJiveXMLEnv Environment
+@section InDetJiveXML_InDetJiveXMLEnv Environment
  - @ref used_InDetJiveXML
  - @ref requirements_InDetJiveXML
 
@@ -32,10 +32,8 @@ forward them to the formatting tool. Each tool implements the IDataRetriever int
 
 /**
 @page used_InDetJiveXML Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_InDetJiveXML Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/doc/mainpage.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/doc/mainpage.h
rename to InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/doc/packagedoc.h
index 3c846dabef651c4ab5b29bd324b677a984de1f29..17f88d095ed1c5528209b63e5b7742513c000cb0
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/doc/mainpage.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage SCT_RawDataByteStreamCnv Package
+@page SCT_RawDataByteStreamCnv_page SCT_RawDataByteStreamCnv Package
 @author:
 
 - SCT: Kondo.Gnanvo@cern.ch, Maria.Jose.Costa@cern.ch nbarlow@mail.cern.ch
 
-@section SCT_RawDataByteStreamCnvIntro Introduction
+@section SCT_RawDataByteStreamCnv_SCT_RawDataByteStreamCnvIntro Introduction
 
 This package is meant to provide the SCT ByteStream converter 
 tools for a full Atlas run, cosmics and combined test beam (CTB) data. 
@@ -22,7 +22,7 @@ All these tools have to decode (or encode) the data and deal with the cabling
 map. For this purpose they use the cabling tool implemented in the 
 InDetCabling package.
 
-@section SCT_RawDataByteStreamCnvOverview Tools Overview
+@section SCT_RawDataByteStreamCnv_SCT_RawDataByteStreamCnvOverview Tools Overview
   The SCT_RawDataByteStreamCnv package contains the following classes:
     -  <b>SCT:</b> 
      - SCTRawContByteStreamCnv
@@ -67,10 +67,8 @@ InDetCabling package.
 
 /**
 @page used_SCT_RawDataByteStreamCnv Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_SCT_RawDataByteStreamCnv Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/doc/mainpage.h b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/doc/packagedoc.h
similarity index 84%
rename from InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/doc/mainpage.h
rename to InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/doc/packagedoc.h
index b4ceb74823e16c6fcc59202bc7b10cf12ae62e7f..4afe00bb4a45f34ebe74d83728b69a3febc35b4d 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/doc/mainpage.h
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage TRT_RawDataByteStreamCnv Package
+@page TRT_RawDataByteStreamCnv_page TRT_RawDataByteStreamCnv Package
 @author   Paul.Keener@cern.ch, Markus.Elsing@cern.ch
 
-@section TRT_RawDataByteStreamCnvInfro Introduction
+@section TRT_RawDataByteStreamCnv_TRT_RawDataByteStreamCnvInfro Introduction
 
 This package contains the classes to read TRT real data or MC byte stream information and to write MC byte stream. It is using the new IDC. The decoding classes are used by the TriOnlineSpacePointProvider and the InDetTrigRawDataByteStreamCnv for the LVL2 and Event Filter BS decoding.
 
-@section TRT_RawDataByteStreamCnvRea Reading Byte Stream
+@section TRT_RawDataByteStreamCnv_TRT_RawDataByteStreamCnvRea Reading Byte Stream
 
  - TRTRawDataProvider: The main algorithm to decode the BS event for the TRT. It uses the TRTRawDataProviderTool to decode the fragments.
 
@@ -19,7 +19,7 @@ This package contains the classes to read TRT real data or MC byte stream inform
 
  - TRT_RodDecoder: the tool to decode a ROB fragment and to fill the collections into the IDC. It decodes the full fragement, creates the RDOs and pushes them into the collections in IDC. If a collection is not yet in the IDC, it is created on the fly. Note that the calling class has to make sure that the IDC is not filled already with the data. There is an optional argument in a vector<IdHash>*, which if given does restrict the decoding to the collections which have a hash listed in this vector.
 
-@section TRT_RawDataByteStreamCnvWri Writing Byte Stream
+@section TRT_RawDataByteStreamCnv_TRT_RawDataByteStreamCnvWri Writing Byte Stream
 
 The writing of the Byte Stream makes use of the old Byte Stream converter infrastructure using StoreGate converters. It is using 3 classes:
 
@@ -29,8 +29,7 @@ The writing of the Byte Stream makes use of the old Byte Stream converter infras
 
  - TRT_RodEncoder: the tool that encodes the RDOs of one ROD block.
 
-@section TRT_RawDataByteStreamCnvReq Requirements file
+@section TRT_RawDataByteStreamCnv_TRT_RawDataByteStreamCnvReq Requirements file
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetExample/InDetAlignExample/doc/mainpage.h b/InnerDetector/InDetExample/InDetAlignExample/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from InnerDetector/InDetExample/InDetAlignExample/doc/mainpage.h
rename to InnerDetector/InDetExample/InDetAlignExample/doc/packagedoc.h
index d0d06460c7ed4f922bee4bc931d8dccfb67cad3f..a0c85cd0242072edad73971ae0d32800b9d45f36
--- a/InnerDetector/InDetExample/InDetAlignExample/doc/mainpage.h
+++ b/InnerDetector/InDetExample/InDetAlignExample/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage InDetAlignExample Package
+@page InDetAlignExample_page InDetAlignExample Package
 
 @author Grant Gorfine
 @author Vicente Lacuesta <vicente.lacuesta@ific.uv.es>
@@ -12,7 +12,7 @@
 @author Salva Marti <martis@ific.uv.es>
 
 
-@section RunInDetAlignExample How to run InDetAlignExample
+@section InDetAlignExample_RunInDetAlignExample How to run InDetAlignExample
 @subsection Rel13040 Release 13.0.40
  - Checkout the package:
  \code cmt co -r InDetAlignExample-00-00-18 InnerDetector/InDetExample/InDetAlignExample
@@ -25,7 +25,7 @@ gmake
 \endcode
  - If you want, copy the jobOptions.py to the directory run and modify it
 
-@section InDetAlignExampleIntro Introduction
+@section InDetAlignExample_InDetAlignExampleIntro Introduction
 
 The package is the common repository for InDet Alignment jobs. 
 The bulk data processing scripts with proper algorithm flag settings are placed here.   
@@ -35,7 +35,7 @@ constants, testing the alignments and examples of running simulation with
 misalignments.
 
 
-@section InDetAlignExampleJobOptions Job Options
+@section InDetAlignExample_InDetAlignExampleJobOptions Job Options
 
  - WriteDBS.py : Job option fragment for generating random alignment
    constants and putting them in COOL. It is configured to use an
@@ -82,7 +82,7 @@ misalignments.
    detecting overlaps. Takes a long time to run (about two hours).
 
 
-@section InDetAlignExampleUsageNotes Usage Notes
+@section InDetAlignExample_InDetAlignExampleUsageNotes Usage Notes
 
 The job options for writing alignment constants are configured for using an sqlite file.
 
@@ -102,8 +102,7 @@ See ReadDBS.py and WriteDBS.py.
 
 The standalone job options should run out of the box.
 
-@section InDetAlignExampleReq Requirements
+@section InDetAlignExample_InDetAlignExampleReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/doc/mainpage.h b/InnerDetector/InDetExample/InDetDetDescrExample/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 82%
rename from InnerDetector/InDetExample/InDetDetDescrExample/doc/mainpage.h
rename to InnerDetector/InDetExample/InDetDetDescrExample/doc/packagedoc.h
index 69930aead214a8182dd7da3383895d70b1f6eb11..8f8021793487104a617f157d885ea483e84f3b7a
--- a/InnerDetector/InDetExample/InDetDetDescrExample/doc/mainpage.h
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage InDetDetDescrExample Package
+@page InDetDetDescrExample_page InDetDetDescrExample Package
 
 @author Grant Gorfine
 
-@section InDetDDExampleIntro Introduction
+@section InDetDetDescrExample_InDetDDExampleIntro Introduction
 
 This package contains 
 example and test packages for Inner Detector Detector Description.
 
-@section InDetDDExampleContents Contents
+@section InDetDetDescrExample_InDetDDExampleContents Contents
 
 
  - ReadSiDetectorElements: Loops over all silicon elements and exercises
diff --git a/InnerDetector/InDetExample/InDetRecExample/doc/mainpage.h b/InnerDetector/InDetExample/InDetRecExample/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from InnerDetector/InDetExample/InDetRecExample/doc/mainpage.h
rename to InnerDetector/InDetExample/InDetRecExample/doc/packagedoc.h
index 4139a70b4b243322d4a141d14ab7b692e64ca096..9a1e9b5726f6e9977c97e7a605272db40db00bc0
--- a/InnerDetector/InDetExample/InDetRecExample/doc/mainpage.h
+++ b/InnerDetector/InDetExample/InDetRecExample/doc/packagedoc.h
@@ -4,26 +4,26 @@
 
 /**
 
-@mainpage InDetRecExample Package
+@page InDetRecExample_page InDetRecExample Package
 @author Edward.Moyse@cern.ch, Markus.Elsing@cern.ch
-@section InDetRecExampleIntro Introduction
+@section InDetRecExample_InDetRecExampleIntro Introduction
 
 InDetRecExample is the runtime package for running Inner Detector reconstruction and also contains the InnerDetector jobOption fragments that are included in the overall RecExample package. Running the InDetRecExample will only use Inner Detector software and hence is better suited for development of tracking code (being faster and using less memory).
 
-@section InDetRecExampleSetup Setup
+@section InDetRecExample_InDetRecExampleSetup Setup
 To set it please do :
 
    - cd cmt
    - make
    - cd ../run
 
-@section InDetRecExampleRunning Running
+@section InDetRecExample_InDetRecExampleRunning Running
 And then to run the Example:             
 
    - cd ../run
    - athena ../share/jobOptions.py
 
-@section InDetRecExamplejo JobOptions
+@section InDetRecExample_InDetRecExamplejo JobOptions
 
 The main jobOption files are:
    - jobOptions.py ... run ID reconstruction from clusterization to particle creation and produce ESD and AOD
@@ -42,7 +42,7 @@ joboptions which is used by RecExCommon
 
 The setup of the reconstruction itself is split into several InDetRec*.py files.
 
-@section InDetRecExampleJobProperties
+@section InDetRecExample_InDetRecExampleJobProperties 
 Since release 14 InDetRecExample has entirely migrated to JobProperties (ConfiguredInDetCutValues.py is a small exception where it is questionable if 
 it should be jobproperties). There two kind of jobproperties, both are in the python subdirectory:
    - InDetJobProperties.py ... holds the steering flags for ID reconstruction
@@ -62,11 +62,10 @@ The following control what is written out. ESD includes AOD, so it's normally en
    - doWriteESD (default is TRUE)
    - doWriteAOD (default is TRUE)
 
-@section Event Data Model Monitor
+@section InDetRecExample_Event Data Model Monitor
 In debug the EventDataModelMonitor will run and do instance counting of EDM objects to help flagging memory leaks.
 
-@section  InDetRecExampleReq  Requirements file
+@section InDetRecExample_InDetRecExampleReq Requirements file
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/doc/mainpage.h b/InnerDetector/InDetExample/InDetTrigRecExample/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from InnerDetector/InDetExample/InDetTrigRecExample/doc/mainpage.h
rename to InnerDetector/InDetExample/InDetTrigRecExample/doc/packagedoc.h
index 1e45723d163ce6023668f1d83d245cb58a786cac..cf76d0237fb1efd738250361c8b29fd11132f8b5
--- a/InnerDetector/InDetExample/InDetTrigRecExample/doc/mainpage.h
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage InDetTrigRecExample Package
+@page InDetTrigRecExample_page InDetTrigRecExample Package
 @author Patricia.Conde@cern.ch, Iwona.Grabowska@cern.ch
 @author Jiri.Masik@cern.ch
-@section InDetTrigRecExampleIntro Introduction
+@section InDetTrigRecExample_InDetTrigRecExampleIntro Introduction
 
 InDetTrigRecExample is the main configuration package for running EFID
 (Inner Detector reconstruction at the Event Filter level). It contains
@@ -19,7 +19,7 @@ various trigger slices
        This sets up the various algorithms used in InDet reconstruction. 
 
 
-@section  InDetTrigRecExampleConf  Configuration of the EFID
+@section InDetTrigRecExample_InDetTrigRecExampleConf Configuration of the EFID
 
 <ul>
 
@@ -96,7 +96,7 @@ InDetTrigConfigRecBackTracking.py - are algorithms specific to backtracking or T
 </ul>
 
 
-@section InDetTrigRecExamplejo End user job options
+@section InDetTrigRecExample_InDetTrigRecExamplejo End user job options
 
 The package contains jobOptions which can be run by users for testing purposes
 
@@ -112,7 +112,7 @@ the dataset used. The jobOptions can be steered by general RecExCommon flags.
 
 
 
-@section  InDetTrigRecExampleRTT  RTT tests
+@section InDetTrigRecExample_InDetTrigRecExampleRTT RTT tests
 
 The global RTT configuration is found in test/InDetTrigRecExample_TestConfiguration.xml. The current configuration runs 
 <ul>
@@ -138,7 +138,7 @@ qy     (expert-monitoring.root) and CBNTAA ntuple (ntuple.root) are stored.
    
 
 
-@section  InDetTrigRecExampleLeaks  Memory-leak test
+@section InDetTrigRecExample_InDetTrigRecExampleLeaks Memory-leak test
 
 There are two jobOptions files to run a memory-leak test. They are put in /TESTS:
 
@@ -147,9 +147,8 @@ There are two jobOptions files to run a memory-leak test. They are put in /TESTS
 
 A recipe how to run the memory-leak test is given in the README file in /TESTS.
 
-@section  InDetTrigRecExampleReq  Requirements file
+@section InDetTrigRecExample_InDetTrigRecExampleReq Requirements file
 
-@include requirements
 
 */
 
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/doc/mainpage.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/doc/packagedoc.h
similarity index 76%
rename from InnerDetector/InDetMonitoring/InDetGlobalMonitoring/doc/mainpage.h
rename to InnerDetector/InDetMonitoring/InDetGlobalMonitoring/doc/packagedoc.h
index 74378b1b0c2aab4e42ee48fa851294b90484b66d..dbd2951b950bbbc63de6dce9e57345d46a4b5ffb 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/doc/mainpage.h
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
- *@mainpage InDetGlobalMonitoring
+@page InDetGlobalMonitoring_page InDetGlobalMonitoring
  *
  *@author @n
  * Anne-Catherine Le Bihan <Anne-Catherine.Le.Bihan@cern.ch>@n
@@ -12,7 +12,7 @@
  * Thomas Burgess <Thomas.Burgess@cern.ch>@n
  * Alex Kastanas <alex.kastanas@cern.ch>
  *
- *@section Introduction
+@section InDetGlobalMonitoring_Introduction 
  *
  * This is the Inner Detector Global Monitoring Tools package.
  *
@@ -29,9 +29,8 @@
  * - SCT
  * - TRT
  *
- *@section requirements Requirements file
- *@include requirements
+@section InDetGlobalMonitoring_requirements Requirements file
  *
- *@section ChangeLog Change log
+@section InDetGlobalMonitoring_ChangeLog Change log
  *@include ChangeLog
  */
diff --git a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/doc/mainpage.h b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 100%
rename from InnerDetector/InDetMonitoring/InDetVertexMonitoring/doc/mainpage.h
rename to InnerDetector/InDetMonitoring/InDetVertexMonitoring/doc/packagedoc.h
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/doc/mainpage.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from InnerDetector/InDetMonitoring/SCT_Monitoring/doc/mainpage.h
rename to InnerDetector/InDetMonitoring/SCT_Monitoring/doc/packagedoc.h
index 7187a7ff5d0df28b7106e0c136fa4371f640195d..2e8de9299b2b0e4843b4b147dc8a37b227eca839
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/doc/mainpage.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage SCT_MonitoringPackage
+@page SCT_Monitoring_page SCT_MonitoringPackage
 @author Martin White, Helen Hayward, Shaun Roe
 
  
-@section SCT_MonitoringIntro Introduction
+@section SCT_Monitoring_SCT_MonitoringIntro Introduction
 This package does data monitoring at the event filter level, providing a tool which can give occupancies and efficiencies for the SCT detector.
 The histograms are published and may be used in the Online Histogram Presenter (OHP).
  
-@section SCT_MonitoringOverview Class Overview
+@section SCT_Monitoring_SCT_MonitoringOverview Class Overview
 All of the classes used directly for monitoring inherit directly from the ManagedMonitorToolBase to enable histogram registration and use in the Online Presenter.
 Some of the classes in this package are only intended to be compiled when integrating into the online environment, look out for the 'ifdef ONLINE' preprocessor directive.
 
@@ -55,7 +55,6 @@ These should definitely be deprecated and removed as soon as possible:
    - ParsedSCT_RDO
    - SCTHistoTest
    
-@section SCT_MonitoringReq Requirements
+@section SCT_Monitoring_SCT_MonitoringReq Requirements
  
-@include requirements
  */
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/doc/mainpage.h b/InnerDetector/InDetRawEvent/InDetRawData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from InnerDetector/InDetRawEvent/InDetRawData/doc/mainpage.h
rename to InnerDetector/InDetRawEvent/InDetRawData/doc/packagedoc.h
index 6d3417abed4499806bb9354bcb8eff0d5c6d46dc..6cf6902c2777315a5e1de5d25be5c9477e76e14e
--- a/InnerDetector/InDetRawEvent/InDetRawData/doc/mainpage.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage InDetRawData Package
+@page InDetRawData_page InDetRawData Package
 @author David Candlin, Veronique Boisvert, Maria.Jose.Costa@cern.ch
 
-@section InDetRawDataIntro Introduction
+@section InDetRawData_InDetRawDataIntro Introduction
 
 This package is meant to contain the classes defining the Inner Detector
 RawDataObjects, their collections and containers. There are different
 classes for DC1/DC2 and combined test beam RawDataObjects (all of them
 deriving from the same base class).
 
-@section InDetRawDataOverview Class Overview
+@section InDetRawData_InDetRawDataOverview Class Overview
   The InDetRawData package contains the following classes:
 
    - InDetRawData: base class of the Inner Detector RDO
@@ -42,7 +42,6 @@ deriving from the same base class).
 
    - TRT_TB04_RawData: Class to implement test beam 2004 RawData for TRT
    
-@section InDetRawDataReq Requirements
+@section InDetRawData_InDetRawDataReq Requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetRawEvent/InDetSimData/doc/mainpage.h b/InnerDetector/InDetRawEvent/InDetSimData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from InnerDetector/InDetRawEvent/InDetSimData/doc/mainpage.h
rename to InnerDetector/InDetRawEvent/InDetSimData/doc/packagedoc.h
index cbd666b9c98f511279623a8e600d53f2494e7d28..4e10e4fbee8a83661c80157039b614c64f894d4f
--- a/InnerDetector/InDetRawEvent/InDetSimData/doc/mainpage.h
+++ b/InnerDetector/InDetRawEvent/InDetSimData/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage Package InDetSimData
+@page InDetSimData_page Package InDetSimData
 @author Davide.Costanzo@cern.ch
 
-@section InDetSimData Introduction
+@section InDetSimData_InDetSimData Introduction
 
 This package contains the EDM classes that are used to store the MC truth information 
 together with the RDOs. Association between these classes and the RDO classes should be 
@@ -18,7 +18,7 @@ classes may result in a big loss (like all of DC2)
 
 
 
-@section  Simulation data object associated with an InDetRawData object
+@section InDetSimData_Simulation data object associated with an InDetRawData object
 
  An object of this class stores the simulation information associated with 
  a RawData object, in two data members. 
@@ -37,7 +37,7 @@ classes may result in a big loss (like all of DC2)
  because objects of this class will be persistent, but will not be accessed
  in real production running. 
  
-@section SimDataHelpers
+@section InDetSimData_SimDataHelpers 
 
   helers are provided to decode the information that is normally stored in a single word
 in the Simulation Data Objects
diff --git a/InnerDetector/InDetRecAlgs/InDetConversionFinder/doc/mainpage.h b/InnerDetector/InDetRecAlgs/InDetConversionFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 75%
rename from InnerDetector/InDetRecAlgs/InDetConversionFinder/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/InDetConversionFinder/doc/packagedoc.h
index 3ae52e37b36cd8c9563b4e856834c052c3e20047..d605e8c539d321a6f276e06ae94b4938fc687a2d
--- a/InnerDetector/InDetRecAlgs/InDetConversionFinder/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/InDetConversionFinder/doc/packagedoc.h
@@ -3,20 +3,20 @@
 */
 
 /**
-\mainpage InDetConversionFinder
+@page InDetConversionFinder_page InDetConversionFinder
 
-\section introduction Introduction:
+@section InDetConversionFinder_introduction Introduction:
 InDetConversionFinder is a package which contains algorithm to reconstruct conversions. The only job now is to call a vertex finder tool - InDetConversionFinderTool. (see InnerDetector/InDetRecTools/InDetConversionFinderTools)
 All units are in mm and MeV.
 
-\section howitworks How it works:
+@section InDetConversionFinder_howitworks How it works:
 The algorithm InDetConversion.cxx is a prototype usecase of the InDetConversionFinderTools package. This tool reconstructs conversions in the InnerDetector. The performance of the conversion reconstruction depends stronlgy on the BackTracking performace and the choosen cuts.
 
-\section packagecontent Package Contents:
+@section InDetConversionFinder_packagecontent Package Contents:
 InDetConversionFinder contains the following files/classes:
 -ConversionFinder.cxx
 
-\section jobOptions The jobOptions file:
+@section InDetConversionFinder_jobOptions The jobOptions file:
 Remark: the algorithm is configured via automatic generated python scripts (genConf) <br>
 All values shown are <b>default</b> values, i.e. if nothing is specified in the jobOptions
 the algorithm will use this default value.
@@ -28,11 +28,9 @@ the algorithm will use this default value.
 <li>Specify the name of IVertexFinder:<br>
     <b>''VertexFinderTool' : PublicToolHandle('InDet::InDetConversionFinderTools') </b></li>
 </ul>
-\section used_packagesInDetConversionFinder used packages
-@htmlinclude used_packages.html
+@section InDetConversionFinder_used_packagesInDetConversionFinder used packages
 
-\section requirements Requirements
-@include requirements
+@section InDetConversionFinder_requirements Requirements
 
 \namespace Vtx
 A namespace for all vertexing packages and related stuff.
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/doc/mainpage.h b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from InnerDetector/InDetRecAlgs/InDetExtensionProcessor/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/InDetExtensionProcessor/doc/packagedoc.h
index b094f2a13973630a4490ed2a30b27dc089a6ca8d..ed01844699fcb9749fb061deeaaf1571cadbf3c8
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The InDetExtensionProcessor package
+@page InDetExtensionProcessor_page The InDetExtensionProcessor package
 
 The InDetExtensionProcessor package provides algorithms which
 form part of the Inner Detector track reconstruction sequence [1].
@@ -23,10 +23,10 @@ Trk::TrackExtensionMap and with any type of track fitter.
 
 @author Markus Elsing
 
-@section BiblioInDetExtensionProcessor References
+@section InDetExtensionProcessor_BiblioInDetExtensionProcessor References
 [1] T. Cornelissen et al., <i>Concepts, Design and Implementation of the ATLAS New Tracking</i>, ATLAS int.comm com-soft-2007_002<br>
 
-@section JoboptionsInDetExtensionProcessor Job options for InDet::InDetExtensionProcessor
+@section InDetExtensionProcessor_JoboptionsInDetExtensionProcessor Job options for InDet::InDetExtensionProcessor
 <DL>
   <DT>TrackName
   <DD>Name of the input Trackcollection in StoreGate.
@@ -69,7 +69,7 @@ Trk::TrackExtensionMap and with any type of track fitter.
   Default: <tt>0.8, 1.6, 2.1</tt>
 </DL>
 
-@section ExtrasInDetExtensionProcessor Extra Pages
+@section InDetExtensionProcessor_ExtrasInDetExtensionProcessor Extra Pages
 
  - @ref UsedInDetExtensionProcessor
  - @ref RequirementsInDetExtensionProcessor
@@ -77,11 +77,9 @@ Trk::TrackExtensionMap and with any type of track fitter.
 
 /**
 @page UsedInDetExtensionProcessor Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsInDetExtensionProcessor Requirements
-@include requirements
 */
 
diff --git a/InnerDetector/InDetRecAlgs/InDetParticleCreation/doc/mainpage.h b/InnerDetector/InDetRecAlgs/InDetParticleCreation/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 74%
rename from InnerDetector/InDetRecAlgs/InDetParticleCreation/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/InDetParticleCreation/doc/packagedoc.h
index ada4470eb1897bd2076624d0490081b166f05ebd..5b3a6ac62f422496e84dce791fb32aabf6867db6
--- a/InnerDetector/InDetRecAlgs/InDetParticleCreation/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/InDetParticleCreation/doc/packagedoc.h
@@ -3,21 +3,19 @@
 */
 
 /**
-@mainpage InDetParticleCreation
+@page InDetParticleCreation_page InDetParticleCreation
 
 @author Andreas.Wildauer@cern.ch
 
-@section Introduction
+@section InDetParticleCreation_Introduction 
 The creation of Rec::TrackParticle objects is one of the last steps of the post processing chain in the Inner Detector.
 The package InDetParticleCreation contains the top algorithm InDet::ParticleCreator which creates Inner Detector Rec::TrackParticles from
 Trk::Tracks and the vertex position stored in a Trk::VxCandidate and writes them to storegate.
 
 It uses the Trk::ParticleCreatorTool from the package TrkParticleCreator.
 
-@section UsedPackages
-@htmlinclude used_packages.html
+@section InDetParticleCreation_UsedPackages 
 
-@section Requirements
-@include requirements
+@section InDetParticleCreation_Requirements 
 
 */
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/doc/mainpage.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/doc/packagedoc.h
index aade9b68c2d2f657d799cf1f9c277685cfd1cd06..8f9baf821f630743426ea05645162a25765b099a
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage InDetPrepRawDataFormation Package
+@page InDetPrepRawDataFormation_page InDetPrepRawDataFormation Package
 @author Tommaso.Lari@cern.ch
 
-@section InDetPrepRawDataFormationIntro Introduction
+@section InDetPrepRawDataFormation_InDetPrepRawDataFormationIntro Introduction
 
 This package manages the creation of InDetPrepRawData objects 
 for the Inner Detector. 
 
-@section InDetPrepRawDataFormationOverview Overview
+@section InDetPrepRawDataFormation_InDetPrepRawDataFormationOverview Overview
 
 There are three classes, all of them Algorithms:
 
@@ -42,11 +42,9 @@ TRT_RIO_Maker
 /**
 
 @page used_InDetPrepRawDataFormation Used Packages
-@htmlinclude used_packages.html
 
 */
 
 /**
 @page requirements_InDetPrepRawDataFormation requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/doc/mainpage.h b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 74%
rename from InnerDetector/InDetRecAlgs/InDetPriVxFinder/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/InDetPriVxFinder/doc/packagedoc.h
index 81f8270cf3797349fadf8b1856df6f1f9f1a95c5..c489759ea6064722f28cddb8ee0898a6e82df79c
--- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-\mainpage InDetPriVxFinder 
+@page InDetPriVxFinder_page InDetPriVxFinder
 
-\section introduction Introduction:
+@section InDetPriVxFinder_introduction Introduction:
 InDetPriVxFinder is a package which contains algorithm(s) to calculate the primary vertex of
 an event and to store the results to storegate. It makes use of the InDetPriVxFinderTools.
 All units are in mm and MeV.
 
-\section howitworks How it works:
+@section InDetPriVxFinder_howitworks How it works:
 The alogorithm VxPrimary.cxx reads all tracks from StoreGate, calls one of the InDetPriVxFinderTool methods, retrieves a VxContainer
 and writes all info to StoreGate.
 
-\section jobOptions The jobOptions file:
+@section InDetPriVxFinder_jobOptions The jobOptions file:
 The algorithm is automaticaly configured via genConf
 <ul>
 <li>Specifiy the name of the track input container:<br>
@@ -24,11 +24,9 @@ name this can be left untouched.</i></li>
 <li>Specify the name of the output container:<br>
 <b>VxPrimary.VxCandidatesOutputName      = "VxPrimaryCandidate";</b></li>
 </ul>
-\section used_packagesInDetPriVxFinder used packages
-@htmlinclude used_packages.html
+@section InDetPriVxFinder_used_packagesInDetPriVxFinder used packages
 
-\section requirements Requirements
-@include requirements
+@section InDetPriVxFinder_requirements Requirements
 
 \namespace Vtx
 A namespace for all vertexing packages and related stuff.
diff --git a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/doc/mainpage.h b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 52%
rename from InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/doc/packagedoc.h
index 0b8f489abfe635b764b304965da1261dc5c2d64c..2c5b72285790984a7bb836654cc126a6e7af6f50
--- a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/doc/packagedoc.h
@@ -4,16 +4,15 @@
 
 /**
 
-@mainpage InDetTrackPRD_Association
+@page InDetTrackPRD_Association_page InDetTrackPRD_Association
 @author Markus.Elsing@cern.ch, Igor.Gavrilenko@cern.ch
-@section InDetTrackPRD_AssociationIntro Introduction
+@section InDetTrackPRD_Association_InDetTrackPRD_AssociationIntro Introduction
 
 This algorithm is devoted to track - PRD assocoation.
 
 This algorithm uses Trk::IPRD_AssociationTool
 
-@section  InDetTrackPRD_AssociationReq  Requirements file
-@include requirements
+@section InDetTrackPRD_Association_InDetTrackPRD_AssociationReq Requirements file
 
 */
 
diff --git a/InnerDetector/InDetRecAlgs/InDetV0Finder/doc/mainpage.h b/InnerDetector/InDetRecAlgs/InDetV0Finder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from InnerDetector/InDetRecAlgs/InDetV0Finder/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/InDetV0Finder/doc/packagedoc.h
index 905ef197dc4daff8ad5061ed50cc89cec36f7cba..56866abb219107fe1396049af03ffbce257f3baa
--- a/InnerDetector/InDetRecAlgs/InDetV0Finder/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/InDetV0Finder/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-\mainpage The InDetV0FinderInterfaces package
+@page InDetV0Finder_page The InDetV0FinderInterfaces package
 
 @author Evelina.Bouhova@cern.ch
 
-\section introductionInDetV0Finder Introduction:
+@section InDetV0Finder_introductionInDetV0Finder Introduction:
 InDetV0Finder is a package which contains the algorithm for finding V0 vertices in
 the Inner Detector. It retrieves a V0Container and writes all info to StoreGate.
 
-\section howitworksInDetV0Finder How it works:
+@section InDetV0Finder_howitworksInDetV0Finder How it works:
 InDetV0Finder gets its input tracks from StoreGate and selects tracks pairs with
 opposite charge. If an acceptable starting point is found by <b></i>m_getStartingPoint</i></b>
 a 3D vertex fit without any mass or pointing constraints is performed using <b></i>TrkV0Fitter</i></b>.
@@ -30,7 +30,7 @@ between the two helices extrapolated to the intersection is chosen. If the circl
 the vertex approximation is taken as the point of closest approach of the two circles. The first
 track in the argument list should be the track with the smaller radius.
 
-\section jobOptionsInDetV0Finder The jobOptions file:
+@section InDetV0Finder_jobOptionsInDetV0Finder The jobOptions file:
 The algorithm is automatically configured via genConf. Most cuts are controlled by parameters,
 which can be changed through jobOptions:
   - int <b></i>m_masses</i></b> = 1 if using PDG values for the masses of the two tracks and the V0,
@@ -65,9 +65,7 @@ which can be changed through jobOptions:
   - double <b></i>m_nsig</i></b> : mass windows set to m_nsig times the mass resolution (5.)
 
 
-\section requirementsInDetV0Finder  Requirements
+@section InDetV0Finder_requirementsInDetV0Finder Requirements
 
-@htmlinclude used_packages.html
-@include requirements
 
 */
diff --git a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/doc/mainpage.h b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/doc/packagedoc.h
index 3403ff271222517d9cea275d81082008dd2bfaa6..ca7ad963597b67cf2b157373f0c79aef560f0d15
--- a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/doc/packagedoc.h
@@ -3,19 +3,18 @@
 */
 
 /**
-@mainpage ZVTOP_Algs Package
+@page InDetZVTOP_Alg_page ZVTOP_Algs Package
 
 contains: <br>
 - ConversionFinder.cxx <br>
 
 @author Tatjana Lenz <tatjana.lenz@cern.ch>
 
-@section ZVTOP_AlgsIntro Introduction
+@section InDetZVTOP_Alg_ZVTOP_AlgsIntro Introduction
 
 ZVTOP_Algs is a package which contains algorithm to reconstruct vertices. The only job is to call a vertex finder tool - InDetZVTOPVxFinder (see InnerDetector/InDetRecTools/InDetZVTOPVxFinder). The topological vertex finder has been developed by David J. Jackson, Nucl.Instrum.Meth.A388: 247-253, 1997 and now implemented to ATHENA and adjusted  to ATLAS requirements. It reconstructs a set of vertices & associated subset of the charged tracks. The association accords to a vertex probability function which is based on the trajectories and position resolution of the tracks.
 
-@section ZVTOP_AlgsReq Requirements
+@section InDetZVTOP_Alg_ZVTOP_AlgsReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/doc/mainpage.h b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 73%
rename from InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/doc/packagedoc.h
index a54d0152e45e2ab801c71b0b1b2e4a106c2f8261..7ae4be693a0642e700f9dfa2cb56ae006194a039
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage SiSPSeededTrackFinder
+@page SiSPSeededTrackFinder_page SiSPSeededTrackFinder
 @author Markus.Elsing@cern.ch, Igor.Gavrilenko@cern.ch
-@section SiSPSeededTrackFinderIntro Introduction
+@section SiSPSeededTrackFinder_SiSPSeededTrackFinderIntro Introduction
 
 This algorithm is devoted to track finding using Pixels and SCT clusters starting from space point seeds
 information. Output of this algorithm is Trk::Track collection. 
@@ -17,8 +17,7 @@ This algorithm uses three standard tools.
 2. ISiZvertexMake          - primary verices search tool.
 3. ISiTrackMaker           - local track-finding in Pixels and SCT tool.
 
-@section  SiSPSeededTrackFinderReq  Requirements file
-@include requirements
+@section SiSPSeededTrackFinder_SiSPSeededTrackFinderReq Requirements file
 
 */
 
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/doc/mainpage.h b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from InnerDetector/InDetRecAlgs/SiSpacePointFormation/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/SiSpacePointFormation/doc/packagedoc.h
index e4e78741dd2bf85eb1592ecfb4ae05045715c415..2bb0f9b842c2fd884e056290869485ce6419dcb5
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage SiSpacePointFormation Package
+@page SiSpacePointFormation_page SiSpacePointFormation Package
 @author Maria.Jose.Costa@cern.ch (update of the original code from David 
 Candlin)
 
-@section SiSpacePointFormationIntro Introduction
+@section SiSpacePointFormation_SiSpacePointFormationIntro Introduction
 
 This package contains the algorithm to create Space Points for the Pixels and
 SCT detectors. For the Pixels it is just a transformation of classes from
@@ -15,7 +15,7 @@ clusters to Space Points while for the SCT it combines the 1-dimensional
 information of two SCT clusters into a Space Point.
 This algorithm is used in the offline reconstruction.
 
-@section SiSpacePointFormationOverview Algorithm Overview
+@section SiSpacePointFormation_SiSpacePointFormationOverview Algorithm Overview
   The SiSpacePointFormation package contains the following algorithms:
 
    - SiTrackerSpacePointFinder: It retrieves all the Pixels and SCT clusters
@@ -30,7 +30,6 @@ This algorithm is used in the offline reconstruction.
    SiElementProperties in order to access, for the SCT, the backside wafer
    of a given module and the neighbour ones from other modules.
 
-@section SiSpacePointFormationReq Requirements
+@section SiSpacePointFormation_SiSpacePointFormationReq Requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/doc/mainpage.h b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 77%
rename from InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/doc/packagedoc.h
index 88ef6ff0f810190c1504b0c74c63c672bf9a5dde..cdac33c0b6799773ddaf39f65b675bd956d9b986
--- a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/doc/packagedoc.h
@@ -4,15 +4,15 @@
 
 /**
 
-@mainpage TRT_SeededTrackFinder
+@page TRT_SeededTrackFinder_page TRT_SeededTrackFinder
 @author Thomas.Koffas@cern.ch
 
-@section TRT_SeededTrackFinderIntro Introduction
+@section TRT_SeededTrackFinder_TRT_SeededTrackFinderIntro Introduction
 
 This is the algorithm for driving the back tracking through the Si part of the ID.
 The input are TRT track segments and the output are global ID tracks.
 
-@section TRT_SeededTrackFinderDescription Description
+@section TRT_SeededTrackFinder_TRT_SeededTrackFinderDescription Description
 
 This algorithm performs the following tasks:
 
@@ -35,21 +35,19 @@ This algorithm performs the following tasks:
     tracks found, the number of TRT segments, the number of tracks with and without a Si
     component, will be output in any case.
 
-@section TRT_SeededTrackFinderTools Used Tools
+@section TRT_SeededTrackFinder_TRT_SeededTrackFinderTools Used Tools
 
 This algorithm uses the ITRT_SeededTrackFinderTool, ITrackFitter tools.
 
-@section TRT_SeededTrackFinderContents Algorithm Contents
+@section TRT_SeededTrackFinder_TRT_SeededTrackFinderContents Algorithm Contents
 
 The TRT_SeededTrackFinder contains the following classes/files:
 
 - TRT_SeededTrackFinder.cxx...Main class calling all the necessary tools and producing the ouput track collection.
 
-@section TRT_SeededTrackFinderPackages Used Packages
+@section TRT_SeededTrackFinder_TRT_SeededTrackFinderPackages Used Packages
 
-@htmlinclude used_packages.html
 
-@section  TRT_SeededTrackFinderReq  Requirements file
-@include requirements
+@section TRT_SeededTrackFinder_TRT_SeededTrackFinderReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/doc/mainpage.h b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 73%
rename from InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/doc/packagedoc.h
index d9ab8357634823442238c6a322841748d9c6eef6..2858ce07e906464a98249898eeefd29d17e77974
--- a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage TRT_StandaloneTrackFinder
+@page TRT_StandaloneTrackFinder_page TRT_StandaloneTrackFinder
 @author Thomas.Koffas@cern.ch
 
-@section TRT_StandaloneTrackFinderIntro Introduction
+@section TRT_StandaloneTrackFinder_TRT_StandaloneTrackFinderIntro Introduction
 
 This is an algorithm that deals with the TRT segments that have not
 been assigned a Si extension. It runs after the TRT seeded back-tracking
 is completed, including the ambiguity resolving of the resulting tracks.
 The input are TRT track segments and the output are global ID tracks.
 
-@section TRT_StandaloneTrackFinderDescription Description
+@section TRT_StandaloneTrackFinder_TRT_StandaloneTrackFinderDescription Description
 
 This algorithm performs the following tasks:
 
@@ -32,21 +32,19 @@ This algorithm performs the following tasks:
     using the configured track fitter. Those that are successfully fitted are 
     then stored in a dedicated track collection.
 
-@section TRT_StandaloneTrackFinderTools Used Tools
+@section TRT_StandaloneTrackFinder_TRT_StandaloneTrackFinderTools Used Tools
 
 This algorithm uses the ITrackFitter, InDetAssociationTool tools.
 
-@section TRT_StandaloneTrackFinderContents Algorithm Contents
+@section TRT_StandaloneTrackFinder_TRT_StandaloneTrackFinderContents Algorithm Contents
 
 The TRT_StandaloneTrackFinder contains the following classes/files:
 
 - TRT_StandaloneTrackFinder.cxx...Main class calling all the necessary tools and producing the ouput track collection.
 
-@section TRT_StandaloneTrackFinderPackages Used Packages
+@section TRT_StandaloneTrackFinder_TRT_StandaloneTrackFinderPackages Used Packages
 
-@htmlinclude used_packages.html
 
-@section  TRT_StandaloneTrackFinderReq  Requirements file
-@include requirements
+@section TRT_StandaloneTrackFinder_TRT_StandaloneTrackFinderReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/doc/mainpage.h b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 66%
rename from InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/doc/packagedoc.h
index 442ca793caf57b5223cf23433b64818801b90f06..19900fa822c3155093cb84dc065671e783ac8ade
--- a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage TRT_TrackExtensionAlg
+@page TRT_TrackExtensionAlg_page TRT_TrackExtensionAlg
 @author Markus.Elsing@cern.ch, Igor.Gavrilenko@cern.ch
-@section TRT_TrackExtensionAlgIntro Introduction
+@section TRT_TrackExtensionAlg_TRT_TrackExtensionAlgIntro Introduction
 
 This algorithm is devoted for tracks extention to TRT.
 Input is tracks found in SCT and Pixels and output is TrackExtensionMap.
@@ -14,7 +14,6 @@ Input is tracks found in SCT and Pixels and output is TrackExtensionMap.
 This algorithm uses standard ITRT_TrackExtensionTool and shoud know 
 input tracks location and extended track location.
 
-@section  TRT_TrackExtensionAlgReq  Requirements file
-@include requirements
+@section TRT_TrackExtensionAlg_TRT_TrackExtensionAlgReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/doc/mainpage.h b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 63%
rename from InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/doc/mainpage.h
rename to InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/doc/packagedoc.h
index 646ef3dd510aa0b36b98b052ef5a9a52b32b9502..2b5f7ddf4706cff519a1320d53cbf0324cc2fb6d
--- a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/doc/mainpage.h
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/doc/packagedoc.h
@@ -4,16 +4,15 @@
 
 /**
 
-@mainpage TRT_TrackSegmentsFinder
+@page TRT_TrackSegmentsFinder_page TRT_TrackSegmentsFinder
 @author Markus.Elsing@cern.ch, Igor.Gavrilenko@cern.ch
-@section TRT_TrackSegmentsFinderIntro Introduction
+@section TRT_TrackSegmentsFinder_TRT_TrackSegmentsFinderIntro Introduction
 
 This algorithm is devoted for tracks finding in TRT without extra infomation (Stande alone TRT reconstruction).
 Output of this algorithm is Trk::SegmentCollection.
 
 This algorithm uses standard ITRT_TrackSegmentsMaker tool.
 
-@section  TRT_TrackSegmentsFinderReq  Requirements file
-@include requirements
+@section TRT_TrackSegmentsFinder_TRT_TrackSegmentsFinderReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/doc/mainpage.h b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/doc/mainpage.h
rename to InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/doc/packagedoc.h
index 762317e90030fa5aa7a0755316827f9b8807df01..4347bda373142cee1e12af9224dabec06c868329
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/doc/mainpage.h
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage The InDetCompetingRIOsOnTrack package
+@page InDetCompetingRIOsOnTrack_page The InDetCompetingRIOsOnTrack package
 The InDet package for CompetingRIOsOnTrack.
 
 @author Sebastian.Fleischmann@cern.ch
 
-@section introductionInDetCompetingRIOsOnTrack Introduction
+@section InDetCompetingRIOsOnTrack_introductionInDetCompetingRIOsOnTrack Introduction
 
 This package contains the InDet classes which inherit from Trk::CompetingRIOsOnTrack that extends 
 the Trk::MeasurementBase class.
@@ -20,13 +20,13 @@ each other in being assigned to a track.
 localParameters() and localErrorMatrix() return the mean values
 according to the weights (assignment probabilities).
 
-@section InDetCompetingRIOsOnTrackOverview Class Overview
+@section InDetCompetingRIOsOnTrack_InDetCompetingRIOsOnTrackOverview Class Overview
   The InDetCompetingRIOsOnTrack package contains the following classes:
   - InDet::CompetingPixelClustersOnTrack : Pixel specific implementation of CompetingRIOsOnTrack with InDet::PixelClusterOnTrack
   - InDet::CompetingSCT_ClustersOnTrack : SCT specific implementation of CompetingRIOsOnTrack with InDet::SCT_ClusterOnTrack
   - InDet::CompetingTRT_DriftCirclesOnTrack : TRT specific implementation of CompetingRIOsOnTrack with InDet::TRT_DriftCircleOnTrack
 
-@section ExtrasInDetCompetingRIOsOnTrack Extra Pages
+@section InDetCompetingRIOsOnTrack_ExtrasInDetCompetingRIOsOnTrack Extra Pages
 
  - @ref UsedInDetCompetingRIOsOnTrack
  - @ref requirementsInDetCompetingRIOsOnTrack
@@ -34,10 +34,8 @@ according to the weights (assignment probabilities).
 
 /**
 @page UsedInDetCompetingRIOsOnTrack Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsInDetCompetingRIOsOnTrack Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/doc/mainpage.h b/InnerDetector/InDetRecEvent/InDetPrepRawData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from InnerDetector/InDetRecEvent/InDetPrepRawData/doc/mainpage.h
rename to InnerDetector/InDetRecEvent/InDetPrepRawData/doc/packagedoc.h
index f83f06aa248e7cbd227230b5773f8d118cd41d58..b120d87810c3c33bd05c91b50e1da4b1013944fe
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/doc/mainpage.h
+++ b/InnerDetector/InDetRecEvent/InDetPrepRawData/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage The InDetPrepRawData package 
+@page InDetPrepRawData_page The InDetPrepRawData package
 
-\section introductionIDPRD Introduction
+@section InDetPrepRawData_introductionIDPRD Introduction
 
 The InDetPrepRawData package provides InnerDetector specific implementations of the common TrkPrepRawData classes.
 
diff --git a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/doc/mainpage.h b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from InnerDetector/InDetRecEvent/InDetRIO_OnTrack/doc/mainpage.h
rename to InnerDetector/InDetRecEvent/InDetRIO_OnTrack/doc/packagedoc.h
index 67fb636c9886179d1ea25306a90887701332656b..9130debed18f0c9a47b3e4114ec010f26b9fee94
--- a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/doc/mainpage.h
+++ b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage The InDetRIO_OnTrack class 
+@page InDetRIO_OnTrack_page The InDetRIO_OnTrack class
 
-\section introductionInDetRIO_OnTrack Introduction
+@section InDetRIO_OnTrack_introductionInDetRIO_OnTrack Introduction
 
 This package contains InnerDetector-specific  implementations of the Trk::RIO_OnTrack class. In other words, it provides versions of Trk::RIO_OnTrack classes for each of the Inner Detector sub-detectors.
    
diff --git a/InnerDetector/InDetRecEvent/SiSpacePoint/doc/mainpage.h b/InnerDetector/InDetRecEvent/SiSpacePoint/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from InnerDetector/InDetRecEvent/SiSpacePoint/doc/mainpage.h
rename to InnerDetector/InDetRecEvent/SiSpacePoint/doc/packagedoc.h
index ce8c4469681ed0008a569a1ccf3c076686c8b87c..5ca368a49e63f9495bd2711615fc2da3013706e7
--- a/InnerDetector/InDetRecEvent/SiSpacePoint/doc/mainpage.h
+++ b/InnerDetector/InDetRecEvent/SiSpacePoint/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
-@mainpage SiSpacePoint Package
+@page SiSpacePoint_page SiSpacePoint Package
 @author Martin.Siebel@cern.ch
 
-@section SiSpacePointIntro Introduction
+@section SiSpacePoint_SiSpacePointIntro Introduction
 
 This package contains the definition and implementation for the
 classes SCT_SpacePoint and PixelSpacePoint. Both classes are derived from
 TrkSpacePoint. 
 
-@section SiSpacePoint Class Overview
+@section SiSpacePoint_SiSpacePoint Class Overview
   The SiSpacePoint package contains the following classes:
 
    - PixelSpacePoint: The SpacePoints for the PixelDetector.
@@ -31,7 +31,7 @@ TrkSpacePoint.
      assumed constant for the time being. They are only initialized when
      inquired and buffered after that.
 
-@section SCT_Errors Estimation of the SCT_SpacePoint error matrix
+@section SiSpacePoint_SCT_Errors Estimation of the SCT_SpacePoint error matrix
    <br>
    \image html SctSpacePointError.gif
    <br>
@@ -97,7 +97,6 @@ TrkSpacePoint.
 
 
 
-@section SiSpacePointReq Requirements
+@section SiSpacePoint_SiSpacePointReq Requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetRecEvent/SiSpacePointsSeed/doc/mainpage.h b/InnerDetector/InDetRecEvent/SiSpacePointsSeed/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from InnerDetector/InDetRecEvent/SiSpacePointsSeed/doc/mainpage.h
rename to InnerDetector/InDetRecEvent/SiSpacePointsSeed/doc/packagedoc.h
index 5f39e534642ea504f596b213372aec9837d84080..622cad17e5c178e719563072a0eb4b4a1a9bbb3d
--- a/InnerDetector/InDetRecEvent/SiSpacePointsSeed/doc/mainpage.h
+++ b/InnerDetector/InDetRecEvent/SiSpacePointsSeed/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage SiSpacePointsSeed
+@page SiSpacePointsSeed_page SiSpacePointsSeed
 @author Igor.Gavrilenko@cern.ch
-@section SiSpacePointsSeedIntro Introduction
+@section SiSpacePointsSeed_SiSpacePointsSeedIntro Introduction
 
 This class represent possible track candidate using only space points information.
 
@@ -20,7 +20,6 @@ Maind data member are:
 This class contains information after first step of pattern recognition using space points
 information and is input for local track finding in the road.
 
-@section  SiSpacePointsSeedReq  Requirements file
-@include requirements
+@section SiSpacePointsSeed_SiSpacePointsSeedReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/doc/packagedoc.h
index ea2ee46e41594eee23b63302598c636c235df2dc..01ab780a3a9a1a3bd70ac27d7f57df0be43ec312
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage InDetAmbiTrackSelectionTool Package
+@page InDetAmbiTrackSelectionTool_page InDetAmbiTrackSelectionTool Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Martin Siebel <Martin.Siebel@CERN.ch>
 
-@section InDetAmbiTrackSelectionToolIntro Introduction
+@section InDetAmbiTrackSelectionTool_InDetAmbiTrackSelectionToolIntro Introduction
 
 This tool is a helper tool to the ambiguity processing. 
 It decides which hits remain on a track and which hits have to be removed, because they are already used on other tracks. 
@@ -33,8 +33,7 @@ If a track has more shared hits than allowed, as many shared hits as allowed are
 and a new track is constructed from these hits.
 If this track is sufficiently good, it is returned, otherweise zero is returned.
 
-@section InDetAmbiTrackSelectionToolReq Requirements
+@section InDetAmbiTrackSelectionTool_InDetAmbiTrackSelectionToolReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/doc/packagedoc.h
index f21ecfd2133e146a3f5ddf7634df5c9bdda9a986..09ac3bb4737bb76a375fe55e5c2bf716267ecf63
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage The InDetCompetingRIOsOnTrackTool package
+@page InDetCompetingRIOsOnTrackTool_page The InDetCompetingRIOsOnTrackTool package
 The InDet package for CompetingRIOsOnTrack creation.
 
 @author Sebastian.Fleischmann@cern.ch
 
-@section introductionInDetCompetingRIOsOnTrackTool Introduction
+@section InDetCompetingRIOsOnTrackTool_introductionInDetCompetingRIOsOnTrackTool Introduction
 
 This package contains the tools to create Trk::CompetingRIOsOnTrack for the InDet realm
 (i.e. InDet::CompetingTRT_DriftCirclesOnTrack, InDet::CompetingPixelClustersOnTrack, InDet::CompetingSCT_ClustersOnTrack). This includes
@@ -17,7 +17,7 @@ This package contains the tools to create Trk::CompetingRIOsOnTrack for the InDe
     From each TRT_DriftCircle (RIO) two TRT_DriftCircleOnTrack (ROTs) are created. This
     corresponds to the left and the right solution of the DriftCircle.
 
-@section InDetCompetingRIOsOnTrackToolOverview Class Overview
+@section InDetCompetingRIOsOnTrackTool_InDetCompetingRIOsOnTrackToolOverview Class Overview
   The InDetCompetingRIOsOnTrackTool package contains the following classes:
 
   - InDet::ICompetingPixelClustersOnTrackCreator : Interface class for CompetingPixelClustersOnTrackTools.
@@ -38,7 +38,7 @@ This package contains the tools to create Trk::CompetingRIOsOnTrack for the InDe
     corresponds to the left and the right solution of the DriftCircle. The TRT_DriftCircle may belong to different
     straw tubes and the effective measurement is projected to the tube of the most probable measurement.
 
-@section ExtrasInDetCompetingRIOsOnTrackTool Extra Pages
+@section InDetCompetingRIOsOnTrackTool_ExtrasInDetCompetingRIOsOnTrackTool Extra Pages
 
  - @ref UsedInDetCompetingRIOsOnTrackTool
  - @ref requirementsInDetCompetingRIOsOnTrackTool
@@ -46,10 +46,8 @@ This package contains the tools to create Trk::CompetingRIOsOnTrack for the InDe
 
 /**
 @page UsedInDetCompetingRIOsOnTrackTool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsInDetCompetingRIOsOnTrackTool Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetConversionFinderTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from InnerDetector/InDetRecTools/InDetConversionFinderTools/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetConversionFinderTools/doc/packagedoc.h
index 5ceb89e911af6ecfd2d29081e8e14d64631eeeec..1ef8f83f236c8595d9f71665c988f1910498cf37
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
-\mainpage InDetConversionFinderTool
+@page InDetConversionFinderTools_page InDetConversionFinderTool
 
-\section introduction Introduction:
+@section InDetConversionFinderTools_introduction Introduction:
 InDetConversionFinderTool is a package which contains an AlgTool to reconstruct gamma conversions in an event. It inherits from IVertexFinder interface (InnerDetector/InDetRecTools/InDetRecToolInterfaces) and can be called by an algorithm using this interface. To fit the decay vertex of found conversions a common IVertexFitter interface is used. The default vertex fitter is Billoir FullFitter.
 All units are in mm and MeV.
 
-\section howitworks How it works:
+@section InDetConversionFinderTools_howitworks How it works:
 The input of this tool is a collection of tracks (see TrkTrack/TrackCollection.h), it rejects the tracks comming from the primary vertex by applying of \f$ d_0 \f$ and \f$ z_0 \f$ cuts. From remaining tracks all possible positive and negative track pairs are build. For each pair a distance cut and a momentum fraction cut are applyed. These cuts are useful to reconstruct symmetric photon conversions. The cuts for (very) asymmetric conversions still have to be implemented. The distance is the 3d distance between the first hits in detector of both tracks. If both hits are on the same surface, the global position of the hits is taken to calculate the distance. If not, the track with the first measurement closest to 000 is chosen and the distance of the closest approach of another track to this measurement is calculated. The momentum fraction is defined as a track momentum devided by a sum of momenta of both tracks. In case of symmetric conversions this value should be (exponential?) distributed around 0,5. All cuts can be changed/set via jobOptions. The remaining track pairs are fitted. On the reconstructed vertices the \f$ \chi^2 \f$ and an invariant vertex mass cut are applyed. If the VxCandidate passes all cuts, it is stored and all info is written in a VxContainer (see VxVertex/VxContainer.h).<br>
 
-\section jobOptions The jobOptions file:
+@section InDetConversionFinderTools_jobOptions The jobOptions file:
 The algorithm is configured automaticly via genConf
 <ul>
 <li>Specifiy the name of the vertex fitter:<br>
@@ -29,11 +29,9 @@ The algorithm is configured automaticly via genConf
       <li><b>'max_mom_frac' : 0.7 </b> </li>
     </ul>
 
-\section used_packagesInDetConversionFinderTool used packages
-@htmlinclude used_packages.html
+@section InDetConversionFinderTools_used_packagesInDetConversionFinderTool used packages
 
-\section requirements Requirements
-@include requirements
+@section InDetConversionFinderTools_requirements Requirements
 
 \namespace Vtx
 A namespace for all vertexing packages and related stuff.
diff --git a/InnerDetector/InDetRecTools/InDetDNASeparator/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetDNASeparator/doc/packagedoc.h
similarity index 87%
rename from InnerDetector/InDetRecTools/InDetDNASeparator/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetDNASeparator/doc/packagedoc.h
index 1ccd61385a1161c6fbd1db356eb7712849c4c268..b0505e26e1a0f98edead43011cfb0b3b3245d57c 100644
--- a/InnerDetector/InDetRecTools/InDetDNASeparator/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetDNASeparator/doc/packagedoc.h
@@ -4,12 +4,12 @@
 
 /**
 
-@mainpage InDetDNASeparator Package
+@page InDetDNASeparator_page InDetDNASeparator Package
 
 @author Vato Kartvelishvili <vakhtang.kartvelishvili@cern.ch>
 @author Wolfgang Liebig  <http://consult.cern.ch/xwho/people/54608>
 
-@section InDetDNASeparatorIntro Summary
+@section InDetDNASeparator_InDetDNASeparatorIntro Summary
 Evaluate track for energy-loss type breakpoints based on
 existing material effects and momentum information on the track.
 It analyses the momentum evolution along the trajectory, comparing
@@ -26,7 +26,7 @@ of output is a decision: no breakpoint, insignificant breakpoint
 or a confirmed, significant breakpoint. Breakpoint means brem
 for this tool.
 
-@section InDetDNASeparatorTechnical Implementation
+@section InDetDNASeparator_InDetDNASeparatorTechnical Implementation
 The DNA separator implements the Trk::ITrackBreakpointAnalyser
 interface from the common tracking realm. It has two sets of
 methods: one performs the analysis on input from the internal
@@ -39,7 +39,7 @@ This package also has an internal data class: <nop>MeanTrackParsAtFloor which
 manages the representation of any combination of measurements on
 brem-sensitive detector floors.
 
-@section InDetDNASeparatorJO jobOptions
+@section InDetDNASeparator_InDetDNASeparatorJO jobOptions
 
 <table>
 <tr><td><b>option</b></td><td><b>default</b></td><td><b>purpose</b></td></tr>
@@ -47,7 +47,7 @@ brem-sensitive detector floors.
   declared as 'confirmed'.</td></tr>
 </table>
 
-@section InDetDNASeparatorExtras Extra Pages
+@section InDetDNASeparator_InDetDNASeparatorExtras Extra Pages
 
  - @ref InDetDNASeparatorPackages
  - @ref InDetDNASeparatorRequirements
@@ -55,10 +55,8 @@ brem-sensitive detector floors.
 
 /**
 @page InDetDNASeparatorPackages Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page InDetDNASeparatorRequirements
-@include requirements
 */
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from InnerDetector/InDetRecTools/InDetPriVxFinderTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetPriVxFinderTool/doc/packagedoc.h
index 5aabde2c97f602c01b21a22323217d70140f6eef..505a860a69ba0e60d226c770c4ca60fc0b56ce59
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-\mainpage InDetPriVxFinderTool 
+@page InDetPriVxFinderTool_page InDetPriVxFinderTool
 
-\section introduction Introduction:
+@section InDetPriVxFinderTool_introduction Introduction:
 InDetPriVxFinderTool is a package which contains an AlgTool to calculate one or more primary vertices (in case of pile up events) of
 an event. The package contains four different approaches to reconstruct primary vertices. InDetPriVxFinderTool.cxx makes use of the Billoir fitting AlgTools in the package TrkVertexBilloirTools. InDetAdaptivePriVxFinderTool.cxx and InDetAdaptiveMultiPriVxFinderTool.cxx make use of deterministic annealing methods.
 All units are in mm and MeV.
 
-\section howitworks How it works:
+@section InDetPriVxFinderTool_howitworks How it works:
 <ul>
 <li> InDetPriVxFinderTool.cxx </li>
 It is a prototype usecase of the mathematical billoir fit AlgTools of the VxBilloirTools package. It is a typical <i>tear down</i> algorithm. It starts with a given collection of tracks, applies some quality cuts on tracks and feeds the fit AlgTool with all tracks which passed. The billoir tool stores the result in a VxCandidate object (see package Tracking/TrkEvent/VxVertex). After a first fit, InDetPriVxFinderTool.cxx loops again through tracks and selects them according to their \f$ \chi^{2} \f$ of the vertex fit. Tracks with too high \f$ \chi^{2} \f$ are rejected and the vertex is refittet. The result is stored in the VxContainer.<br>
@@ -91,7 +91,7 @@ This finder is particularly suited for the high luminosities
 scenarios which will came up at LHC.
 </ul>
 
-\section jobOptions The jobOptions file:
+@section InDetPriVxFinderTool_jobOptions The jobOptions file:
 The AlgTool is automatically configured (see genConf). Following properties can be set:
 <ul>
 <li> InDetPriVxFinderTool.cxx </li>
@@ -191,11 +191,9 @@ The AlgTool is automatically configured (see genConf). Following properties can
    </li>
 </ul>
 
-\section used_packagesInDetPriVxFinder used packages
-@htmlinclude used_packages.html
+@section InDetPriVxFinderTool_used_packagesInDetPriVxFinder used packages
 
-\section requirements Requirements
-@include requirements
+@section InDetPriVxFinderTool_requirements Requirements
 
 \namespace Vtx
 A namespace for all vertexing packages and related stuff.
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from InnerDetector/InDetRecTools/InDetRecToolInterfaces/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetRecToolInterfaces/doc/packagedoc.h
index a379c42940496152cb2ef65bfc46c8a162be2dad..a33bdb477ebf96b852a35cc49dbe1b18d7ab6504
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage InDetRecToolInterfaces
+@page InDetRecToolInterfaces_page InDetRecToolInterfaces
 @author Markus.Elsing@cern.ch, Igor.Gavrilenko@cern.ch
-@section InDetRecToolInterfacesIntro Introduction
+@section InDetRecToolInterfaces_InDetRecToolInterfacesIntro Introduction
 
 InDetRecToolInterfaces is a directory which contains set virtual abstract classes which of them inherit
 from base class IAlgTool and describe methodes and intefaces needs for different step tracks and vertices reconstruction process.
 
-@section InDetRecToolInterfacesISiSpacePointsSeedMaker  ISiSpacePointsSeedMaker
+@section InDetRecToolInterfaces_InDetRecToolInterfacesISiSpacePointsSeedMaker ISiSpacePointsSeedMaker
 
  This tool should provide search all space points seeds inside full Atlas inner detector
  or only inside some region. Each of this seed is a list space points with different lenght and
@@ -36,7 +36,7 @@ from base class IAlgTool and describe methodes and intefaces needs for different
 
    virtual const SiSpacePointsSeed* next()=0;
 
-@section InDetRecToolInterfacesISiZvertexMaker ISiZvertexMaker
+@section InDetRecToolInterfaces_InDetRecToolInterfacesISiZvertexMaker ISiZvertexMaker
 
  This tool should provide fast estimation position all primary vertices along
  beam direction. 
@@ -51,7 +51,7 @@ from base class IAlgTool and describe methodes and intefaces needs for different
  
       virtual const std::list<Trk::Vertex>&  getVertices ()=0;
 
-@section InDetRecToolInterfacesITRT_TrackExtensionTool ITRT_TrackExtensionTool
+@section InDetRecToolInterfaces_InDetRecToolInterfacesITRT_TrackExtensionTool ITRT_TrackExtensionTool
 
  This tool should find best track prolongation in TRT and  contains one method to initiate
  track extention process 
@@ -68,7 +68,7 @@ from base class IAlgTool and describe methodes and intefaces needs for different
 	(const Trk::TrackParameters&) = 0;
 
 
-@section InDetRecToolInterfacesITRT_DetElementsRoadMake ITRT_DetElementsRoadMake
+@section InDetRecToolInterfaces_InDetRecToolInterfacesITRT_DetElementsRoadMake ITRT_DetElementsRoadMake
 
  This tool should find all TRT detector elements on the trajectory sorted in
  propagation order and contains two method with slightly different output information.
@@ -86,7 +86,7 @@ from base class IAlgTool and describe methodes and intefaces needs for different
        std::list<std::pair<const InDetDD::TRT_BaseElement*,const Trk::TrackParameters*> >&)=0;
 
 
-@section InDetRecToolInterfacesISiDetElementsRoadMaker ISiDetElementsRoadMaker
+@section InDetRecToolInterfaces_InDetRecToolInterfacesISiDetElementsRoadMaker ISiDetElementsRoadMaker
 
  This tool should find all SCT and Pixels detector elements on the trajectory sorted in
  propagation order and contains three methods with different input information.
@@ -106,7 +106,7 @@ from base class IAlgTool and describe methodes and intefaces needs for different
        std::list<const InDetDD::SiDetectorElement*>&)=0;
  
 
-@section InDetRecToolInterfacesITRT_TrackSegmentsMaker ITRT_TrackSegmentsMaker
+@section InDetRecToolInterfaces_InDetRecToolInterfacesITRT_TrackSegmentsMaker ITRT_TrackSegmentsMaker
 
  This tool should provide search all TRT track segments inside full Atlas inner detector
  or only inside some region without extra information (Stande alone TRT reconstruction). 
@@ -126,7 +126,7 @@ from base class IAlgTool and describe methodes and intefaces needs for different
     virtual Trk::TrackSegment* next()=0;
 
 
-@section InDetRecToolInterfacesISiTrackMaker ISiTrackMaker
+@section InDetRecToolInterfaces_InDetRecToolInterfacesISiTrackMaker ISiTrackMaker
 
  This tool initiate detailed track-finding procedure inside SCT and Pixel detector
  elements and contains one method to initialize track finding process
@@ -141,7 +141,7 @@ from base class IAlgTool and describe methodes and intefaces needs for different
  Input for this method is list space points and output is list pointers to track.
 
 
-@section InDetRecToolInterfacesITRT_SeededSpacePointFinder  ITRT_SeededSpacePointFinder
+@section InDetRecToolInterfaces_InDetRecToolInterfacesITRT_SeededSpacePointFinder ITRT_SeededSpacePointFinder
 
  This tool searches for space point seeds in the last two SCT layers close to the TRT.
 
@@ -163,7 +163,7 @@ from base class IAlgTool and describe methodes and intefaces needs for different
 
  is not implemented.
 
-@section InDetRecToolInterfacesITRT_SeededTrackFinder ITRT_SeededTrackFinder
+@section InDetRecToolInterfaces_InDetRecToolInterfacesITRT_SeededTrackFinder ITRT_SeededTrackFinder
 
  This tool initiates the track-finding procedure inside the SCT and Pixel detector 
  elements using as input the track information provided by track segments reconstructed
@@ -183,7 +183,6 @@ from base class IAlgTool and describe methodes and intefaces needs for different
  to determine the area of search inside the TRT. Passing a TRT track segment
  as input is the prefered method, most compatible with the new tracking requirements.
 
-@section  InDetRecToolInterfacesReq  Requirements file
-@include requirements
+@section InDetRecToolInterfaces_InDetRecToolInterfacesReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/doc/packagedoc.h
similarity index 91%
rename from InnerDetector/InDetRecTools/InDetTrackHoleSearch/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetTrackHoleSearch/doc/packagedoc.h
index 140c2e33e0fc853c965e690881b76487ffd1dddb..590b079ad8476e367c9f5941330e259172177e12 100644
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage InDetTrackHoleSearch Package
+@page InDetTrackHoleSearch_page InDetTrackHoleSearch Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Martin Siebel <Martin.Siebel@CERN.ch>
 
-@section InDetTrackHoleSearchIntro Introduction
+@section InDetTrackHoleSearch_InDetTrackHoleSearchIntro Introduction
 
 This package contains the InDetTrackHoleSearchTool which is derived from the Trk::ITrackHoleSearch interface. The basic functionality has been part of the InDetTrackSummaryHelperTool, but with increasing demands on functionality and complexity, has been sourced out into an AlgTool in its own right, the InDetTrackHoleSearchTool.
 
@@ -23,8 +23,7 @@ In order to work smoothly, the Trk::TrackStateOnSurface objects of a track which
 
 >> Please enter a brief description of the package here.
 
-@section InDetTrackHoleSearchReq Requirements
+@section InDetTrackHoleSearch_InDetTrackHoleSearchReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetTrackScoringTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from InnerDetector/InDetRecTools/InDetTrackScoringTools/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetTrackScoringTools/doc/packagedoc.h
index 4e88f1d6347df0ceed376a2776ce5056e9cfb8dd..299625c5c866d32916d88dc798e0fe571f01399a
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage InDetTrackScoringTools Package
+@page InDetTrackScoringTools_page InDetTrackScoringTools Package
 
 @author Martin Siebel <Martin.Siebel@CERN.ch>
 
-@section MyTestIntro Introduction
+@section InDetTrackScoringTools_MyTestIntro Introduction
 
 This Package contains the InDetAmbiScoringTool which is mainly used in the Ambiguity Processing step of the Inner Detector Track Reconstruction. The Ambiguity Processor needs to assign a score to every track candidate to reflect its quality. The score is provided by this Tool. 
 
@@ -36,8 +36,7 @@ a) Hits in the TRT are not relevant for the ambiguity processing in the InDet re
 b) In the case that a given Track has hits on the first and the third Pixel layer, two track candidates could be formed: One including the innermost hit and one excluding it. The inclusion of the innermost pixel hit automatically introduces also a hole (the missing second layer hit) to the track. The score of a track with two pixel hits and a hole is smaller than the score of a track with only one pixel hit but no holes. This would generally prefer the track without the b-layer information and therefore have a negative impact on the impact parameter measurement. Therefore, a correction is applied which penalizes the solution without the b-Layer hit in this situation.
 
 
-@section MyTestReq Requirements
+@section InDetTrackScoringTools_MyTestReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/doc/packagedoc.h
similarity index 75%
rename from InnerDetector/InDetRecTools/InDetTrackSelectorTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetTrackSelectorTool/doc/packagedoc.h
index 52880b23cfbefaef368a0c93a7376ba5d8c9e10c..e15652f7236e1724df432de2670c90f6931949b3 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
-@mainpage The InDetTrackSelectorTool package
+@page InDetTrackSelectorTool_page The InDetTrackSelectorTool package
 
 @author Andreas.Wildauer@cern.ch
 @author Daniel.Kollar@cern.ch
 
-@section introductionInDetTrackSelectorTool Introduction
+@section InDetTrackSelectorTool_introductionInDetTrackSelectorTool Introduction
 This package contains the concrete implementation of the inner detector track selector tools. The interface can be found
 in Tracking/TrkTools/TrkToolInterfaces.
 
-@section selectorsInDetTrackSelectorTool Selectors
+@section InDetTrackSelectorTool_selectorsInDetTrackSelectorTool Selectors
 The implementations in this package are
 
 - InDetTrackSelector: has mostly cuts on perigee parameters
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 77%
rename from InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/doc/packagedoc.h
index 2a11b3873ce2699b302a92ab3c8b3d42ad03f571..a90beab56b63ec076982a4b429396239e83c9a81
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage InDetTrackSummaryHelperTool Package
+@page InDetTrackSummaryHelperTool_page InDetTrackSummaryHelperTool Package
 
 @author Martin Siebel <Martin.Siebel@CERN.ch>
 
-@section InDetTrackSummaryHelperTool Introduction
+@section InDetTrackSummaryHelperTool_InDetTrackSummaryHelperTool Introduction
 
 The InDetTrackSummaryHelperTool is a helper tool which performs Inner Detector specific tasks for the Trk::TrackSummaryTool. Two methods can be accessed from outside: analyse() and searchForHoles().
 
 The method analyse() basically takes a RIO_OnTrack, a Trk::TrackStateOnSurface, a vector of integers and a bitset. The RIO and the TSOS are true input quantities, the vector and the bitset are modified by analyse() and serve as output. Elements of the vector represent counters for different Trk::TrackSummary information. The analyse() methods increases these counters according to the information obtained from the other input quantities with help of the InDet ID helpers.
 
-@section InDetTrackSummaryHelperTool Requirements
+@section InDetTrackSummaryHelperTool_InDetTrackSummaryHelperTool Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/doc/mainpage.h b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from InnerDetector/InDetRecTools/InDetZVTOPVxFinder/doc/mainpage.h
rename to InnerDetector/InDetRecTools/InDetZVTOPVxFinder/doc/packagedoc.h
index bd6f4197ccdb31324a0e9b99b6607a7e582fc7ac..56adfa7fb47f47df523a172e58ef16e1892aa2f5
--- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage InDetZVTOPVxFinder Package
+@page InDetZVTOPVxFinder_page InDetZVTOPVxFinder Package
 
 Contains:
 - ZVTOP_AmbiguitySolver.cxx (dummy) <br>
@@ -17,13 +17,12 @@ Documentation: David J. Jackson, Nucl.Instrum.Meth.A388: 247-253, 1997
 
 @author Tatjana Lenz <tatjana.lenz@cern.ch>
 
-@section InDetZVTOPVxFinderIntro Introduction
+@section InDetZVTOPVxFinder_InDetZVTOPVxFinderIntro Introduction
 
 This AlgTool reconstructs a set of vertices and associated subset of the charged tracks, the association accords to a vertex probability function which is based on the trajectories and position resolution of the tracks. The track probability function, \f$ f_i \f$ is defined as a Gaussian tube around a track: the width is given by a track covariance (= error) matrix. The vertex probability function is \f$ \sum f_i - \frac{ \sum f_i^2}{\sum f_i} \f$. The job is to search for local maxima of the vertex probability function. So you have to calculate the vertex probability function at euch space point in detector. To reduce the number of spatial points, all possible combinations of two track pairs are build. For each pair the spatial point is calculated (see ZVTOP_SpatialPointFinder), all spatial points are candidates for a vertex. To reduce the number of vertex candidates the vertex candidate cluster are build. The tracks associated with each cluster are fitted, the vertex fitter can be set/changed via jobOptions, default Billoir FullFitter.
 On the fitted VxCandidate some quality cuts can be applied. The result is stored in a VxContainer. 
 
-@section InDetZVTOPVxFinderReq Requirements
+@section InDetZVTOPVxFinder_InDetZVTOPVxFinderReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/doc/mainpage.h b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/doc/packagedoc.h
similarity index 83%
rename from InnerDetector/InDetRecTools/SeedToTrackConversionTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/SeedToTrackConversionTool/doc/packagedoc.h
index babea401ce650c0dbcb67a132b900b29d66d2fb4..3f2e94c4cf4e8fcca48d34605db499cfe0810d81 100644
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage SeedToTrackConversionTool Package
+@page SeedToTrackConversionTool_page SeedToTrackConversionTool Package
 @author Weiming Yao <Weiming.Yao@CERN.CH>
 
-@section SeedToTrackConversionToolIntro Introduction
+@section SeedToTrackConversionTool_SeedToTrackConversionToolIntro Introduction
 
   This is a tool to convert the track seeds as the track collection and saved as SiSPSeedSegments objects in xAOD.
   SiTrackMaker_xk first performs estimation of initial track parameter of seeds using three spacepoints and searches
@@ -21,8 +21,7 @@
    m_seedtotrackconversion->endEvent(); save SiSPSeedSegment objects 
  That's it and send in your feedbacks. 
 
-@section SeedToTrackConversionToolReq Requirements
+@section SeedToTrackConversionTool_SeedToTrackConversionToolReq Requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/doc/mainpage.h b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from InnerDetector/InDetRecTools/SiClusterOnTrackTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/SiClusterOnTrackTool/doc/packagedoc.h
index fb1320ed307eb6221b79b92c58cf49c4756261c3..5e1a989654a1ecf145c3451b6782ae2a355d88d0
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page SiClusterOnTrackTool_page 
 
-@section SiClusterOnTrackToolDocIntro Overview
+@section SiClusterOnTrackTool_SiClusterOnTrackToolDocIntro Overview
 
 This package provides two tools, PixelClusterOnTrackTool and
 SCT_ClusterOnTrackTool, which turn PixelClusters
@@ -18,7 +18,7 @@ the new objects are described below. For more information
 on the concept, design and use of the <nop>RIO_OnTrack creation,
 please look at the Trk::RIO_OnTrackCreator documentation.
 
-@section SiClusterOnTrackToolDocCorr  Corrections
+@section SiClusterOnTrackTool_SiClusterOnTrackToolDocCorr Corrections
 For <b>PixelClusters</b> the information they contain is passed to 
 the RIO_OnTrack object, after applying three kinds of corrections:
 <ul>
@@ -106,7 +106,7 @@ is removed. This behaviour can be restored by setting the job option
 MakeTwoDimBarrelClusters=True.
 
 
-@section ExtrasSiClusterOnTrackTool Extra Pages
+@section SiClusterOnTrackTool_ExtrasSiClusterOnTrackTool Extra Pages
 
  - @ref UsedSiClusterOnTrackTool
  - @ref RequirementsSiClusterOnTrackTool
@@ -114,10 +114,8 @@ MakeTwoDimBarrelClusters=True.
 
 /**
 @page UsedSiClusterOnTrackTool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsSiClusterOnTrackTool Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/doc/mainpage.h b/InnerDetector/InDetRecTools/SiClusterizationTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from InnerDetector/InDetRecTools/SiClusterizationTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/SiClusterizationTool/doc/packagedoc.h
index 45fc1d808dfc54315c9c2f12ddc026af398d8b5b..314e02903c46e2f5f6483366783b9b9fddcdeff3
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
-@mainpage SiClusterizationTool Package
+@page SiClusterizationTool_page SiClusterizationTool Package
 @author Tommaso.Lari@cern.ch
 
-@section siClusterizationTool Introduction
+@section SiClusterizationTool_siClusterizationTool Introduction
 
 This package contains the AlgTools which process 
 Silicon Detector Raw Data Objects and creates 
 InDetPrepRawData (or clusters).
 
-@section SiClusterizationToolOverview Overview
+@section SiClusterizationTool_SiClusterizationToolOverview Overview
 
 These are the classes of the package:
 
@@ -115,11 +115,9 @@ to the cluster, according to the ErrorStrategy flag.
 /**
 
 @page used_SiClusterizationTool Used Packages
-@htmlinclude used_packages.html
 
 */
 
 /**
 @page requirements_SiClusterizationTool requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/doc/mainpage.h b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/doc/mainpage.h
rename to InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/doc/packagedoc.h
index 80305329e2522f03919e9db70763e5d24e873fcb..06434b08ad2c63b300d1d2a86fa3f141f55731b1
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage SiDetElementsRoadTool_xk
+@page SiDetElementsRoadTool_xk_page SiDetElementsRoadTool_xk
 @author Igor.Gavrilenko@cern.ch
-@section SiDetElementsRoadTool_xkIntro Introduction
+@section SiDetElementsRoadTool_xk_SiDetElementsRoadTool_xkIntro Introduction
 
 This tool is concrete implementation for ISiDetElementsRoadMaker
 and is devoted for list<const InDetDD::SiDetectorElement*>&) production. 
@@ -25,7 +25,6 @@ in propagation order and first detector element is closest to beam axis.
      
 This algorithm uses IMagneticFieldTool and IPropagator  tools.
 
-@section  SiDetElementsRoadTool_xkReq  Requirements file
-@include requirements
+@section SiDetElementsRoadTool_xk_SiDetElementsRoadTool_xkReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/SiSpacePointTool/doc/mainpage.h b/InnerDetector/InDetRecTools/SiSpacePointTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 74%
rename from InnerDetector/InDetRecTools/SiSpacePointTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/SiSpacePointTool/doc/packagedoc.h
index 6839478672552932f7490b391f67002fcd79ddd9..85f9265dd04bb594ac455921e01f009bc298aae3
--- a/InnerDetector/InDetRecTools/SiSpacePointTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointTool/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage SiSpacePointTool Package
+@page SiSpacePointTool_page SiSpacePointTool Package
 @author Maria.Jose.Costa@cern.ch (update of the original code from David 
 Candlin)
 
-@section SiSpacePointToolIntro Introduction
+@section SiSpacePointTool_SiSpacePointToolIntro Introduction
 
 This package contains a tool to create a collection of SpacePoints given
 2 cluster collections corresponding to two different SCT wafers or given
@@ -16,14 +16,13 @@ a single cluster collection corresponding to a Pixel module.
 This tool is used by the offline SpacePoint algorithm of the package 
 SiSpacePointFormation and also by the EF algorithms.
 
-@section SiSpacePointToolOverview Algorithm Overview
+@section SiSpacePointTool_SiSpacePointToolOverview Algorithm Overview
   The SiSpacePointTool package contains the following tool:
 
    - SiSpacePointMakerTool: Tool that allows to create a collection of
    SpacePoints given one Pixel cluster collection or two SCT cluster 
    collections. 
 
-@section SiSpacePointToolReq Requirements
+@section SiSpacePointTool_SiSpacePointToolReq Requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/doc/mainpage.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/doc/mainpage.h
rename to InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/doc/packagedoc.h
index 38f2ee1c6ace26db2d9543673493b5b7ad16f85a..e95ad8ca5346241865863b53c17c398b9666d647
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage SiSpacePointsSeedTool_xk
+@page SiSpacePointsSeedTool_xk_page SiSpacePointsSeedTool_xk
 @author Igor.Gavrilenko@cern.ch
-@section SiSpacePointsSeedTool_xkIntro Introduction
+@section SiSpacePointsSeedTool_xk_SiSpacePointsSeedTool_xkIntro Introduction
 
 This tool is concrete implementation for ISiSpacePointsSeedMaker and is devoted for space points seeds production.
 
@@ -34,7 +34,6 @@ exist two addition requariments for this combination.
 
  This algorithm uses IMagneticFieldTool tool.
 
-@section  SiSpacePointsSeedTool_xkReq  Requirements file
-@include requirements
+@section SiSpacePointsSeedTool_xk_SiSpacePointsSeedTool_xkReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/doc/mainpage.h b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from InnerDetector/InDetRecTools/SiTrackMakerTool_xk/doc/mainpage.h
rename to InnerDetector/InDetRecTools/SiTrackMakerTool_xk/doc/packagedoc.h
index cb518348e7eacecac2c057f872c7e6987fd36467..3f20dd51a7583b648019eca3611fe78986d20830
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage SiTrackMakerTool_xk
+@page SiTrackMakerTool_xk_page SiTrackMakerTool_xk
 @author Igor.Gavrilenko@cern.ch
-@section SiTrackMakerTool_xkIntro Introduction
+@section SiTrackMakerTool_xk_SiTrackMakerTool_xkIntro Introduction
 
 This tool is concrete implementation for ISiTrackMaker
 and is devoted for list<Trk::Track*>& production using list<const Trk::SpacePoint*> as input. 
@@ -34,7 +34,6 @@ This track finding algorithm contains 6 steps.
      
 This algorithm uses IMagneticFieldTool, IPropagator, IUpdator, IRIO_OnTrackCreator, ISiDetElementsRoadMaker tools.
 
-@section  SiTrackMakerTool_xkReq  Requirements file
-@include requirements
+@section SiTrackMakerTool_xk_SiTrackMakerTool_xkReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/doc/mainpage.h b/InnerDetector/InDetRecTools/SiZvertexTool_xk/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from InnerDetector/InDetRecTools/SiZvertexTool_xk/doc/mainpage.h
rename to InnerDetector/InDetRecTools/SiZvertexTool_xk/doc/packagedoc.h
index 0358508dfac0e9e4a9bd0facbf71870d10036f68..7368067285713da13b8b45abe06ffb9dab9f6011
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage SiZvertexTool_xk
+@page SiZvertexTool_xk_page SiZvertexTool_xk
 @author Igor.Gavrilenko@cern.ch
-@section SiZvertexTool_xkIntro Introduction
+@section SiZvertexTool_xk_SiZvertexTool_xkIntro Introduction
 
 This tool is concrete implementation for ISiZvertexMaker
 and is devoted for estimation position all primary vertices along beam direction.
@@ -18,7 +18,6 @@ has been filled primary vertices can be detected by simply scanning the contents
      
 This algorithm uses ISiSpacePointsSeedMaker tool for space point seeds production.
 
-@section  SiZvertexTool_xkReq  Requirements file
-@include requirements
+@section SiZvertexTool_xk_SiZvertexTool_xkReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/doc/mainpage.h b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/doc/mainpage.h
rename to InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/doc/packagedoc.h
index 287d2029b17d7618ef6b4d676afb04fedecd3d72..90fe093449a45da8bbc95d0f5672047f09f6d79c
--- a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage TRT_DetElementsRoadTool_xk
+@page TRT_DetElementsRoadTool_xk_page TRT_DetElementsRoadTool_xk
 @author Igor.Gavrilenko@cern.ch
-@section TRT_DetElementsRoadTool_xkIntro Introduction
+@section TRT_DetElementsRoadTool_xk_TRT_DetElementsRoadTool_xkIntro Introduction
 
 This tool is concrete implementation for ITRT_DetElementsRoadMaker
 and is devoted for list<const InDetDD::TRT_BaseElement*>&) or list<std::pair<const InDetDD::TRT_BaseElement*,const Trk::TrackParameters*> >&) 
@@ -26,7 +26,6 @@ in propagation order and first detector element is closest to beam axis.
      
 This algorithm uses IMagneticFieldTool and IPropagator tools.
 
-@section  TRT_DetElementsRoadTool_xkReq  Requirements file
-@include requirements
+@section TRT_DetElementsRoadTool_xk_TRT_DetElementsRoadTool_xkReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/doc/mainpage.h b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/doc/packagedoc.h
index 54b1633ad6b98cb197ffa7804fe72b40f3eb56ae..2e92f99ae0afb1911296f34a99275c0e82c87464
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page TRT_DriftCircleOnTrackTool_page 
 
-@section TrtDriftCircleOnTrackToolDoc Overview
+@section TRT_DriftCircleOnTrackTool_TrtDriftCircleOnTrackToolDoc Overview
 
 When making the TRT RIO_OnTrack, the tool currently provides
 <ul>
@@ -31,7 +31,7 @@ and the r-T relation for individual tubes.
 More general information on <nop>RIO_OnTrackCreation and instructions
 how to use these tools can be found under Trk::RIO_OnTrackCreator.
 
-@section TrtDriftCircleOnTrackToolDocMgr Package Managers
+@section TRT_DriftCircleOnTrackTool_TrtDriftCircleOnTrackToolDocMgr Package Managers
 The TRT_DriftCircleOnTrackTool package is currently maintained by
 I. Gavrilenko.
 */
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/doc/mainpage.h b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 75%
rename from InnerDetector/InDetRecTools/TRT_DriftCircleTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/TRT_DriftCircleTool/doc/packagedoc.h
index c3c4fcdb4361458c62c6f55f48e7ddec731b6eef..d5279b8e7a599dee5425534578dc06e636bd435a
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage TRT_DriftCircleTool package
+@page TRT_DriftCircleTool_page TRT_DriftCircleTool package
 
 @author phansen@nbi.dk
 
-@section TRT_DriftCircleToolIntro Introduction
+@section TRT_DriftCircleTool_TRT_DriftCircleToolIntro Introduction
 This package makes a DriftCircle collection from an RDO collection.
 It also performs trigger-phase corrections depending on the kind
 of trigger (cosmics/CTB).
 
-@section  TRT_DriftCircleToolOverview Class Overview
+@section TRT_DriftCircleTool_TRT_DriftCircleToolOverview Class Overview
 
   - InDet::TRT_DriftCircleTool : converts RDO coll to DriftCircle coll
   - InDet::TRT_DriftCircleToolCosmics : with appropiate phase corrections
@@ -28,7 +28,6 @@ of trigger (cosmics/CTB).
 
 @page used_TRT_DriftCircleTool Used Packages
 
-@htmlinclude used_packages.html
 
 */
 
@@ -36,6 +35,5 @@ of trigger (cosmics/CTB).
 
 @page requirements_TRT_DriftCircleTool requirements
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/doc/mainpage.h b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from InnerDetector/InDetRecTools/TRT_DriftFunctionTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/TRT_DriftFunctionTool/doc/packagedoc.h
index 57f5c49f9a789b8caf92969a120aaf26e9612ee4..9ad3491a939d652a77e10b3cdffa68e0babfb099
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/doc/packagedoc.h
@@ -3,21 +3,21 @@
 */
 
 /**
-@mainpage TRT_DriftFunctionTool package
+@page TRT_DriftFunctionTool_page TRT_DriftFunctionTool package
 
 @author phansen@nbi.dk
 
-@section TRT_DriftFunctionToolIntro Introduction
+@section TRT_DriftFunctionTool_TRT_DriftFunctionToolIntro Introduction
 
 This package provides DriftCircle data from RDO.
 It transforms a raw drift time digit into a calibrated
 drift radius using various conditions data.
 
-@section  TRT_DriftFunctionToolOverview Class Overview
+@section TRT_DriftFunctionTool_TRT_DriftFunctionToolOverview Class Overview
 
  - TRT_DriftFunctionTool : called from TRT_DriftCircleTool
 
-@section  TRT_DriftFunctionOptions jobOptions
+@section TRT_DriftFunctionTool_TRT_DriftFunctionOptions jobOptions
 
  - AllowDigiVersionOverride : Permit using the Rt relation of another digi version 
  - ForcedDigiVersion : the other digi version (an integer)
@@ -41,11 +41,9 @@ drift radius using various conditions data.
 /**
 @page used_TRT_DriftFunctionTool Used Packages
 
-@htmlinclude used_packages.html
 
 */
 /**
 @page requirements_TRT_DriftFunctionTool requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/doc/mainpage.h b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/doc/packagedoc.h
index eae226d00be4d6f52ca7244f9ecda60e525e1fc9..033b2bad1400c24aea57fff93c069a40a84c702c
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage TRT_SeededSpacePointFinderTool
+@page TRT_SeededSpacePointFinderTool_page TRT_SeededSpacePointFinderTool
 @author Thomas.Koffas@cern.ch
 
-@section TRT_SeededSpacePointFinderToolIntro Introduction
+@section TRT_SeededSpacePointFinderTool_TRT_SeededSpacePointFinderToolIntro Introduction
 
 This tool is concrete implementation for ITRT_SeeedSpacePointFinder.h
 It returns a list of pairs of space points on the last two/three SCT layers.
@@ -17,7 +17,7 @@ for extending the initial TRT track segments into the Si ID.
 
 Two different implementations are provided with this package: TRT_SeededSpacePointFinderTool and SimpleTRT_SeededSpacePointFinderTool, both following different approaches to obtain the seeding pairs  
 
-@section TRT_SeededSpacePointFinderToolDescription Description
+@section TRT_SeededSpacePointFinderTool_TRT_SeededSpacePointFinderToolDescription Description
 
 The TRT_SeededSpacePointFinderTool contains the following steps:
 
@@ -68,13 +68,13 @@ The SimpleTRT_SeededSpacePointFinderTool follows this approach:
 3) The pairs of Trk::SpacePoint are build. Only Trk::SpacePoint from different layers or wheels are paired. Which layers and/or wheels are paired is determined by a look-up table which contains all allowed combinations of wheels and layers for a given TRT ring on which the incoming Trk::TrackParameter of the TRT-segment is located. All possible combinations of Trk::SpacePoint for every allowed combination of two layers/wheels are tried, but only those are filled into the output buffer which fulfill minimum requirements on the quality of the pairing. 
 
 
-@section TRT_SeededSpacePointFinderTools Used Tools
+@section TRT_SeededSpacePointFinderTool_TRT_SeededSpacePointFinderTools Used Tools
 
 The TRT_SeededSpacePointFinderTool uses the IMagneticFieldTool, InDetAssociationTool tools.
 
 The SimpleTRT_SeededSpacePointFinderTool uses the InDetAssociationTool tool, the TRT_ID and SCT_ID helpers and the RegionSelectorService.
 
-@section TRT_SeededSpacePointFinderToolContents Contents
+@section TRT_SeededSpacePointFinderTool_TRT_SeededSpacePointFinderToolContents Contents
 
 This tool contains the following implementations:
 
@@ -82,11 +82,9 @@ This tool contains the following implementations:
 
 - SimpleTRT_SeededSpacePointFinder_ATL.cxx... Form SP seeds based mainly on geometrical arguments.
 
-@section TRT_SeededSpacePointFinderToolPackages Used Packages
+@section TRT_SeededSpacePointFinderTool_TRT_SeededSpacePointFinderToolPackages Used Packages
 
-@htmlinclude used_packages.html
 
-@section  TRT_SeededSpacePointFinderToolReq  Requirements file
-@include requirements
+@section TRT_SeededSpacePointFinderTool_TRT_SeededSpacePointFinderToolReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/doc/mainpage.h b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/doc/mainpage.h
rename to InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/doc/packagedoc.h
index c51850d29544d5eafaa10f22bdd311e05a2c3ccd..7f0b6e6c832d6465bed2b9960ab2f161d426f847
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage TRT_SeededTrackFinderTool
+@page TRT_SeededTrackFinderTool_page TRT_SeededTrackFinderTool
 @author Thomas.Koffas@cern.ch
 
-@section TRT_SeededTrackFinderToolIntro Introduction
+@section TRT_SeededTrackFinderTool_TRT_SeededTrackFinderToolIntro Introduction
 
 This tool is concrete implementation for ITRT_SeeedTrackFinder.h
 The input is a track segment, for example a TRT track segment
@@ -15,7 +15,7 @@ It returns a list of tracks that in principle span the full lenght of the Si ID.
 This tool is the main logic for finding Si extensions to stand alone TRT segments.
 It is called by the back TRacking algorithm TRT_SeededTrackFinder
 
-@section TRT_SeededTrackFinderToolDescription Tool Description
+@section TRT_SeededTrackFinderTool_TRT_SeededTrackFinderToolDescription Tool Description
 
 The TRT seeded track finder tool contains the following steps:
 
@@ -77,12 +77,12 @@ The TRT seeded track finder tool contains the following steps:
    initial TRT segment track parameters and repeat the track search. This is decided again via job options.
    It is set to false by default.
 
-@section TRT_SeededTrackFinderToolTools Used Tools
+@section TRT_SeededTrackFinderTool_TRT_SeededTrackFinderToolTools Used Tools
 
 This tool uses IMagneticFieldTool, IPropagator, IUpdator, ISiDetElementsRoadMaker, ITRT_SeededSpacePointFinder,
 ISiCombinatorialTrackFinder tools.
 
-@section TRT_SeededTrackFinderToolContents Tool Contents
+@section TRT_SeededTrackFinderTool_TRT_SeededTrackFinderToolContents Tool Contents
 
 The TRT_SeededTrackFinderTool contains the following classes/files:
 
@@ -90,11 +90,9 @@ The TRT_SeededTrackFinderTool contains the following classes/files:
 
 - SiNoise_bt.cxx... Noise adding routine due to detector material
 
-@section TRT_SeededTrackFinderToolPackagess Used Packages
+@section TRT_SeededTrackFinderTool_TRT_SeededTrackFinderToolPackagess Used Packages
 
-@htmlinclude used_packages.html
 
-@section  TRT_SeededTrackFinderToolReq  Requirements file
-@include requirements
+@section TRT_SeededTrackFinderTool_TRT_SeededTrackFinderToolReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/doc/mainpage.h b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/doc/mainpage.h
rename to InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/doc/packagedoc.h
index 79ba6289ef628f1f8999b470c507067b15f8c318..291cea3dddcd4f68da91687e073214c115ee1049
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage The TRT_TrackExtensionTool_DAF package
+@page TRT_TrackExtensionTool_DAF_page The TRT_TrackExtensionTool_DAF package
 Tool to extend Silicon tracks into the TRT based on the Deterministic Annealing Filter.
 
 @author Sebastian.Fleischmann@cern.ch
 
-@section introductionTRT_TrackExtensionTool_DAF Introduction
+@section TRT_TrackExtensionTool_DAF_introductionTRT_TrackExtensionTool_DAF Introduction
 
 This package contains a tool to produce a vector of InDet::CompetingTRT_DriftCirclesOnTrack
 which can be used by the InDetExtensionProcessor to extend silicon tracks into the TRT.
@@ -38,13 +38,13 @@ the track is not perpendicular to the detector elements anymore.
 @image html TRT-extension-detElement-wise.png
 
 
-@section TRT_TrackExtensionTool_DAFOverview Class Overview
+@section TRT_TrackExtensionTool_DAF_TRT_TrackExtensionTool_DAFOverview Class Overview
   The TRT_TrackExtensionTool_DAF package contains the following class:
 
   - InDet::TRT_TrackExtensionTool_DAF : Tool to collect the compatible measurements
        in InDet::CompetingTRT_DriftCirclesOnTrack.
 
-@section howToUseTRT_TrackExtensionTool_DAF How to use the TRT_TrackExtensionTool_DAF
+@section TRT_TrackExtensionTool_DAF_howToUseTRT_TrackExtensionTool_DAF How to use the TRT_TrackExtensionTool_DAF
 The Trk::TRT_TrackExtensionTool_DAF can be configured by the Python setup class <tt>ConfiguredTRT_TrackExtensionTool_DAF</tt> which is defined in <tt><a href="ConfiguredTRT__TrackExtensionTool__DAF_8py-source.html">ConfiguredTRT_TrackExtensionTool_DAF.py</a></tt>.It is important to configure the InDetExtensionProcessor to use the TrkDeterministicAnnealingFilter as TrackFitter. This can be done by the Python setup class <tt>ConfiguredInDetExtensionProcessor</tt>.
 
 
@@ -81,7 +81,7 @@ The Trk::TRT_TrackExtensionTool_DAF can be configured by the Python setup class
   <DT>MaxGroupDistance
   <DD>maximum distance of TRT_DriftCircle groups when using the sophisticated grouping method. Default: <tt>5.</tt>
 
-@section ExtrasTRT_TrackExtensionTool_DAF Extra Pages
+@section TRT_TrackExtensionTool_DAF_ExtrasTRT_TrackExtensionTool_DAF Extra Pages
 
  - @ref UsedTRT_TrackExtensionTool_DAF
  - @ref requirementsTRT_TrackExtensionTool_DAF
@@ -89,10 +89,8 @@ The Trk::TRT_TrackExtensionTool_DAF can be configured by the Python setup class
 
 /**
 @page UsedTRT_TrackExtensionTool_DAF Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTRT_TrackExtensionTool_DAF Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/doc/mainpage.h b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/doc/mainpage.h
rename to InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/doc/packagedoc.h
index 1bf3d125b06b4fc24fd9fb145689f02a690cd0ea..287d0708d447193608b8eeab334f5c54fa306375
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage TRT_TrackExtensionTool_xk
+@page TRT_TrackExtensionTool_xk_page TRT_TrackExtensionTool_xk
 @author Igor.Gavrilenko@cern.ch
-@section TRT_TrackExtensionTool_xkIntro Introduction
+@section TRT_TrackExtensionTool_xk_TRT_TrackExtensionTool_xkIntro Introduction
 
 This tool is concrete implementation for ITRT_TrackExtensionTool
 and is devoted for vector<const Trk::MeasurementBase*>& production using Trk::TrackParameters& after
@@ -48,7 +48,6 @@ This TRT track extention algorithm contains next steps.
      
 This algorithm uses IMagneticFieldTool, IPropagator, ITRT_DetElementsRoadMaker, IRIO_OnTrackCreator tools.
 
-@section  TRT_TrackExtensionTool_xkReq  Requirements file
-@include requirements
+@section TRT_TrackExtensionTool_xk_TRT_TrackExtensionTool_xkReq Requirements file
 
 */
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/doc/mainpage.h b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/doc/mainpage.h
rename to InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/doc/packagedoc.h
index 54b558b6bbc2c8d608d62a28f56bd7adf685e9f0..084f138786973945ac23ffe3c0e6403a1e8e3c91
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/doc/mainpage.h
+++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage TRT_TrackSegmentsTool_xk
+@page TRT_TrackSegmentsTool_xk_page TRT_TrackSegmentsTool_xk
 @author Igor.Gavrilenko@cern.ch
-@section TRT_TrackSegmentsTool_xkIntro Introduction
+@section TRT_TrackSegmentsTool_xk_TRT_TrackSegmentsTool_xkIntro Introduction
 
 This tool is concrete implementation for ITRT_TrackSegmentsMaker and is devoted for TRT track segments production.
 
@@ -24,8 +24,7 @@ Global pattern recognition step uses the Hough transformation and historamming m
 local step contains straight linde finding algorithm.
 This algorithm uses IMagneticFieldTool, IPropagator, ITRT_DetElementsRoadMaker and ITRT_TrackExtensionTool tools.
 
-@section  TRT_TrackSegmentsTool_xkReq  Requirements file
-@include requirements
+@section TRT_TrackSegmentsTool_xk_TRT_TrackSegmentsTool_xkReq Requirements file
 
 */
 
diff --git a/InnerDetector/InDetSimEvent/doc/mainpage.h b/InnerDetector/InDetSimEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from InnerDetector/InDetSimEvent/doc/mainpage.h
rename to InnerDetector/InDetSimEvent/doc/packagedoc.h
index 8aaca7b522aa5afcddd6eac8ee64c3f21ffd714d..467d93b5270fea05154b042db8b71709e47e9bc3
--- a/InnerDetector/InDetSimEvent/doc/mainpage.h
+++ b/InnerDetector/InDetSimEvent/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage Package InDetSimEvent
+@page InDetSimEvent_page Package InDetSimEvent
 @author Davide.Costanzo@cern.ch
 
-@section InDetSimEvent Introduction
+@section InDetSimEvent_InDetSimEvent Introduction
 
 This package contains the EDM classes for the Inner Detector simulation. 
 There are three type of classes in this package:
@@ -20,18 +20,18 @@ The first two should NOT be changed, unless there is a very specific reason. In
 events have been simulated and written out with pool since release 8 and a change in these
 classes may result in a big loss (like all of DC2)
 
-@section The hit classes
+@section InDetSimEvent_The hit classes
 The hit classes are:
   - SiHit: hits in the Pixel/SCT and SiHitCollection
   - TRTUncompressedHit: hits in the TRT and TRTUncompressedHitColection
   - TRTHit and TRTHitCollection. Legacy
 
-@section The hit simulation helper classes
+@section InDetSimEvent_The hit simulation helper classes
 There are two of them. These classes should be used to interpret a geometry information and produce an integer:
   - SiHitIdHelper
   - TRTHitIdHelper
 
-@section Other stuff
+@section InDetSimEvent_Other stuff
 SiCharge and SiTotalCharge are transient classes used by the Pixel and SCT digitization when charges are created as a result of the 
 processing of the Geant hits. 
 */
diff --git a/InnerDetector/InDetSimUtils/TRT_PAI_Process/doc/mainpage.h b/InnerDetector/InDetSimUtils/TRT_PAI_Process/doc/packagedoc.h
similarity index 88%
rename from InnerDetector/InDetSimUtils/TRT_PAI_Process/doc/mainpage.h
rename to InnerDetector/InDetSimUtils/TRT_PAI_Process/doc/packagedoc.h
index bd17c7bcaef3fefca19578ebd570a819cac0444d..653fe140e41ca08aeab6add384443b645c8e58fd 100644
--- a/InnerDetector/InDetSimUtils/TRT_PAI_Process/doc/mainpage.h
+++ b/InnerDetector/InDetSimUtils/TRT_PAI_Process/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage TRT_PAI_Process Package
+@page TRT_PAI_Process_page TRT_PAI_Process Package
 
 Ionization of TRT gas via the Photon Absorption Ionization model.
 
 @author Originally implemented in age FORTRAN by Pavel Nevski.
         Adapted to C++ by T.Kittelmann/Mogens Dam.
 
-@section IntroductionTRT_PAI_Process Introduction
+@section TRT_PAI_Process_IntroductionTRT_PAI_Process Introduction
 
 The main reference for this implementation is
 - V.M.Grishin, V.K.Ermilova, and S.K.Kotelnikov, NIM A307 (1991) 273-278.
@@ -23,7 +23,7 @@ Other references to the PAI model are
 @note Internally this package uses the original units of the fortran version.
       The external world sees CLHEP units.
 
-@section OverviewTRT_PAI_Process Class Overview
+@section TRT_PAI_Process_OverviewTRT_PAI_Process Class Overview
   The TRT_PAI_Process package contains of following classes:
 
   - TRT_PAI_Process:      main class for the PAI model.
@@ -42,10 +42,8 @@ Other references to the PAI model are
 
 /**
 @page used_Package Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TRT_PAI_Process Requirements
-@include requirements
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 69%
rename from InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/doc/packagedoc.h
index 2aaf331e4b891e03b126fdb7f2da7eb04d3033ec..761c7a60db70cd453edef1cc7e7215afbaa7a5e6
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage InDetTrigAmbiguitySolver
+@page InDetTrigAmbiguitySolver_page InDetTrigAmbiguitySolver
 
 
-@section Introduction
+@section InDetTrigAmbiguitySolver_Introduction 
 
 InDetTrigAmbiguitySolver is a trigger interface to the offline
 TrkAmbiguityProcessor which resolves ambiguities in a given
@@ -23,10 +23,8 @@ More information on processing ambiguities is given in the
 TrkAmbiguityProcessor documentation.
 
  
-@section used_packagesInDetTrigAmbiguitySolver Used packages
-@htmlinclude used_packages.html
+@section InDetTrigAmbiguitySolver_used_packagesInDetTrigAmbiguitySolver Used packages
 
-@section ReqInDetTrigAmbiguitySolver Requirements
-@include requirements
+@section InDetTrigAmbiguitySolver_ReqInDetTrigAmbiguitySolver Requirements
 
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/doc/packagedoc.h
similarity index 71%
rename from InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/doc/packagedoc.h
index 717b9a86757712ba1b85c2584f89e30adf45aa76..a5def2a7403dbb129fc1f2482b100e4bc5c5c3c5 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/doc/packagedoc.h
@@ -3,20 +3,20 @@
 */
 
 /**
-\mainpage InDetTrigConversionFinder
+@page InDetTrigConversionFinder_page InDetTrigConversionFinder
 
-\section introduction Introduction:
+@section InDetTrigConversionFinder_introduction Introduction:
 InDetTrigConversionFinder is a package which contains algorithm to reconstruct conversions. The only job now is to call a vertex finder tool - InDetConversionFinderTool. (see InnerDetector/InDetRecTools/InDetConversionFinderTools)
 All units are in mm and MeV.
 
-\section howitworks How it works:
+@section InDetTrigConversionFinder_howitworks How it works:
 The algorithm InDetConversion.cxx is a prototype usecase of the InDetConversionFinderTools package. This tool reconstructs conversions in the InnerDetector. The performance of the conversion reconstruction depends stronlgy on the BackTracking performace and the choosen cuts.
 
-\section packagecontent Package Contents:
+@section InDetTrigConversionFinder_packagecontent Package Contents:
 InDetTrigConversionFinder contains the following files/classes:
 -TrigConversionFinder.cxx
 
-\section jobOptions The jobOptions file:
+@section InDetTrigConversionFinder_jobOptions The jobOptions file:
 Remark: the algorithm is configured via automatic generated python scripts (genConf) <br>
 All values shown are <b>default</b> values, i.e. if nothing is specified in the jobOptions
 the algorithm will use this default value.
@@ -24,11 +24,9 @@ the algorithm will use this default value.
 <li>Specify the name of IVertexFinder:<br>
     <b>''VertexFinderTool' : PublicToolHandle('InDet::InDetConversionFinderTools') </b></li>
 </ul>
-\section used_packagesInDetTrigConversionFinder used packages
-@htmlinclude used_packages.html
+@section InDetTrigConversionFinder_used_packagesInDetTrigConversionFinder used packages
 
-\section requirements Requirements
-@include requirements
+@section InDetTrigConversionFinder_requirements Requirements
 
 \namespace Vtx
 A namespace for all vertexing packages and related stuff.
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/doc/packagedoc.h
index 48ddbb44027c176dcddac1250038133643026502..02f197ecd7ce82d04551024d4dc894b3ec6c19b0
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage The InDetTrigExtensProcessor
+@page InDetTrigExtensProcessor_page The InDetTrigExtensProcessor
 
-@section Introduction
+@section InDetTrigExtensProcessor_Introduction 
 
 InDetTrigExtensProcessor is an EF trigger version of
 InDetExtensionProcessor. The task of the InDetTrigExtensProcessor is
@@ -22,8 +22,6 @@ collection. If the score is worse the TRT hits are added as outliers
 default uses Trk::KalmanFitter InDetTrigTrackFitter and
 Trk::TrackScoringTool InDetTrigScoringTool as underlying tools.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 66%
rename from InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/doc/packagedoc.h
index 744d93b09c666065f0f11ce95d4dec0558a4878d..e456e85937cfb6838d3d306c3b0b6c7c1f828e87
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-\mainpage InDetTrigParticleCreation
+@page InDetTrigParticleCreation_page InDetTrigParticleCreation
 
-\section introduction Introduction: 
+@section InDetTrigParticleCreation_introduction Introduction:
 
 InDetTrigParticleCreation is the last algorithm of the Event Filter
 InnerDetector software chain. It combines information from previous
 algorithms and creates TrackParticles.
 
-\section howitworks How it works:
+@section InDetTrigParticleCreation_howitworks How it works:
 
 The only algorithm of the package is TrigParticleCreator. For each RoI
 it reads all tracks from StoreGate, all tracks used in the primary
@@ -20,15 +20,13 @@ constructed with the primary vertex. If its track has been used for
 the primary vertex fit the TrackParticleOrigin enum will be set to
 Rec::PriVtx, if not it will be set to Rec::NoVtx.
 
-\section packagecontent Package Contents:
+@section InDetTrigParticleCreation_packagecontent Package Contents:
 InDetTrigParticleCreation contains the following files/classes:
 - TrigParticleCreator.cxx ... the algoritm which creates particles
 
-\section used_packagesInDetTrigParticleCreation used packages
-@htmlinclude used_packages.html
+@section InDetTrigParticleCreation_used_packagesInDetTrigParticleCreation used packages
 
-\section requirements Requirements
-@include requirements
+@section InDetTrigParticleCreation_requirements Requirements
 
 \namespace PCreate
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/packagedoc.h
index 8d32910a9ae38261cdfe48b8ef1d3001027a409c..79c87f2a3e3e7e5c153251b5f0d81a5c67e0e297
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage InDetTrigPrepRawDataFormat Package
+@page InDetTrigPrepRawDataFormat_page InDetTrigPrepRawDataFormat Package
 @author Tommaso.Lari@cern.ch
 
-@section InDetTrigPrepRawDataFormatIntro Introduction
+@section InDetTrigPrepRawDataFormat_InDetTrigPrepRawDataFormatIntro Introduction
 
 This package is an HLT wrapper. Its equivalent is
 InDetPrepRawDataFormation in the offline reconstruction.  This package
 manages the creation of InDetPrepRawData objects for the Inner
 Detector.
 
-@section InDetTrigPrepRawDataFormatOverview Overview
+@section InDetTrigPrepRawDataFormat_InDetTrigPrepRawDataFormatOverview Overview
 
 There are three classes, all of them Algorithms:
 
@@ -79,11 +79,9 @@ They can be changed via jobOptions.
 </ul>
 
 
-\section used_InDetTrigPrepRawDataFormat Used Packages
-@htmlinclude used_packages.html
+@section InDetTrigPrepRawDataFormat_used_InDetTrigPrepRawDataFormat Used Packages
 
-\section requirements_InDetTrigPrepRawDataFormat requirements
-@include requirements
+@section InDetTrigPrepRawDataFormat_requirements_InDetTrigPrepRawDataFormat requirements
 
 
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/doc/packagedoc.h
index 4e40b8318d637a890dafd0d3734de056901c99fd..eab4163da1fe09fce80b5ebf3f7a910ed640c7b7
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-\mainpage InDetTrigPriVxFinder 
+@page InDetTrigPriVxFinder_page InDetTrigPriVxFinder
 
-\section introduction Introduction: InDetTrigPriVxFinder is a package
+@section InDetTrigPriVxFinder_introduction Introduction: InDetTrigPriVxFinder is a package
 which contains algorithm(s) to calculate the primary vertex of an
 event and to store the results to storegate. It makes use of the
 Billoir fitting method.  All units are in mm and MeV.
 
-\section howitworks How it works: The algorithm TrigVxPrimary.cxx is a
+@section InDetTrigPriVxFinder_howitworks How it works: The algorithm TrigVxPrimary.cxx is a
 prototype usecase of the mathematical billoir fit AlgTools of the
 VxBilloirTools package. It is a typical <i>tear down</i> algorithm. It
 reads all tracks from StoreGate, applies some quality cut based track
@@ -38,15 +38,13 @@ The algorithm monitors numbers of input tracks and of
 reconstructed vertices. Further information about the underlying tool
 can be found in InDetPriVxFinder.
  
-\section packagecontent Package Contents:
+@section InDetTrigPriVxFinder_packagecontent Package Contents:
 InDetTrigPriVxFinder contains the following files/classes:
 - TrigVxPrimary.cxx ... the algoritm which steers the vertex fit
 
-\section used_packagesInDetTrigPriVxFinder used packages 
-@htmlinclude used_packages.html
+@section InDetTrigPriVxFinder_used_packagesInDetTrigPriVxFinder used packages
 
-\section requirements Requirements
-@include requirements
+@section InDetTrigPriVxFinder_requirements Requirements
 
 \namespace Vtx
 A namespace for all vertexing packages and related stuff.
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 50%
rename from InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/doc/packagedoc.h
index d3dc479729d5d3153c93116a6136a01a2e44ead7..b0a69fb59538f7c763fcf2f98d920484431e8e6e
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/doc/packagedoc.h
@@ -4,16 +4,15 @@
 
 /**
 
-@mainpage InDetTrigTrackPRD_Association
+@page InDetTrigTrackPRD_Association_page InDetTrigTrackPRD_Association
 @author Markus.Elsing@cern.ch, Igor.Gavrilenko@cern.ch
-@section InDetTrigTrackPRD_AssociationIntro Introduction
+@section InDetTrigTrackPRD_Association_InDetTrigTrackPRD_AssociationIntro Introduction
 
 This algorithm is devoted to track - PRD assocoation.
 
 This algorithm uses Trk::IPRD_AssociationTool
 
-@section  InDetTrigTrackPRD_AssociationReq  Requirements file
-@include requirements
+@section InDetTrigTrackPRD_Association_InDetTrigTrackPRD_AssociationReq Requirements file
 
 */
 
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/doc/packagedoc.h
index 63f81b76e42b2f214c25d4ed536f6f92a548b29c..94726e8cfa1060e0dec4c61b0f109a4246e66160
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage InDetTrigTruthAlgs Package equivalent of InDetTruthAlgs in the offline
+@page InDetTrigTruthAlgs_page InDetTrigTruthAlgs Package equivalent of InDetTruthAlgs in the offline
 @author Maria.Jose.Costa@cern.ch, Andreas.Wildauer@cern.ch
 @author Iwona.Grabowska@cern.ch (adapted to the Event Filter trigger)
 
-@section InDetTrigTruthAlgsIntro Introduction
+@section InDetTrigTruthAlgs_InDetTrigTruthAlgsIntro Introduction
 
 This package contains the algorithms to create the truth objects and the
 maps objects that connect the truth and the reconstructed objects.
@@ -23,7 +23,7 @@ the creation of the reconstructed object.
 Note that a decision is taken in the algorithms filling the truth since 
 the information of all the other sources that also contribute is lost.
 
-@section InDetTrigTruthAlgsOverview Algorithm Overview
+@section InDetTrigTruthAlgs_InDetTrigTruthAlgsOverview Algorithm Overview
   The InDetTrigTruthAlgs package contains the following algorithms:
 
    - InDetPrepRawDataTruthMaker called directly from the offline by
@@ -45,7 +45,6 @@ the information of all the other sources that also contribute is lost.
    TrackParticleTruth and fills both objects in a map. It is based on
    the truth of the Track contained in the TrackParticle.
 
-@section InDetTrigTruthAlgsReq Requirements
+@section InDetTrigTruthAlgs_InDetTrigTruthAlgsReq Requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/doc/packagedoc.h
similarity index 88%
rename from InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/doc/packagedoc.h
index 794f87ecc82be833f454fb9f0a9d556bf95cb049..0e2f07ae4efb51edbc15a89b0409ab61c88f16e6 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage InDetTrigVxSecondary package
+@page InDetTrigVxSecondary_page InDetTrigVxSecondary package
 
 @author Andrew John Lowe
 
-@section Introduction Introduction
+@section InDetTrigVxSecondary_Introduction Introduction
 InDetTrigVxSecondary makes secondary vertex reconstruction
 available at the EF. This has been done primarily for the b-jet
 trigger slice, but may also have applications in triggers for
 long-lived particles with displaced vertices as a signature.
 
-@section Details Functional details
+@section InDetTrigVxSecondary_Details Functional details
 The package contains a feature extraction (FEX) algorithm, which
 iteratively calls the offline vertexing tool(s) defined in a
 ToolHandleArray and records the vertices found in a way that enables
@@ -50,7 +50,7 @@ information not available in VxCandidate:
 In the default running mode, a single vertex finder is run:
 InDetVKalVxInJetTool.
 
-@section InDetVKalVxInJetTool InDetVKalVxInJetTool: a short description
+@section InDetTrigVxSecondary_InDetVKalVxInJetTool InDetVKalVxInJetTool: a short description
 
 InDetVKalVxInJetTool is a vertex finder that uses VKalVrt as the
 vertex fitting engine. VKalVrt is a universal package for any vertex
@@ -67,7 +67,6 @@ a given vertex candidate and fit again. Please refer to the
 documentation for InDetVKalVxInJetTool for further details specific to
 the default offline vertex finder.
 
-@section InDetTrigVxSecondaryReq Requirements
+@section InDetTrigVxSecondary_InDetTrigVxSecondaryReq Requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 71%
rename from InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/doc/packagedoc.h
index ef68c4b9527c567ecbd0f3f54e1a2c314b82f2b1..cce3fdc613f4a9f666dcff31b14b88a2b9c80c2a
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage SiTrigSPSeededTrackFinder
+@page SiTrigSPSeededTrackFinder_page SiTrigSPSeededTrackFinder
 @author Markus.Elsing@cern.ch, Igor.Gavrilenko@cern.ch
-@section SiTrigSPSeededTrackFinderIntro Introduction
+@section SiTrigSPSeededTrackFinder_SiTrigSPSeededTrackFinderIntro Introduction
 
 This algorithms is a trigger seeded version of SiSPSeededTrackFinder.
 It is devoted to track finding using Pixels and SCT
@@ -24,10 +24,8 @@ It can operate in RoI driven or full-scan mode (m_doFullScan). In the
 latter RegionSelector is used to obtain list of SCT and Pixel detector
 elements.
 
-\section used_packagesSiTrigSPSeededTrackFinder Used packages 
-@htmlinclude used_packages.html
+@section SiTrigSPSeededTrackFinder_used_packagesSiTrigSPSeededTrackFinder Used packages
 
-@section  SiTrigSPSeededTrackFinderReq  Requirements file
-@include requirements
+@section SiTrigSPSeededTrackFinder_SiTrigSPSeededTrackFinderReq Requirements file
 
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 80%
rename from InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/doc/packagedoc.h
index cf0a1726fa8e4d80f4616e564d9c621f6c9c4c41..2e0c60ac69568f33c892726a84140872e4ebca1f
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage SiTrigSpacePointFormation Package
+@page SiTrigSpacePointFormation_page SiTrigSpacePointFormation Package
 @author Maria.Jose.Costa@cern.ch (update of the original code from David 
 Candlin)
 
-@section SiTrigSpacePointFormationIntro Introduction
+@section SiTrigSpacePointFormation_SiTrigSpacePointFormationIntro Introduction
 
 This package is the Event Filter version of the offline
 SiSpacePointFormation which contains the algorithm to create Space
@@ -17,7 +17,7 @@ SCT it combines the 1-dimensional information of two SCT clusters into
 a Space Point.  This algorithm is used in the online Event Filter
 reconstruction.
 
-@section SiTrigSpacePointFormationOverview Algorithm Overview
+@section SiTrigSpacePointFormation_SiTrigSpacePointFormationOverview Algorithm Overview
   The SiTrigSpacePointFormation package contains the following algorithms:
 
    - SiTrigSpacePointFinder: It retrieves all the Pixels and SCT clusters
@@ -32,7 +32,6 @@ reconstruction.
    SiElementProperties in order to access, for the SCT, the backside wafer
    of a given module and the neighbour ones from other modules.
 
-@section SiTrigSpacePointFormationReq Requirements
+@section SiTrigSpacePointFormation_SiTrigSpacePointFormationReq Requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/doc/packagedoc.h
index a99a42b7c2bd1467d881c5935cc65cfbc4f06d83..a756035c44f876c5b52e81e210f3a1f732ae8fb2
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage TRT_TrigSeededTrackFinder
+@page TRT_TrigSeededTrackFinder_page TRT_TrigSeededTrackFinder
 @author Iwona.Grabowska@cern.ch
-@section TRT_TrigSeededTrackFinderIntro Introduction
+@section TRT_TrigSeededTrackFinder_TRT_TrigSeededTrackFinderIntro Introduction
 
 This is the algorithm for driving the back tracking through the Si part of the ID.
 The input are TRT track segments or TRT xKalman stand alone tracks (configured via
@@ -27,10 +27,8 @@ This algorithm performs the following tasks:
     track fitter.</li>
 </ul>
 
-@section used_packagesTRT_TrigSeededTrackFinder used packages 
-@htmlinclude used_packages.html
+@section TRT_TrigSeededTrackFinder_used_packagesTRT_TrigSeededTrackFinder used packages
 
-@section  TRT_TrigSeededTrackFinder Req  Requirements file
-@include requirements
+@section TRT_TrigSeededTrackFinder_TRT_TrigSeededTrackFinder Req Requirements file
 
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/doc/packagedoc.h
similarity index 72%
rename from InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/doc/packagedoc.h
index 6c23ab648a0e20bc84c0036e5d3d0102c8ac317c..54c3ff27e17e67611d993cf431b1118bbf628dde 100644
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage TRT_TrigStandaloneTrackFinder
+@page TRT_TrigStandaloneTrackFinder_page TRT_TrigStandaloneTrackFinder
 @author Thomas.Koffas@cern.ch, Iwona Grabowska-Bold for online running
 
-@section TRT_TrigStandaloneTrackFinderIntro Introduction
+@section TRT_TrigStandaloneTrackFinder_TRT_TrigStandaloneTrackFinderIntro Introduction
 
 This is an algorithm that deals with the TRT segments that have not
 been assigned a Si extension. It runs after the TRT seeded back-tracking
 is completed, including the ambiguity resolving of the resulting tracks.
 The input are TRT track segments and the output are global ID tracks.
 
-@section TRT_TrigStandaloneTrackFinderDescription Description
+@section TRT_TrigStandaloneTrackFinder_TRT_TrigStandaloneTrackFinderDescription Description
 
 This algorithm performs the following tasks:
 
@@ -32,21 +32,19 @@ This algorithm performs the following tasks:
     using the configured track fitter. Those that are successfully fitted are 
     then stored in a dedicated track collection.
 
-@section TRT_TrigStandaloneTrackFinderTools Used Tools
+@section TRT_TrigStandaloneTrackFinder_TRT_TrigStandaloneTrackFinderTools Used Tools
 
 This algorithm uses the ITrackFitter, InDetTrigAssociationTool tools.
 
-@section TRT_TrigStandaloneTrackFinderContents Algorithm Contents
+@section TRT_TrigStandaloneTrackFinder_TRT_TrigStandaloneTrackFinderContents Algorithm Contents
 
 The TRT_TrigStandaloneTrackFinder contains the following classes/files:
 
 - TRT_TrigStandaloneTrackFinder.cxx...Main class calling all the necessary tools and producing the ouput track collection.
 
-@section TRT_TrigStandaloneTrackFinderPackages Used Packages
+@section TRT_TrigStandaloneTrackFinder_TRT_TrigStandaloneTrackFinderPackages Used Packages
 
-@htmlinclude used_packages.html
 
-@section  TRT_TrigStandaloneTrackFinderReq  Requirements file
-@include requirements
+@section TRT_TrigStandaloneTrackFinder_TRT_TrigStandaloneTrackFinderReq Requirements file
 
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 60%
rename from InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/doc/packagedoc.h
index f7358e2f90de8ee464c396703de3132448f50767..6a9120cf44f80ecfd67cdd75640e7b45b8bcc2ad
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage TRT_TrigTrackExtensionAlg
+@page TRT_TrigTrackExtensionAlg_page TRT_TrigTrackExtensionAlg
 @author Markus.Elsing@cern.ch, Igor.Gavrilenko@cern.ch
-@section TRT_TrigTrackExtensionAlgIntro Introduction
+@section TRT_TrigTrackExtensionAlg_TRT_TrigTrackExtensionAlgIntro Introduction
 
 This algorithms is a seeded version of TRT_TrackExtensionAlg used in
 the trigger.  It is devoted for tracks extention to TRT.
@@ -16,10 +16,8 @@ TrackExtensionMap.
 This algorithm uses standard ITRT_TrackExtensionTool and should know 
 input tracks location and extended track location.
 
-@section used_packagesTRT_TrigTrackExtensionAlg used packages 
-@htmlinclude used_packages.html
+@section TRT_TrigTrackExtensionAlg_used_packagesTRT_TrigTrackExtensionAlg used packages
 
-@section  TRT_TrigTrackExtensionAlgReq  Requirements file
-@include requirements
+@section TRT_TrigTrackExtensionAlg_TRT_TrigTrackExtensionAlgReq Requirements file
 
 */
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/doc/mainpage.h b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 59%
rename from InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/doc/mainpage.h
rename to InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/doc/packagedoc.h
index 26f9d8739a03c7e7ce94c0138d5ae07f16d4d90e..e1979915f83a6e308e36a1aac75a487483afcfac
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage TRT_TrigTrackSegmentsFinder
+@page TRT_TrigTrackSegmentsFinder_page TRT_TrigTrackSegmentsFinder
 @author Markus.Elsing@cern.ch, Igor.Gavrilenko@cern.ch, Iwona.Grabowska-Bold@cern.ch
-@section TRT_TrigTrackSegmentsFinderIntro Introduction
+@section TRT_TrigTrackSegmentsFinder_TRT_TrigTrackSegmentsFinderIntro Introduction
 
 This algorithm is devoted for tracks finding in TRT without extra
 infomation (Standalone TRT reconstruction). Output of this algorithm
@@ -15,10 +15,8 @@ TRT_TrackSegmentsFinder in the offline.
 
 This algorithm uses standard ITRT_TrackSegmentsMaker tool.
 
-@section  TRT_TrigTrackSegmentsFinderReq  Requirements file
-@include requirements
+@section TRT_TrigTrackSegmentsFinder_TRT_TrigTrackSegmentsFinderReq Requirements file
 
-@section used_packagesTRT_TrigTrackSegments  Used packages
-@htmlinclude used_packages.html
+@section TRT_TrigTrackSegmentsFinder_used_packagesTRT_TrigTrackSegments Used packages
 
 */
diff --git a/InnerDetector/InDetTrigRecTools/InDetTrigToolInterfaces/doc/mainpage.h b/InnerDetector/InDetTrigRecTools/InDetTrigToolInterfaces/doc/packagedoc.h
similarity index 77%
rename from InnerDetector/InDetTrigRecTools/InDetTrigToolInterfaces/doc/mainpage.h
rename to InnerDetector/InDetTrigRecTools/InDetTrigToolInterfaces/doc/packagedoc.h
index 6e12951aad38dd091bf15f4855833844d98a6991..8f52b67158acc7c9bc8595a59059b9249bde4be5 100644
--- a/InnerDetector/InDetTrigRecTools/InDetTrigToolInterfaces/doc/mainpage.h
+++ b/InnerDetector/InDetTrigRecTools/InDetTrigToolInterfaces/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage InDetTrigToolInterfaces Package
+@page InDetTrigToolInterfaces_page InDetTrigToolInterfaces Package
 @author Jiri.Masik@cern.ch
 
-@section InDetTrigToolInterfacesIntro Introduction
+@section InDetTrigToolInterfaces_InDetTrigToolInterfacesIntro Introduction
 
 This package is an interface package defining API of the tools listed
 below. It allows separation of the interface and implementation as
@@ -17,7 +17,7 @@ ToolHandle etc. This policy reduces dependencies between packages,
 risk of cascaded build failures and results in a cleaner and faster
 build. It also allows smaller libraries of the component type.
 
-@section InDetTrigToolInterfacesOverview Overview
+@section InDetTrigToolInterfaces_InDetTrigToolInterfacesOverview Overview
 
 Currently the package defines two interfaces
 
@@ -42,11 +42,9 @@ SiTrigSpacePointFormation.
 
 </li>
 
-\section used_InDetTrigToolInterfaces Used Packages
-@htmlinclude used_packages.html
+@section InDetTrigToolInterfaces_used_InDetTrigToolInterfaces Used Packages
 
-\section requirements_InDetTrigToolInterfaces requirements
-@include requirements
+@section InDetTrigToolInterfaces_requirements_InDetTrigToolInterfaces requirements
 
 
 */
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/doc/mainpage.h b/InnerDetector/InDetTruth/InDetTruthAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from InnerDetector/InDetTruth/InDetTruthAlgs/doc/mainpage.h
rename to InnerDetector/InDetTruth/InDetTruthAlgs/doc/packagedoc.h
index 1a8d7ddb4133828b1247cad77ce8e306be69fbef..050918ecbaa663d68c309f50963bd3b4efc8b6e7
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/doc/mainpage.h
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage InDetTruthAlgs Package
+@page InDetTruthAlgs_page InDetTruthAlgs Package
 @author Maria.Jose.Costa@cern.ch, Andreas.Wildauer@cern.ch
 
-@section InDetTruthAlgsIntro Introduction
+@section InDetTruthAlgs_InDetTruthAlgsIntro Introduction
 
 This package contains the algorithms to create the truth objects and the
 maps objects that connect the truth and the reconstructed objects.
@@ -22,7 +22,7 @@ the creation of the reconstructed object.
 Note that a decision is taken in the algorithms filling the truth since 
 the information of all the other sources that also contribute is lost.
 
-@section InDetTruthAlgsOverview Algorithm Overview
+@section InDetTruthAlgs_InDetTruthAlgsOverview Algorithm Overview
   The InDetTruthAlgs package contains the following algorithms:
 
    - PRD_MultiTruthMaker: Creates multimaps of PrepRawData (PRD_MultiTruthCollection) to their MC particles.
@@ -36,7 +36,6 @@ the information of all the other sources that also contribute is lost.
    TrackParticleTruth and fills both objects in a map. It is based on
    the truth of the Track contained in the TrackParticle.
 
-@section InDetTruthAlgsReq Requirements
+@section InDetTruthAlgs_InDetTruthAlgsReq Requirements
 
-@include requirements
 */
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/doc/mainpage.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/doc/packagedoc.h
similarity index 91%
rename from InnerDetector/InDetValidation/InDetPhysValMonitoring/doc/mainpage.h
rename to InnerDetector/InDetValidation/InDetPhysValMonitoring/doc/packagedoc.h
index fa99f461960f90d28137a6f85ea5b02da9e62545..f99fb256c6f17fb0f78abf46ac79650547e85f96 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/doc/mainpage.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage InDetPhysValMonitoring Package
+@page InDetPhysValMonitoring_page InDetPhysValMonitoring Package
 @author shaun.roe@cern.ch
 
-@section IDPVMIntro Introduction
+@section InDetPhysValMonitoring_IDPVMIntro Introduction
 
 This package was originally intended to be a straight translation of the previous 
 InDetPerformanceRTT, for the period when the input data format was updated to xAOD.
 The older package, however, was a monolithic class which proved difficult to maintain
 and upgrade. Thus the algorithms were refactored and became the current package.
 
-@section IDPVMPhilosophy Philosophy
+@section InDetPhysValMonitoring_IDPVMPhilosophy Philosophy
 The functions have been divided into components as follows:
 1. 'Decorating' Algorithm: 
 This should calculate the required values and add them as 'decorations' on the xAOD
@@ -43,7 +43,7 @@ The HistogramDefinitionService class enables plot characteristics to be read fro
 files, examples of which are in the package, in 'share'. In turn this allows jobs to be run with different plot
 definitions without recompilation each time.
 
-@section IDPVMQuickStart Quick Start
+@section InDetPhysValMonitoring_IDPVMQuickStart Quick Start
 From your Athena directory:
 mkdir build source run
 cd source
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/doc/mainpage.h b/InnerDetector/InDetValidation/InDetRecStatistics/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from InnerDetector/InDetValidation/InDetRecStatistics/doc/mainpage.h
rename to InnerDetector/InDetValidation/InDetRecStatistics/doc/packagedoc.h
index 681a2a88e7eccfb72498cdf7f79c6bfff2278308..bcd6bd811187326f958cd80f6113ff59c7b43e9e
--- a/InnerDetector/InDetValidation/InDetRecStatistics/doc/mainpage.h
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage InDetRecStatistics Package
+@page InDetRecStatistics_page InDetRecStatistics Package
 @author Sven.Vahsen@stop.the.spam.cern.ch lauren.tompkins@stop.the.spam.cern.ch
 
-@section MyPackageIntro Introduction
+@section InDetRecStatistics_MyPackageIntro Introduction
 The Algorithm InDetRecStatistics produces a text summary of track-finding performance at the end of your Athena job. In addition, it can provide an ntuple with detailed tracking information. InDetRecStatistics is automatically configured and executed by InDetRecExample, and will provide statistics on any trackfinder that is turned on there.
 
-@section MyPackageStatTable Trackfinding Summary Table
+@section InDetRecStatistics_MyPackageStatTable Trackfinding Summary Table
 You can obtain a sample statistics table by running InDetRecExample/jobOptions.py for any software release or nightly.  Be sure to check the release/nightly recipes pages for any needed tags.  
 
 - <i>Overview</i>: The table is devided into four main sections. The top section labeled <b>Summary</b> lists the total number of objects (tracks, hits etc) that have been analyzed, problematic objects encountered, as well as the TrackCollections and TrackTruthCollections that have been used to obtain the reconstructed tracks and their associated truth information. These input collections are automatically configured by InDetRecExample, depending on which trackfinders are set to run there. The section <b>Ntuple Settings and Cuts</b> shows the value of InDetRecStatistics parameters that affect the ntuple: Whether to create it or not, whether to save detailed hit info, whether to save detailed TRT info, and preselection cuts that determine which tracks are saved to the ntuple. These track preselection cuts are independent of the track selection cuts used for efficiency and fake-rate calculation, described next. The section <b>Cuts for Statistics Table</b> shows the value of cuts used in the efficiency and fake-rate calculation. The bottom section shows track and hit multiplicities, effiencies and fake-rates. This information is shown seperately for each TrackCollection. In the example above each TrackCollection corresponds to a single track-find algorithm: xKalman, iPatRec, and newTrackig.
@@ -25,7 +25,7 @@ You can obtain a sample statistics table by running InDetRecExample/jobOptions.p
 
 -<i>Multiple Matches</i>: There is additionally a category "multM" which is a measure of how often a given generated track is matched to a reconstructed track.  It is defined as (# of reco tracks matched to a single generated particle - 1)/ (# of generated tracks)
 
-@section MyPackageSettings How to change the InDetRecStatistics settings in InDetRecExample
+@section InDetRecStatistics_MyPackageSettings How to change the InDetRecStatistics settings in InDetRecExample
 The setting shown in the table and discussed above can be changed by overriding InDetRecStatistics's default parameters in InDetRecExample's jobOptions.py  InDetRecExample already has InDetRecStatistics configured so all you need to is include at the end of jobOptions.py:
 
 InDetRecStatistics.MyProperty = value;
@@ -34,13 +34,13 @@ For example:
 
 InDetRecStatistics.NtupleSaveHits = true;
 
-@section MyPackageSettings How to run InDetRecStatistics in Your Athena Job
+@section InDetRecStatistics_MyPackageSettings How to run InDetRecStatistics in Your Athena Job
 
 InDetRecStatistics can be easily integrated into your athena job.  First you need a list of your TrackCollection Keys and a list of your Truth Track Collection Keys.  You must have on truth collection for every reconstructed collection and they must already be in store gate.  You also need a Track summary tool configured.  Lastly you need to have an extrapolator in the tool service.  Once you have this set up all you need to is make the necessary changes to share/InDetRecStatistics_fragment.py and include it in your jobOptions. If you'd like to change the properties you can follow the same instructions as for changing them in InDetRecExample. 
 
 @include InDetRecStatistics_fragment.py
 
-@section MyPackageNtuple Statistics Ntuple
+@section InDetRecStatistics_MyPackageNtuple Statistics Ntuple
 The ntuple contains detailed information on generated tracks, reconstructed tracks, hits. This ntuple is used by the automated validation package InDetRTT to test nightly releases. We also use it for more manual release validation.  In the process of this validation work, we have produced a collection of ROOT scripts that can be used to plot many quantities related to tracking performance: tracking efficiency, fake-rate, pulls, residuals and so on. The scripts can be found in the scripts/ directory; more on scripts below.
 
 Variables in default ntuple:
@@ -305,7 +305,7 @@ mctrack_endvertexy
 
 mctrack_endvertexz    
 
-@section MyPackageNtupleScruots Scripts for Statistics Ntuple
+@section InDetRecStatistics_MyPackageNtupleScruots Scripts for Statistics Ntuple
 
 These are found in the /scripts directory, and are designed to run on the statistics ntuple to produce various plots.
 
@@ -325,20 +325,16 @@ These are found in the /scripts directory, and are designed to run on the statis
 - <b>resolution_[param].cc (doplot = "res[param]", "pull[param]", "narres[param]") - average value for parameter resoltuions (pulls) as a function of eta, for abs(eta) < 2.5 (or abs(eta) < 1.5 for narres);  resolution = X_reco - X_truth, pull as above
 - <b>vertex.cc</b> (doplot = "vtx") - plot generated, and reconstructed z0 vertex, and the difference 
 
-\section used_packagesInDetRecStatistics Used Packages
-@htmlinclude used_packages.html
+@section InDetRecStatistics_used_packagesInDetRecStatistics Used Packages
 
-\section requirements Requirements
-@include requirements
+@section InDetRecStatistics_requirements Requirements
 
 */
 
 
 //@page used_InDetRecStatistics Used Packages
-//@htmlinclude used_packages.html
 //
 //@page requirements_InDetRecStatistics Requirements
-//@include requirements
 //
 */
 
diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/doc/mainpage.h b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 72%
rename from InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/doc/mainpage.h
rename to InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/doc/packagedoc.h
index 695230d84258c74a078944cd2b0d1f525c142dff..02275e3fd379c7845cf59203166493b44a782ebd
--- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/doc/mainpage.h
+++ b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage InDetSegmentDriftCircleAssValidation
+@page InDetSegmentDriftCircleAssValidation_page InDetSegmentDriftCircleAssValidation
 @author Thomas.Koffas@cern.ch
 
-@section InDetSegmentDriftCircleAssValidationIntro Introduction
+@section InDetSegmentDriftCircleAssValidation_InDetSegmentDriftCircleAssValidationIntro Introduction
 
 This is an algorithm used to associate TRT segments to truth particle
 segments in order to provide an efficiency estimation. The association
 is done on a hit-by-hit basis.
 
-@section InDetSegmentDriftCircleAssValidationDescription Description
+@section InDetSegmentDriftCircleAssValidation_InDetSegmentDriftCircleAssValidationDescription Description
 
 This algorithm performs the following tasks:
 
@@ -37,17 +37,15 @@ This algorithm performs the following tasks:
 
 4.  By comparing the results of setps 2,3 above an efficiency is computed.
 
-@section InDetSegmentDriftCircleAssValidationContents Algorithm Contents
+@section InDetSegmentDriftCircleAssValidation_InDetSegmentDriftCircleAssValidationContents Algorithm Contents
 
 The InDetSegmentDriftCircleAssValidation contains the following classes/files:
 
 - InDetSegmentDriftCircleAssValidation.cxx...Main class that does the truth association and computes an efficiency.
 
-@section InDetSegmentDriftCircleAssValidationPackages Used Packages
+@section InDetSegmentDriftCircleAssValidation_InDetSegmentDriftCircleAssValidationPackages Used Packages
 
-@htmlinclude used_packages.html
 
-@section  InDetSegmentDriftCircleAssValidationReq  Requirements file
-@include requirements
+@section InDetSegmentDriftCircleAssValidation_InDetSegmentDriftCircleAssValidationReq Requirements file
 
 */
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/doc/mainpage.h b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 72%
rename from InnerDetector/InDetValidation/InDetTrackClusterAssValidation/doc/mainpage.h
rename to InnerDetector/InDetValidation/InDetTrackClusterAssValidation/doc/packagedoc.h
index dc43fef8776bbd2fbce7f668fda208882c77a541..9942291e33b4e00953fa2ee6f5d8c566c5880e34
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/doc/mainpage.h
+++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/doc/packagedoc.h
@@ -5,9 +5,9 @@
 
 /**
 
-@mainpage TrackClusterAssValidation
+@page InDetTrackClusterAssValidation_page TrackClusterAssValidation
 @author Igor.Gavrilenko@cern.ch
-@section TrackClusterAssValidationIntro Introduction
+@section InDetTrackClusterAssValidation_TrackClusterAssValidationIntro Introduction
 
 The Algorithm TrackClusterAssValidation produces a text summary of track clusters association 
 performance at the end of your Athena job. This algorithm take as input clusters, space points 
@@ -15,8 +15,7 @@ and truth collections and separate truth particles with sufficient number space
 After that algorith compare them with clusters assosiated with tracks. Final product of this stadies
 is two dimension table of probabilities to loss correct cluster and assosiate track with wrong one.
 
-@section TrackClusterAssValidationReq  Requirements file
-@include requirements
+@section InDetTrackClusterAssValidation_TrackClusterAssValidationReq Requirements file
 
 */
 
diff --git a/InnerDetector/InDetValidation/InDetTrackSplitterTool/doc/mainpage.h b/InnerDetector/InDetValidation/InDetTrackSplitterTool/doc/packagedoc.h
similarity index 93%
rename from InnerDetector/InDetValidation/InDetTrackSplitterTool/doc/mainpage.h
rename to InnerDetector/InDetValidation/InDetTrackSplitterTool/doc/packagedoc.h
index df18b322376bafee079a2fbd06d42e2c4f60c870..b66f60707c4ea2dd44dc6feb298a2678a873aec5 100644
--- a/InnerDetector/InDetValidation/InDetTrackSplitterTool/doc/mainpage.h
+++ b/InnerDetector/InDetValidation/InDetTrackSplitterTool/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage InDetTrackSplitterTool Package
+@page InDetTrackSplitterTool_page InDetTrackSplitterTool Package
 @author John Alison <johnda@hep.upenn.edu>, Manuel Kayl <Manuel.Kayl@cern.ch>
 
 
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/doc/mainpage.h b/InnerDetector/InDetValidation/InDetTrackValidation/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 98%
rename from InnerDetector/InDetValidation/InDetTrackValidation/doc/mainpage.h
rename to InnerDetector/InDetValidation/InDetTrackValidation/doc/packagedoc.h
index 9cb91a43c623f9a84f9c5f5cdb30b870d0c00e68..4f25cc04afc20e1e1fdc46eed195b383d70ab5a5
--- a/InnerDetector/InDetValidation/InDetTrackValidation/doc/mainpage.h
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-@mainpage The InDetTrackValidation package
+@page InDetTrackValidation_page The InDetTrackValidation package
 Validation tools for tracking in the inner detector.
 
 @author Andreas.Salzburger@cern.ch, Sebastian.Fleischmann@cern.ch
 
-@section introductionInDetTrackValidation Introduction
+@section InDetTrackValidation_introductionInDetTrackValidation Introduction
 
 This package contains tools to validate the tracking in the inner detector.
 This includes tools to fill validation ntuples e.g. with measurement data and a tool
 for the calculation of SCT residuals and pulls.
 
-@section InDetTrackValidationOverview Class Overview
+@section InDetTrackValidation_InDetTrackValidationOverview Class Overview
   The InDetTrackValidation package contains the following classes:
 
   - InDet::PixelClusterValidationNtupleWriter : Algorithm to write Pixel cluster (PRD) data to ntuple
@@ -30,7 +30,7 @@ for the calculation of SCT residuals and pulls.
         For "artificially" two-dimensional SCT measurements (SCT endcap modules) the coordinates and
         covariance matrices are rotated to return the residual perpendicular to the strip.
 
-@section WhichVariablesInDetTrackValidation List of the Ntuple variables
+@section InDetTrackValidation_WhichVariablesInDetTrackValidation List of the Ntuple variables
 This paragraph gives a short overview of the ntuple variables provided by the different tools
 
 @subsection PixelClusterWriterVariables Ntuple variables of the InDet::PixelClusterValidationNtupleWriter
@@ -635,7 +635,7 @@ data words that don't match up with any expected pattern</td>
 </table>
 
 
-@section ExtrasInDetTrackValidation Extra Pages
+@section InDetTrackValidation_ExtrasInDetTrackValidation Extra Pages
 
  - @ref UsedInDetTrackValidation
  - @ref requirementsInDetTrackValidation
@@ -643,11 +643,9 @@ data words that don't match up with any expected pattern</td>
 
 /**
 @page UsedInDetTrackValidation Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsInDetTrackValidation Requirements
-@include requirements
 */
 
diff --git a/InnerDetector/InDetValidation/PixelRTT/doc/mainpage.h b/InnerDetector/InDetValidation/PixelRTT/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from InnerDetector/InDetValidation/PixelRTT/doc/mainpage.h
rename to InnerDetector/InDetValidation/PixelRTT/doc/packagedoc.h
index 757660a4aae50ce2118a5f51df6f45b89293e255..70fa086758b73368585dcf27c660e84cd0883d3b
--- a/InnerDetector/InDetValidation/PixelRTT/doc/mainpage.h
+++ b/InnerDetector/InDetValidation/PixelRTT/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage PixelRTT Package
+@page PixelRTT_page PixelRTT Package
 
 @author Simone.Montesano@cern.ch
 
-@section PixelRTTIntro Introduction
+@section PixelRTT_PixelRTTIntro Introduction
 
 This package is intended as a container for various Pixel-specific validation tasks that are automatically run by the RTT.
 It basically includes a job option and some root classes and macros plus the xml file for the RTT job configuration.
@@ -26,12 +26,10 @@ The macro included create a default set of this kind of histograms and are autom
 
 /**
 @page used_PixelRTT Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_PixelRTT Requirements
-@include requirements
 */
 
 
diff --git a/LArCalorimeter/LArCalibTools/doc/mainpage.h b/LArCalorimeter/LArCalibTools/doc/packagedoc.h
similarity index 89%
rename from LArCalorimeter/LArCalibTools/doc/mainpage.h
rename to LArCalorimeter/LArCalibTools/doc/packagedoc.h
index 11cdf25914dba7cbf6ef06642d985315480b9a0e..5801490bd0af4c6b49944bb7f5b4b1fa0ae95f77 100644
--- a/LArCalorimeter/LArCalibTools/doc/mainpage.h
+++ b/LArCalorimeter/LArCalibTools/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  LArCalibTools
+@page LArCalibTools_page LArCalibTools
 @author Marco.Delmastro@cern.ch
 
-@section LArCalibToolsIntro Introduction
+@section LArCalibTools_LArCalibToolsIntro Introduction
 
 This package containes the algorithms to dump the LAr calibration constants
 into ROOT TTrees to be used for debugging, displaying, monitoring and analysis
@@ -26,7 +26,7 @@ purposes.
    - All the algorithms need to be migrated to configurable.
    - Doxygen description of classes and methods is missing.
 
-@section LArCalibToolsOverview Class Overview
+@section LArCalibTools_LArCalibToolsOverview Class Overview
   
   The LArCalibTools package contains of following classes:
 
@@ -53,11 +53,9 @@ purposes.
 
 /**
 @page used_LArCalibTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_LArCalibTools Requirements
-@include requirements
 */
 
diff --git a/LArCalorimeter/LArCalibUtils/doc/mainpage.h b/LArCalorimeter/LArCalibUtils/doc/packagedoc.h
similarity index 92%
rename from LArCalorimeter/LArCalibUtils/doc/mainpage.h
rename to LArCalorimeter/LArCalibUtils/doc/packagedoc.h
index 59706e68424e32a5ff613bc38ea73efd31ba07ad..bb5eaf4b9feebfe8b6bbd6686fabd7eee8bb8d78 100644
--- a/LArCalorimeter/LArCalibUtils/doc/mainpage.h
+++ b/LArCalorimeter/LArCalibUtils/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  LArCalibUtils
+@page LArCalibUtils_page LArCalibUtils
 @author Marco.Delmastro@cern.ch
 
-@section LArCalibUtilsIntro Introduction
+@section LArCalibUtils_LArCalibUtilsIntro Introduction
 
 This package containes the algorithms to reconstruct the LAr calibration runs
 (pedestal, noise autocorrelation, ramp, delay), fill the relative electronic
@@ -24,7 +24,7 @@ constants (e.g. ionization pulse, optimal filtering coefficients).
 - NovaIOV support should be removed.
 - Doxygen description of classes and methods is missing.
 
-@section LArCalibUtilsOverview Class Overview
+@section LArCalibUtils_LArCalibUtilsOverview Class Overview
   
   The LArCalibUtils package contains of following classes:
 
@@ -78,10 +78,8 @@ constants (e.g. ionization pulse, optimal filtering coefficients).
 
 /**
 @page used_LArCalibUtils Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_LArCalibUtils Requirements
-@include requirements
 */
diff --git a/LArCalorimeter/LArCellRec/doc/mainpage.h b/LArCalorimeter/LArCellRec/doc/packagedoc.h
similarity index 79%
rename from LArCalorimeter/LArCellRec/doc/mainpage.h
rename to LArCalorimeter/LArCellRec/doc/packagedoc.h
index 8bbb98ed9b4c9050cfa3a9473a2510f5fc15abf6..edada072eecde6d8e1d9606b48d4e2c048ac98ba 100644
--- a/LArCalorimeter/LArCellRec/doc/mainpage.h
+++ b/LArCalorimeter/LArCellRec/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage LArCellRec Package
+@page LArCellRec_page LArCellRec Package
 
 This package contains the LAr cell reconstruction tools used to create LArCell objects
 
-@section LArCellTool  LArCell Builderg Tools
+@section LArCellRec_LArCellTool LArCell Builderg Tools
 
 LArCellBuilderFromLArHitTool and LArCellBuilderFromLArRawChannelTool
 implement  ICaloCellMakerTool interface, and build LArCell from LArHit and LArRawChannel respectively.
 
-@section LArCellCorrection LArCell Correction Tools
+@section LArCellRec_LArCellCorrection LArCell Correction Tools
 
 LArCellEmMiscalib LArCellHVCorrection LArCellRescaler LArG3Escale
 implement CaloCellCorrection interface, and apply various modification to LArCells.
diff --git a/LArCalorimeter/LArClusterRec/doc/mainpage.h b/LArCalorimeter/LArClusterRec/doc/packagedoc.h
similarity index 83%
rename from LArCalorimeter/LArClusterRec/doc/mainpage.h
rename to LArCalorimeter/LArClusterRec/doc/packagedoc.h
index 920de80d7a618ea0ad621c62a87657b2b2adca1d..fc17128d84511f4f9b4ffc8943d3f6f157bb0851 100644
--- a/LArCalorimeter/LArClusterRec/doc/mainpage.h
+++ b/LArCalorimeter/LArClusterRec/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage LArClusterRec Package
+@page LArClusterRec_page LArClusterRec Package
 
 This package contains the cluster reconstruction tools specific to LAr
 
-@section BuilderTool Builder tools
+@section LArClusterRec_BuilderTool Builder tools
 
 LArFCalTowerBuilderTool and LArTowerBuilderTool implement the interface 
 CaloTowerBuilderToolBase, and builds CaloTower for FCAL and the rest of the
diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/doc/mainpage.h b/LArCalorimeter/LArCnv/LArCondAthenaPool/doc/packagedoc.h
similarity index 74%
rename from LArCalorimeter/LArCnv/LArCondAthenaPool/doc/mainpage.h
rename to LArCalorimeter/LArCnv/LArCondAthenaPool/doc/packagedoc.h
index d591fcfe1329a11277f34573ffab957fa477d01b..7bd81ee27e0d6e57f4cae99b54874fc8ad520fff 100644
--- a/LArCalorimeter/LArCnv/LArCondAthenaPool/doc/mainpage.h
+++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage LArCondAthenaPool Package
+@page LArCondAthenaPool_page LArCondAthenaPool Package
 
 This package provides POOL persistency conditions data classes.
 
@@ -14,7 +14,7 @@ Most of the data classes are in LArRawConditions package.
 @author RD Schaffer  <R.D.Schaffer@cern.ch>
 @author	Walter Lampl <walter.lampl@cern.ch>
 
-@section CustomizedCnv ----Customized converters 
+@section LArCondAthenaPool_CustomizedCnv ----Customized converters
 
  LArCalibParamsCnv
 
@@ -22,7 +22,7 @@ Most of the data classes are in LArRawConditions package.
 
  LArOnOffIdMapCnv
 
-@section AutoGenCnv    ----- Automatically generated converters
+@section LArCondAthenaPool_AutoGenCnv ----- Automatically generated converters
 
  See requirements file for the list of data classes that have POOL converters.
  
diff --git a/LArCalorimeter/LArDigitization/doc/mainpage.h b/LArCalorimeter/LArDigitization/doc/packagedoc.h
similarity index 87%
rename from LArCalorimeter/LArDigitization/doc/mainpage.h
rename to LArCalorimeter/LArDigitization/doc/packagedoc.h
index 5d392f1aeb072a949154b6c0ecbb4e9366029ac1..f959e56b2032490f91c65db2dd9402a306140482 100644
--- a/LArCalorimeter/LArDigitization/doc/mainpage.h
+++ b/LArCalorimeter/LArDigitization/doc/packagedoc.h
@@ -4,12 +4,12 @@
 
 /**
 
-@mainpage LArDigitization Package
+@page LArDigitization_page LArDigitization Package
 
 This package contains the LArDigitization algorithm used to create LArDigits objects
 from LArHits
 
-@section LArDigitMaker LArDigitMaker class
+@section LArDigitization_LArDigitMaker LArDigitMaker class
 
 This is the digitization algorithm for the LAR.
 The input data are the LArHit from the simulation (visible energy in LAr).
@@ -29,7 +29,7 @@ the proper autocorrelation function) as well as several conditions data accessed
 with the interfaces in LArElecCalib.
 
 
-@section LArHitEMap LArHitEMap and LArHitList
+@section LArDigitization_LArHitEMap LArHitEMap and LArHitList
 
 These are auxiliary classes used by LArDigitMaker to store the hit energies per channel:
 LArHitEMap is a vector (indexed by cell hash identifier) of LArHitList.
diff --git a/LArCalorimeter/LArElecCalib/doc/mainpage.h b/LArCalorimeter/LArElecCalib/doc/packagedoc.h
similarity index 90%
rename from LArCalorimeter/LArElecCalib/doc/mainpage.h
rename to LArCalorimeter/LArElecCalib/doc/packagedoc.h
index 0cbc8f5dd301baa3b8d62060f478171439928238..11a7502d62babdde36685facceca13d158643828 100644
--- a/LArCalorimeter/LArElecCalib/doc/mainpage.h
+++ b/LArCalorimeter/LArElecCalib/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  LArElecCalib
+@page LArElecCalib_page LArElecCalib
 @author Marco.Delmastro@cern.ch
 
-@section LArElecCalibIntro Introduction
+@section LArElecCalib_LArElecCalibIntro Introduction
 
 This package containes the interfaces to retrieve the electronics calibration
 constants for the LAr calorimeters. The classes are normally recorded in the
@@ -16,7 +16,7 @@ stored constants. The concrete implementation of the interfaces contained in
 this package is found in <a
 href="http://isscvs.cern.ch/cgi-bin/viewcvs-all.cgi/offline/LArCalorimeter/LArRawConditions/?cvsroot=atlas">LArCalorimeter/LArRawConditions</a>.
 
-@section LArElecCalibOverview Class Overview
+@section LArElecCalib_LArElecCalibOverview Class Overview
   
   The LArElecCalib package contains of following classes:
 
@@ -67,10 +67,8 @@ href="http://isscvs.cern.ch/cgi-bin/viewcvs-all.cgi/offline/LArCalorimeter/LArRa
 
 /**
 @page used_LArElecCalib Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_LArElecCalib Requirements
-@include requirements
 */
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/doc/mainpage.h b/LArCalorimeter/LArExample/LArCalibProcessing/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from LArCalorimeter/LArExample/LArCalibProcessing/doc/mainpage.h
rename to LArCalorimeter/LArExample/LArCalibProcessing/doc/packagedoc.h
index 2ec1086b538c8acc34d02f6db156935e0ff486de..58fe56633e50dbe5e1ce68ddbcdf4c54d9c3e615
--- a/LArCalorimeter/LArExample/LArCalibProcessing/doc/mainpage.h
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage LArCalibProcessing Package
+@page LArCalibProcessing_page LArCalibProcessing Package
 
 This package provides jobOptions for processing LAr electronic calibration data
 
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/doc/mainpage.h b/LArCalorimeter/LArExample/LArConditionsCommon/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 76%
rename from LArCalorimeter/LArExample/LArConditionsCommon/doc/mainpage.h
rename to LArCalorimeter/LArExample/LArConditionsCommon/doc/packagedoc.h
index c39b92fc567ff54ce8d868373f06d96d2f47a7f6..6a4e948157bad9ac4178badc575dc38b9b7e2960
--- a/LArCalorimeter/LArExample/LArConditionsCommon/doc/mainpage.h
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage LArConditionsCommon Package
+@page LArConditionsCommon_page LArConditionsCommon Package
 
 This package provides jobOptions for accessing conditions data 
 
@@ -12,7 +12,7 @@ This package provides jobOptions for accessing conditions data
 @author RD Schaffer
 @author Walter Lampl
 
-@section  Electronic calibration conditions data 
+@section LArConditionsCommon_Electronic calibration conditions data
 
 LArConditionsCommon_MC_jobOptions.py: conditions data for G4 MC events
 
@@ -22,7 +22,7 @@ LArConditionsCommon_H6_jobOptions.py: conditions data for CTB 2004 (H6)
 
 LArConditionsCommon_H8_jobOptions.py: conditions data for CTB 2004 (H8)
 
-@section Identifier Mapping
+@section LArConditionsCommon_Identifier Mapping
 
 LArIdMap_H6_jobOptions.py : Identifier mapping for H6
          
@@ -32,15 +32,15 @@ LArIdMap_MC_jobOptions.py : Identifier mapping for G4 MC
 
 LArIdMap_comm_jobOptions.py : : Identifier mapping for commissioning
 
-@section Alignment 
+@section LArConditionsCommon_Alignment 
 LArAlignable.py : Alignment conditions data 
 
 
-@section Python classes
+@section LArConditionsCommon_Python classes
 LArCondContChannels : helper for selecting conditions container channels
 LArCondDataDumper:  helper for dumping conditions data in python.
 
-@section Testing jobOptions based on interactive Athena.
+@section LArConditionsCommon_Testing jobOptions based on interactive Athena.
 
  CheckADC2MeV.py
  CheckLArIdMap_jobOptions.py
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4Barrel/doc/packagedoc.h
similarity index 80%
rename from LArCalorimeter/LArG4/LArG4Barrel/doc/MainPage.h
rename to LArCalorimeter/LArG4/LArG4Barrel/doc/packagedoc.h
index 329c199ca1f193195f13cadea2e305a99eb2146c..ac394665171901f1e9c052aa75b010c595db60bb 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4Barrel/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArG4Barrel_page 
 
 This package contains various helper classes and calculators used for LAr Barrel simulation in G4
 
@@ -13,7 +13,5 @@ This package contains various helper classes and calculators used for LAr Barrel
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArG4/LArG4Code/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4Code/doc/packagedoc.h
similarity index 82%
rename from LArCalorimeter/LArG4/LArG4Code/doc/MainPage.h
rename to LArCalorimeter/LArG4/LArG4Code/doc/packagedoc.h
index 9d4ba921bec653e768efa75f0747a601dabbe3a4..3f0f753b84d10b18503706c82cfe373153e01d19 100644
--- a/LArCalorimeter/LArG4/LArG4Code/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4Code/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArG4Code_page 
 
 This package contains some utility and helper classes and interfaces, which are used by other client packages involved in LAr G4 Simulation
 
@@ -13,7 +13,5 @@ This package contains some utility and helper classes and interfaces, which are
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArG4/LArG4EC/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4EC/doc/packagedoc.h
similarity index 80%
rename from LArCalorimeter/LArG4/LArG4EC/doc/MainPage.h
rename to LArCalorimeter/LArG4/LArG4EC/doc/packagedoc.h
index 5a77bdc92a528fbdb75e9480b4db04d42be038c9..e34d902095f8adc90849d1fe2b1fa5f3a905230d 100644
--- a/LArCalorimeter/LArG4/LArG4EC/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4EC/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArG4EC_page 
 
 This package contains various helper classes and calculators used for LAr End Cap simulation in G4
 
@@ -13,7 +13,5 @@ This package contains various helper classes and calculators used for LAr End Ca
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4FCAL/doc/packagedoc.h
similarity index 80%
rename from LArCalorimeter/LArG4/LArG4FCAL/doc/MainPage.h
rename to LArCalorimeter/LArG4/LArG4FCAL/doc/packagedoc.h
index 4f93ccef2afd04f662b90c6e94a16395edacc26c..c80e8c89f11ff18641e402084de24ec8f3230e31 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4FCAL/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArG4FCAL_page 
 
 This package contains various helper classes and calculators used for LAr FCAL simulation in G4
 
@@ -13,7 +13,5 @@ This package contains various helper classes and calculators used for LAr FCAL s
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/doc/mainpage.h b/LArCalorimeter/LArG4/LArG4FastSimulation/doc/packagedoc.h
similarity index 94%
rename from LArCalorimeter/LArG4/LArG4FastSimulation/doc/mainpage.h
rename to LArCalorimeter/LArG4/LArG4FastSimulation/doc/packagedoc.h
index 4755c885f75ed307856713aa131b728628e83df4..f53de9d440308351769b7004bd382610a68b4304 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/doc/mainpage.h
+++ b/LArCalorimeter/LArG4/LArG4FastSimulation/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage The LArG4 Fast Simulation Package
+@page LArG4FastSimulation_page The LArG4 Fast Simulation Package
 
  - This class is the base class for the fast simulation in athena 
 
@@ -42,8 +42,6 @@
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
 
diff --git a/LArCalorimeter/LArG4/LArG4GenShowerLib/doc/mainpage.h b/LArCalorimeter/LArG4/LArG4GenShowerLib/doc/packagedoc.h
similarity index 84%
rename from LArCalorimeter/LArG4/LArG4GenShowerLib/doc/mainpage.h
rename to LArCalorimeter/LArG4/LArG4GenShowerLib/doc/packagedoc.h
index 836082bae2fdc2fcf3dce8745432d9cbbc683065..132104c178caffcf90dc0590aa500e5ea43e63af 100644
--- a/LArCalorimeter/LArG4/LArG4GenShowerLib/doc/mainpage.h
+++ b/LArCalorimeter/LArG4/LArG4GenShowerLib/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage LArG4GenShowerLib Package
+@page LArG4GenShowerLib_page LArG4GenShowerLib Package
 
 @author Wolfgang Ehrenfeld <Wolfgang.Ehrenfeld@desy.de>
 @author Alexandre Glazov <alexandre.glazov@desy.de>
 
-@section LArG4GenShowerLibIntro Introduction
+@section LArG4GenShowerLib_LArG4GenShowerLibIntro Introduction
 
 This package contains the algorithms to generate the Geant 4 based
 shower parametrisation libraries. The generation process is a two step
@@ -18,7 +18,7 @@ detectors is store using the ShowerLib::StepInfo class. In a second
 step the collected hits are clusterd and collected into a frozen
 shower library using the ShowerLib::ShowerLib class.
 
-@section LArG4GenShowerLibOverview Class Overview
+@section LArG4GenShowerLib_LArG4GenShowerLibOverview Class Overview
   The LArG4GenShowerLib package contains of following algorithms:
 
   - LArG4GenShowerLib: clustering and collecting hits into shower library
@@ -30,7 +30,7 @@ shower library using the ShowerLib::ShowerLib class.
   LArG4ShowerLib package. The entry point is the
   ShowerLib::StepInfoCollection class.
   
-@section LArG4GenShowerLibJobOptions Job Options
+@section LArG4GenShowerLib_LArG4GenShowerLibJobOptions Job Options
   For both algorithms dedicated job options are supplied which are used by the script
   generateShowerLib.py.
 
@@ -43,17 +43,17 @@ shower library using the ShowerLib::ShowerLib class.
   The list of properties for each algorithm can be found here:
   - @link LArG4GenShowerLib::LArG4GenShowerLib @endlink
 
-@section LArG4GenShowerLibScripts Scripts
+@section LArG4GenShowerLib_LArG4GenShowerLibScripts Scripts
   The whole shower library generation process can be done in one step using the
   generateShowerLib.py script. For the options see the help function of the script.
 
 
-@section LArG4GenShowerLibDefaultSettings Default Settings
+@section LArG4GenShowerLib_LArG4GenShowerLibDefaultSettings Default Settings
   
   The default settings of the library generation process are stored in
   @include generate_libs.txt.
 
-@section LArG4GenShowerLib Extra Pages
+@section LArG4GenShowerLib_LArG4GenShowerLib Extra Pages
 
 - @ref used_LArG4GenShowerLib
 - @ref requirements_LArG4GenShowerLib
@@ -61,12 +61,10 @@ shower library using the ShowerLib::ShowerLib class.
 
 /**
    @page used_LArG4GenShowerLib Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_LArG4GenShowerLib Requirements
-   @include requirements
 */
 
 
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4H6SD/doc/packagedoc.h
similarity index 82%
rename from LArCalorimeter/LArG4/LArG4H6SD/doc/MainPage.h
rename to LArCalorimeter/LArG4/LArG4H6SD/doc/packagedoc.h
index 296056ea1dea997ee4f2d5e7347324e14030e970..036c8188af658c94bca7a8fac1683874912a100b 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4H6SD/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArG4H6SD_page 
 
 This package contains various classes for H6 Test Beam simulation - Hits, Sensitive Detectors, Calculators, User Actions etc.
 
@@ -13,7 +13,5 @@ This package contains various classes for H6 Test Beam simulation - Hits, Sensit
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArG4/LArG4H8SD/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4H8SD/doc/packagedoc.h
similarity index 84%
rename from LArCalorimeter/LArG4/LArG4H8SD/doc/MainPage.h
rename to LArCalorimeter/LArG4/LArG4H8SD/doc/packagedoc.h
index 1a732116f3974be6f8044f6b805cca81be9d51a3..39a8451c4ac262b02a82838fa70d05fad25b7535 100644
--- a/LArCalorimeter/LArG4/LArG4H8SD/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4H8SD/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArG4H8SD_page 
 
 This package contains various classes for H8 Test Beam simulation:
 
@@ -21,7 +21,5 @@ This package contains various classes for H8 Test Beam simulation:
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArG4/LArG4HEC/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4HEC/doc/packagedoc.h
similarity index 80%
rename from LArCalorimeter/LArG4/LArG4HEC/doc/MainPage.h
rename to LArCalorimeter/LArG4/LArG4HEC/doc/packagedoc.h
index fdcf4ecc5709845d3d19fb57d2702eeb1e82160f..6903761d0e41254f67861d12ff160545062a8201 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4HEC/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArG4HEC_page 
 
 This package contains various helper classes and calculators used for LAr HEC simulation in G4
 
@@ -13,7 +13,5 @@ This package contains various helper classes and calculators used for LAr HEC si
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArG4/LArG4RunControl/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4RunControl/doc/packagedoc.h
similarity index 83%
rename from LArCalorimeter/LArG4/LArG4RunControl/doc/MainPage.h
rename to LArCalorimeter/LArG4/LArG4RunControl/doc/packagedoc.h
index 93b62ad42565eaba1ec8ce9d5bb46f8db7dea18b..3401f16c89fe8df341f3928b3c2f30f4750d0120 100644
--- a/LArCalorimeter/LArG4/LArG4RunControl/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4RunControl/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArG4RunControl_page 
 
 This package contains a set of classes which are used to pass various configuration parameters to LAr simulation at run time via G4AtlasApps python interface.
 
@@ -13,7 +13,5 @@ This package contains a set of classes which are used to pass various configurat
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArG4/LArG4SD/doc/MainPage.h b/LArCalorimeter/LArG4/LArG4SD/doc/packagedoc.h
similarity index 88%
rename from LArCalorimeter/LArG4/LArG4SD/doc/MainPage.h
rename to LArCalorimeter/LArG4/LArG4SD/doc/packagedoc.h
index c9e62edd052827ca3bd03531de4bdb0eff7cea57..416efe17af6d5026659615e9684c2ad60f7474a4 100644
--- a/LArCalorimeter/LArG4/LArG4SD/doc/MainPage.h
+++ b/LArCalorimeter/LArG4/LArG4SD/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArG4SD_page 
 
 This package contains implementations of three types of sensitive detectors used by LAr G4 simulation:
 
@@ -19,7 +19,5 @@ This package contains implementations of three types of sensitive detectors used
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArG4/LArG4ShowerLib/doc/mainpage.h b/LArCalorimeter/LArG4/LArG4ShowerLib/doc/packagedoc.h
similarity index 81%
rename from LArCalorimeter/LArG4/LArG4ShowerLib/doc/mainpage.h
rename to LArCalorimeter/LArG4/LArG4ShowerLib/doc/packagedoc.h
index e05118d679698c8d813b538aa52263bd835ea008..0ab77b08cd8ac7c45f7e1f463d551f0511088d99 100644
--- a/LArCalorimeter/LArG4/LArG4ShowerLib/doc/mainpage.h
+++ b/LArCalorimeter/LArG4/LArG4ShowerLib/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage LArG4ShowerLib Package
+@page LArG4ShowerLib_page LArG4ShowerLib Package
 
 @author Wolfgang Ehrenfeld <Wolfgang.Ehrenfeld@desy.de>
 @author Alexandre Glazov <alexandre.glazov@desy.de>
 
-@section LArG4ShowerLibIntro Introduction
+@section LArG4ShowerLib_LArG4ShowerLibIntro Introduction
 
 This package contains the data objects used for the Geant 4
 based shower parametrisation. 
 
-@section LArG4ShowerLibOverview Class Overview
+@section LArG4ShowerLib_LArG4ShowerLibOverview Class Overview
   The LArG4ShowerLib package contains of following data classes:
 
   Shower library classes:
@@ -34,7 +34,7 @@ based shower parametrisation.
   For all classes a dictionary exist. 
   See @link LArG4ShowerLibDict.h @endlink and @link selection.xml @endlink for more details.
 
-@section LArG4ShowerLib Extra Pages
+@section LArG4ShowerLib_LArG4ShowerLib Extra Pages
 
 - @ref used_LArG4ShowerLib
 - @ref requirements_LArG4ShowerLib
@@ -42,12 +42,10 @@ based shower parametrisation.
 
 /**
    @page used_LArG4ShowerLib Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_LArG4ShowerLib Requirements
-   @include requirements
 */
 
 
diff --git a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/doc/mainpage.h b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/doc/packagedoc.h
similarity index 85%
rename from LArCalorimeter/LArG4/LArG4ShowerLibSvc/doc/mainpage.h
rename to LArCalorimeter/LArG4/LArG4ShowerLibSvc/doc/packagedoc.h
index 20c4c4ae02d82d06bab858a67a9f63e79e203366..85faa4e5a50f211821d541d6e2cca98c647ff6bc 100644
--- a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/doc/mainpage.h
+++ b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage LArG4ShowerLibSvc Package
+@page LArG4ShowerLibSvc_page LArG4ShowerLibSvc Package
 
 @author Wolfgang Ehrenfeld <Wolfgang.Ehrenfeld@desy.de>
 @author Alexandre Glazov <alexandre.glazov@desy.de>
 
-@section LArG4ShowerLibSvcIntro Introduction
+@section LArG4ShowerLibSvc_LArG4ShowerLibSvcIntro Introduction
 
 This package contains the service to use Geant 4 based shower
 parametrisation in the simulation. At initialisation time the shower
@@ -17,7 +17,7 @@ memory. At execution time the service can be asked to substiute a
 certain particle and a list of energy deposits is returned. These
 need a dedicated sensitive detector to be put back into the simulation.
 
-@section LArG4ShowerLibSvcOverview Class Overview
+@section LArG4ShowerLibSvc_LArG4ShowerLibSvcOverview Class Overview
 
   The LArG4ShowerLibSvc package contains of following services:
 
@@ -31,7 +31,7 @@ need a dedicated sensitive detector to be put back into the simulation.
   - Shower library data structure: ShowerLib::ShowerLib (package )
   - Dedicated sensitive detectors: IFastSimDedicatedSD and BarrelFastSimDedicatedSD, EndcapFastSimDedicatedSD, FCALFastSimDedicatedSD
   
-@section LArG4ShowerLibSvcJobOptions Job Options and Configuration
+@section LArG4ShowerLibSvc_LArG4ShowerLibSvcJobOptions Job Options and Configuration
 
   The service can and should be configured using configurables. The customised code is in 
   LArG4ShowerLibSvcConfig.py. 
@@ -44,7 +44,7 @@ need a dedicated sensitive detector to be put back into the simulation.
   The list of properties for each service can be found here:
   - @link LArG4ShowerLibSvc::LArG4ShowerLibSvc @endlink
 
-@section LArG4ShowerLibSvc Extra Pages
+@section LArG4ShowerLibSvc_LArG4ShowerLibSvc Extra Pages
 
 - @ref used_LArG4ShowerLibSvc
 - @ref requirements_LArG4ShowerLibSvc
@@ -52,12 +52,10 @@ need a dedicated sensitive detector to be put back into the simulation.
 
 /**
    @page used_LArG4ShowerLibSvc Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_LArG4ShowerLibSvc Requirements
-   @include requirements
 */
 
 
diff --git a/LArCalorimeter/LArG4/LArG4Validation/doc/mainpage.h b/LArCalorimeter/LArG4/LArG4Validation/doc/packagedoc.h
similarity index 89%
rename from LArCalorimeter/LArG4/LArG4Validation/doc/mainpage.h
rename to LArCalorimeter/LArG4/LArG4Validation/doc/packagedoc.h
index e29e1e88b40bea719b8603f8d1328209d4456169..42eb22741ae227178891cbe1dd2222810bfb4ed3 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/doc/mainpage.h
+++ b/LArCalorimeter/LArG4/LArG4Validation/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage The LArG4Validation Package
+@page LArG4Validation_page The LArG4Validation Package
 
  - This class is for the validation of simulation, in particular for the liquid argon calorimetry
 
@@ -37,11 +37,9 @@
  - For questions or comments: Joe Boudreau 
    boudreau@pitt.edu
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section LArG4Validation_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section LArG4Validation_requirements Requirements
 
 */
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/doc/packagedoc.h
similarity index 91%
rename from LArCalorimeter/LArGeoModel/LArGeoAlgsNV/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoAlgsNV/doc/packagedoc.h
index 43af6af7e02d48eb5e9c10f234c5ae6845baaac5..7502ed9e68868fcabf6454d69057f9501a9e60a9 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoAlgsNV_page 
 
 LArGeoAlgsNV contains two key classes in the LAr GeoModel description
 
@@ -22,7 +22,5 @@ align() which applies misalignments on top of the 'regular' geometry.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoBarrel/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoBarrel/doc/packagedoc.h
similarity index 83%
rename from LArCalorimeter/LArGeoModel/LArGeoBarrel/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoBarrel/doc/packagedoc.h
index 4fbe6de6e7fd56fcf04f3ebfeeed4d63bbcaa53f..dcc323f3c1b4caa816711010503fac5b1fedca58 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoBarrel/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoBarrel/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoBarrel_page 
 
 LArGeoBarrel package builds GeoModel description of the LAr Electromagnetic
 Barrel. This description also includes dead material description in
@@ -15,7 +15,5 @@ the crack region.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoCode/doc/packagedoc.h
similarity index 89%
rename from LArCalorimeter/LArGeoModel/LArGeoCode/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoCode/doc/packagedoc.h
index b4906dc4dda1e3274dccf2d1370ec9249be711cd..682172fe24dbfdbf27e490a54a44b397917ad2a2 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoCode/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoCode_page 
 
 This package contains classes used by few other LArG4 and LArGeoModel packages. These classes are:
 
@@ -17,7 +17,5 @@ This package contains classes used by few other LArG4 and LArGeoModel packages.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoEndcap/doc/packagedoc.h
similarity index 85%
rename from LArCalorimeter/LArGeoModel/LArGeoEndcap/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoEndcap/doc/packagedoc.h
index 6b7565305b9ca453c9363be87b5bf1db428f016a..00990da3b8fa92751ce7fbede44c4305514a6bfd 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoEndcap_page 
 
 GeoModel description of the LAr End Cap. Includes
 
@@ -21,7 +21,5 @@ GeoModel description of the LAr End Cap. Includes
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoFcal/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoFcal/doc/packagedoc.h
similarity index 76%
rename from LArCalorimeter/LArGeoModel/LArGeoFcal/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoFcal/doc/packagedoc.h
index 8326558407d1d29f1366faadb1b47e1792611a57..54e5608a36b8aa7650a6d1585f4ef19cd3485309 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoFcal/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoFcal/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoFcal_page 
 
 GeoModel description of LAr FCAL
 
@@ -13,7 +13,5 @@ GeoModel description of LAr FCAL
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/doc/packagedoc.h
similarity index 79%
rename from LArCalorimeter/LArGeoModel/LArGeoH62002Algs/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoH62002Algs/doc/packagedoc.h
index 88e23e3e7c3ad0af6fe74466910f25d914ccbb5a..38d4bb8a007a4393809898c7eee8090b16bac34f 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoH62002Algs_page 
 
 This package contains GeoModel description of LAr H62002 Test Beam setup.
 
@@ -13,7 +13,5 @@ This package contains GeoModel description of LAr H62002 Test Beam setup.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/doc/packagedoc.h
similarity index 79%
rename from LArCalorimeter/LArGeoModel/LArGeoH62003Algs/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoH62003Algs/doc/packagedoc.h
index 506daec5da22b00babef3e8fbb1bf6a6913a8f8c..f1904257ca4ebc7d6c4468a16ebc125c18b967a5 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoH62003Algs_page 
 
 This package contains GeoModel description of LAr H62003 Test Beam setup.
 
@@ -13,7 +13,5 @@ This package contains GeoModel description of LAr H62003 Test Beam setup.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/doc/packagedoc.h
similarity index 79%
rename from LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/doc/packagedoc.h
index 99603b9b1987e7def32bdcddf71aa46a69d159a1..2e4c510210094c49c225a0e7ba37f5660259d3c1 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoH6Cryostats_page 
 
 This package GeoModel description of the H6 Test Beam setup cryostat.
 
@@ -13,7 +13,5 @@ This package GeoModel description of the H6 Test Beam setup cryostat.
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoHec/doc/packagedoc.h
similarity index 76%
rename from LArCalorimeter/LArGeoModel/LArGeoHec/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoHec/doc/packagedoc.h
index f885a380e7163a4253904410209e53439b41eecb..74821e99d900490d659f7e2c4f788bb16749e07b 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoHec/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoHec/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoHec_page 
 
 GeoModel description of LAr HEC
 
@@ -13,7 +13,5 @@ GeoModel description of LAr HEC
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoRAL/doc/packagedoc.h
similarity index 83%
rename from LArCalorimeter/LArGeoModel/LArGeoRAL/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoRAL/doc/packagedoc.h
index 5c00263851d36c321bc037c637923f70e73d63d1..de006d87366d31e10ae271b5e3d4ba921ec49951 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoRAL_page 
 
 This package provides an interface, which is used by various LAr GeoModel applications for accessing detector description primary numbers in the Geometry Database.
 
@@ -13,7 +13,5 @@ This package provides an interface, which is used by various LAr GeoModel applic
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/doc/packagedoc.h
similarity index 80%
rename from LArCalorimeter/LArGeoModel/LArGeoTBBarrel/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoTBBarrel/doc/packagedoc.h
index 59bf720a639c18e30a71bcde8209952244e22591..c26d28c03493967891a1783625052988b132aaa6 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoTBBarrel_page 
 
 This package contains GeoModel description of the LAr Barrel Cryostat used in Test Beam setups.
 
@@ -14,7 +14,5 @@ This package contains GeoModel description of the LAr Barrel Cryostat used in Te
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/doc/MainPage.h b/LArCalorimeter/LArGeoModel/LArGeoTBEC/doc/packagedoc.h
similarity index 79%
rename from LArCalorimeter/LArGeoModel/LArGeoTBEC/doc/MainPage.h
rename to LArCalorimeter/LArGeoModel/LArGeoTBEC/doc/packagedoc.h
index b2bd4e1146136302a4be04898840451557a15fab..71d62fba756bddaf11583d34cd2367c6c314011d 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/doc/MainPage.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/doc/packagedoc.h
@@ -5,7 +5,7 @@
 /**
 
 
-@mainpage
+@page LArGeoTBEC_page 
 
 This package contains GeoModel description of the EMEC Test Beam setup
 
@@ -13,7 +13,5 @@ This package contains GeoModel description of the EMEC Test Beam setup
   REQUIREMENTS 
 --------------------------------
 
-@include requirements
-@htmlinclude used_packages.html 
 
 */
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/mainpage.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/mainpage.h
rename to LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/packagedoc.h
index b919520e85f856bdc85de462592ee40ea1dc0846..5a305a276041c35a3890d66d8969293dad034a06
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/mainpage.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/packagedoc.h
@@ -5,7 +5,7 @@
 // Mainpage for doxygen
 
 /**
-@mainpage package LArReadoutGeometry
+@page LArReadoutGeometry_page package LArReadoutGeometry
 
 LArReadoutGeometry is the detector description for the Liquid Argon 
 Calorimeter. Users can interact with this package to obtain details
@@ -91,7 +91,7 @@ available form EMBDetectorManager, EMECDetectorManager, HECDetectorManager,
 and FCALDetectorManager.
 
 
-@section EMB EMBDetectorManager and Related Classes
+@section LArReadoutGeometry_EMB EMBDetectorManager and Related Classes
 
 The EMBDetectorManager provides both iterative and random access to the detector
 regions (class EMBDetectorRegion).  For random access, an endcap index, sampling
@@ -111,7 +111,7 @@ to those numbers than RDBAccessSvc, which in any case should not be accessed
 during event processing. The class EMBAccordionDetails is similar, but it has
 not yet been fully developed and so it is, for now, not defined.
 
-@section EMEC EMECDetectorManager and Related Classes
+@section LArReadoutGeometry_EMEC EMECDetectorManager and Related Classes
 
 The EMECDetector manager provides access to four detector regions (two endcaps
 for both inner and outer wheels).  The regions (class EMECDetectorRegion) can 
@@ -135,7 +135,7 @@ of the back face of the cryostat, determine the location of the focal points.
 A number of important database constants (e.g. Sampling Separations) are also part
 of the interface of EMECDetectorManager.
 
-@section HEC HECDetectorManager and Related Classes
+@section LArReadoutGeometry_HEC HECDetectorManager and Related Classes
 
 The HEC is a semi-projective calorimeter.  The eta-boundaries follow a staircase
 shape, and the "eta-boundaries" follow the staircase.  In addition, the HEC,
@@ -156,7 +156,7 @@ HEC boundaries, while those lacking that string refer to the actual staircase
 shaped HEC boundaries which are described in some detail in this packages.  Boundaries
 can be obtained for the front, middle, or back of a cell.
 
-@section FCAL FCALDetectorManager and Related Classes
+@section LArReadoutGeometry_FCAL FCALDetectorManager and Related Classes
 
 The FCALDetectorManager can return six modules (class FCALModules)  which is the FCAL
 equivalent of a detector region.  The modules return tiles (class FCALTile) which is 
@@ -169,12 +169,12 @@ which is available through the interface of FCALDetectorManager.
 
 
 
-@section DESCRIPTORS Descriptors.
+@section LArReadoutGeometry_DESCRIPTORS Descriptors.
 
 All of the classes discussed above have descriptors for the regions.  These are
 not considered user classes and so are not discussed in any detail here.  
 
-@section PHI Phi boundaries and indices.
+@section LArReadoutGeometry_PHI Phi boundaries and indices.
 
 The basic idea behind the phi boundaries and numbering is that the two endcaps
 are created identically but positioned differently in the detector.  However,
@@ -184,7 +184,7 @@ end of the detector.  The negative endcap thus has a local coordinate that
 starts at M_PI, decreases to zero, and increases to -M_PI.   This produces, in global
 coordinates, a phi that increases with index from 0 to 2*M_PI.
 
-@section VIS Visualization of LArReadout.
+@section LArReadoutGeometry_VIS Visualization of LArReadout.
 
 The v-atlas program (soon to be replaced by the vp1 program) can show the LAr
 readout geometry including cell boundaries and focal point postions. One can
diff --git a/LArCalorimeter/LArIdentifier/doc/mainpage.h b/LArCalorimeter/LArIdentifier/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from LArCalorimeter/LArIdentifier/doc/mainpage.h
rename to LArCalorimeter/LArIdentifier/doc/packagedoc.h
index 9a378c8bd6025f1579e78d6d5b237c456fb30862..2e4011e02e62314fc0eb03e2c865bf377d24f221
--- a/LArCalorimeter/LArIdentifier/doc/mainpage.h
+++ b/LArCalorimeter/LArIdentifier/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage LArIdentifier Package
+@page LArIdentifier_page LArIdentifier Package
 @author arnaud.lucotte@lpsc.in2p3.fr
 
-@section LArIdentifierIntro Introduction
+@section LArIdentifier_LArIdentifierIntro Introduction
 
 This package implements a certain number of classes of identifiers used to describe the calorimeter 
 cells. <br>
@@ -31,7 +31,7 @@ identifiers of a specific sub-system, per eta, etc...)
 This package contains three main classes of identifiers: one for the hardware description 
 of a cell, and two used in the HighVoltage description of a cell.
 
-@section LArIdentifierOverview Class Overview
+@section LArIdentifier_LArIdentifierOverview Class Overview
   The LArIdentifier package contains of following classes:
   - LArOnlineID: base identifiers to describe calorimeter 
                  cells from the hardware standpoint 
@@ -64,10 +64,8 @@ of a cell, and two used in the HighVoltage description of a cell.
 
 /**
 @page used_LArIdentifier Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_LArIdentifier Requirements
-@include requirements
 */
diff --git a/LArCalorimeter/LArL1Sim/doc/mainpage.h b/LArCalorimeter/LArL1Sim/doc/packagedoc.h
similarity index 92%
rename from LArCalorimeter/LArL1Sim/doc/mainpage.h
rename to LArCalorimeter/LArL1Sim/doc/packagedoc.h
index c9fbfec918c394dcff7f9079b78072644ab5b608..e2737d35a56097838f66ccb1084a1f44aeba54e0 100644
--- a/LArCalorimeter/LArL1Sim/doc/mainpage.h
+++ b/LArCalorimeter/LArL1Sim/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page LArL1Sim_page 
 
 The aim of the main algorithm of the present package (LArTTL1Maker) is the simulation of the LAr analogue trigger tower sums. <br>
 
@@ -15,8 +15,6 @@ The aim of the main algorithm of the present package (LArTTL1Maker) is the simul
 There is a second algorithm, LArTTL1Calib, which is meant to be run in standalone in order to perform the energy calibration of the Trigger Towers.
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/LArCalorimeter/LArOnlDbPrep/doc/mainpage.h b/LArCalorimeter/LArOnlDbPrep/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 82%
rename from LArCalorimeter/LArOnlDbPrep/doc/mainpage.h
rename to LArCalorimeter/LArOnlDbPrep/doc/packagedoc.h
index f4e16987b9b7ca4976ab378e07cc474f2b3a27d0..d31edd2f4fad9601c634f6c2928861ba5d295cd3
--- a/LArCalorimeter/LArOnlDbPrep/doc/mainpage.h
+++ b/LArCalorimeter/LArOnlDbPrep/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage LArOnlDbPrep Package
+@page LArOnlDbPrep_page LArOnlDbPrep Package
 
 This package provides tools for preparing calibration data for online use.
 
@@ -12,14 +12,14 @@ This package provides tools for preparing calibration data for online use.
 @author Hong Ma <hma@bnl.gov>
 @author Hucheng Chen <chc@bnl.gov>
 
-@section  Data
+@section LArOnlDbPrep_Data 
 LArOnlCalibData : data structure for online calibration data.
 
-@section  Tool 
+@section LArOnlDbPrep_Tool 
 LArOnlDbPrepTool : this tool reads the offline conditions data objects, and 
 prepare the online calibration data in the form of LArOnlCalibData
 
-@section JobOptions
+@section LArOnlDbPrep_JobOptions 
 
 LArOnlineDB_Server.py : This runs on the Athena side, as the server.
 LArOnlineDB_Client.py : This is the jobOptions to be sent from client side, 
diff --git a/LArCalorimeter/LArROD/doc/mainpage.h b/LArCalorimeter/LArROD/doc/packagedoc.h
similarity index 94%
rename from LArCalorimeter/LArROD/doc/mainpage.h
rename to LArCalorimeter/LArROD/doc/packagedoc.h
index 47f76a463d825b20a55d46ac576a8300148e5d33..9f73bc0f0d99bd259735b420c1da2f67db86ea6e 100644
--- a/LArCalorimeter/LArROD/doc/mainpage.h
+++ b/LArCalorimeter/LArROD/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage CaloRec Package
+@page LArROD_page CaloRec Package
 
 This package provides algorithms for Calorimeter reconstruction.
 
diff --git a/LArCalorimeter/LArRawConditions/doc/mainpage.h b/LArCalorimeter/LArRawConditions/doc/packagedoc.h
similarity index 94%
rename from LArCalorimeter/LArRawConditions/doc/mainpage.h
rename to LArCalorimeter/LArRawConditions/doc/packagedoc.h
index 5732a4deaa24e737fb076bf075abf3ba84362e95..5ae8f976b23ada873178fa5a9ea854df4e30f752 100644
--- a/LArCalorimeter/LArRawConditions/doc/mainpage.h
+++ b/LArCalorimeter/LArRawConditions/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  LArRawConditions
+@page LArRawConditions_page LArRawConditions
 @author Marco.Delmastro@cern.ch
 
-@section LArRawConditionsIntro Introduction
+@section LArRawConditions_LArRawConditionsIntro Introduction
 
 This package containes the concrete implementation classes of the electronics
 calibration constants for the LAr calorimeters. The classes are normally recorded
@@ -14,7 +14,7 @@ in the ConditionsStore, and to be used by Algorithms. The interfaces to retrieve
 the data classes contained in this this package are found in <a
 href="http://isscvs.cern.ch/cgi-bin/viewcvs-all.cgi/offline/LArCalorimeter/LArElecCalib/?cvsroot=atlas">LArCalorimeter/LArElecCalib</a>.
 
-@section LArRawConditionsOverview Class Overview
+@section LArRawConditions_LArRawConditionsOverview Class Overview
   
   The LArRawConditions package contains of following classes:
 
@@ -148,10 +148,8 @@ href="http://isscvs.cern.ch/cgi-bin/viewcvs-all.cgi/offline/LArCalorimeter/LArEl
 
 /**
 @page used_LArRawConditions Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_LArRawConditions Requirements
-@include requirements
 */
diff --git a/LArCalorimeter/LArRawEvent/doc/mainpage.h b/LArCalorimeter/LArRawEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 80%
rename from LArCalorimeter/LArRawEvent/doc/mainpage.h
rename to LArCalorimeter/LArRawEvent/doc/packagedoc.h
index 7e55bcd590aaf9e759b0b822af1cfafe1d4cd21f..77793792fe4a1eeddb226cf70d44fbff7edb88a9
--- a/LArCalorimeter/LArRawEvent/doc/mainpage.h
+++ b/LArCalorimeter/LArRawEvent/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage LArRawEvent Package
+@page LArRawEvent_page LArRawEvent Package
 
 This package provides the RAW event data model classes for LArCalorimeter.
 
-@section LArRawEventDigit Digit related classes
+@section LArRawEvent_LArRawEventDigit Digit related classes
 
 LArDigit is the output of the FEB (and hence the digitization package) describing the digitized waveform shape.
 All LArDigits are stored in a LArDigitContainer <br>
@@ -16,13 +16,13 @@ LArCalibDigit is a LArDigit plus some information for electronics calibration da
 All LArCalibDigits are stored in LArCalibDigitContainer <br>
 LArAccumulatedCalibDigit is the result of the accumulation inside the DSP of LArCalibDigit. It saves the sum and the sum of the squares of the ADC counts for the accumulated events with the same calibration settings.  All LArAccumulatedCalibDigits are stored in LArAccimulatedCalibDigitContainer <br>
 
-@section LArRawEventRawChannel Raw Channel related classes
+@section LArRawEvent_LArRawEventRawChannel Raw Channel related classes
 LArRawChannel is the output of the ROD processing and contain the fitted waveform results. All LArRawChannel are stored in a LArRawChannelCollection.
 Each LArRawChannelCollection corresponds to data in one ROB. Therefore a collection of LArRawChannelCollection is saved in an IdentifiableContainer called LArRawChannelContainer.
 
-@section LArRawEventTTL1  L1 trigger related classes
+@section LArRawEvent_LArRawEventTTL1 L1 trigger related classes
 LArTTL1 is a digitized L1 trigger tower for the LAr. All LArTTL1 are stored in a LArTTL1Container.
 
-@section LArRawEventOther Other LArRawEvent classes
+@section LArRawEvent_LArRawEventOther Other LArRawEvent classes
 
 */
diff --git a/LArCalorimeter/LArRawUtils/doc/mainpage.h b/LArCalorimeter/LArRawUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 80%
rename from LArCalorimeter/LArRawUtils/doc/mainpage.h
rename to LArCalorimeter/LArRawUtils/doc/packagedoc.h
index fc0ead38ad048abe12b68faab51d5324348fe3fd..218c33ce818049252b2c9b110469b0f5d5a76ca8
--- a/LArCalorimeter/LArRawUtils/doc/mainpage.h
+++ b/LArCalorimeter/LArRawUtils/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage LArRawUtils Package
+@page LArRawUtils_page LArRawUtils Package
 
 This package provides tools for LAr raw data reconstruction. 
 
 
 @author Hong Ma <hma@bnl.gov>
 
-@section LArRoI_Map LArRoI_Map class
+@section LArRawUtils_LArRoI_Map LArRoI_Map class
 
 This class provides mapping between LAr channel identifiers and trigger tower identifiers, 
 as well as mapping between trigger tower and readout module id.  LArReadoutModuleID provides ROB fragment id. 
diff --git a/LArCalorimeter/LArRecEvent/doc/mainpage.h b/LArCalorimeter/LArRecEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from LArCalorimeter/LArRecEvent/doc/mainpage.h
rename to LArCalorimeter/LArRecEvent/doc/packagedoc.h
index 02508dffa1c9fab23ff7ca361e84f71f1310d65e..24c277c3f7e194a9f3cb724433c0b5b1ff1d10b9
--- a/LArCalorimeter/LArRecEvent/doc/mainpage.h
+++ b/LArCalorimeter/LArRecEvent/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage LArRecEvent Package
+@page LArRecEvent_page LArRecEvent Package
 
 This package contains reconstruction data classes specific for LAr 
 
 @author Hong Ma <hma@bnl.gov>
 
-@section LArCell LArCell 
+@section LArRecEvent_LArCell LArCell
   
 LArCell is a derived class that extends CaloCell for LAr readout cells.
 
@@ -18,7 +18,7 @@ LArCellContainer : obsolete class.  LArCells are stored in CaloCellContainer.
 
 LArCellIDC :  IdentifiableContainer for LArCell. Only used in Event Filter
 
-@section LArFebEnergy LArFebEnergy
+@section LArRecEvent_LArFebEnergy LArFebEnergy
 
 LArFebEnergy holds the sum of Ex, Ey and Ez for each FEB, which can be prepared in ROD.
 
diff --git a/LArCalorimeter/LArRecUtils/doc/mainpage.h b/LArCalorimeter/LArRecUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from LArCalorimeter/LArRecUtils/doc/mainpage.h
rename to LArCalorimeter/LArRecUtils/doc/packagedoc.h
index 04e47219dbba30a61c3a14c281f6393b53f4b26f..35a2c575bfec3ca724c158989bce56b922532bbd
--- a/LArCalorimeter/LArRecUtils/doc/mainpage.h
+++ b/LArCalorimeter/LArRecUtils/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage LArRecUtils Package
+@page LArRecUtils_page LArRecUtils Package
 
 This package provides tools for LAr reconstruction
 
@@ -15,7 +15,7 @@ This package provides tools for LAr reconstruction
 @author Kai Voss  <Kai.Voss@cern.ch>
 @author G.Unal <Guillaume.Unal@cern.ch>
 
-@section  Tools for noise and OFC computation on the fly (interfaces in LArElecCalib)
+@section LArRecUtils_Tools for noise and OFC computation on the fly (interfaces in LArElecCalib)
 
 LArAutoCorrTotalTool:  compute total (electronics+pileup) noise autocorrelation. 
   Returns a vector of N(N-1)/2 values with N=number of samples
@@ -30,13 +30,13 @@ LArOFCTool: tool to compute OFC on the fly, from all the basics database ingredi
 The python directory contains default python classes for the configuration of these tools depending
 on the job properties
 
-@section  BadChannel Tools that deal with problems
+@section LArRecUtils_BadChannel Tools that deal with problems
 
 LArBadChennelTool:  classify problem channels, for H8 test beam only.
 
 LArCellFakeProbElectronics, LArCellFakeProbHV: emulate electronics and HV problem .
 
-@section SignalReco Signal reconstruction tools 
+@section LArRecUtils_SignalReco Signal reconstruction tools
 
 LArOFPeakRecoTool,LArParabolaPeakRecoTool,LArShapePeakRecoTool: signal reconstruction using different algorithms.
 
diff --git a/LArCalorimeter/LArRegionSelector/doc/mainpage.h b/LArCalorimeter/LArRegionSelector/doc/packagedoc.h
similarity index 90%
rename from LArCalorimeter/LArRegionSelector/doc/mainpage.h
rename to LArCalorimeter/LArRegionSelector/doc/packagedoc.h
index 255fb18488ae6bed2cadae3a392e3348f6b2104e..13f1283263949b2da6dc4497f188dba38e963a94 100644
--- a/LArCalorimeter/LArRegionSelector/doc/mainpage.h
+++ b/LArCalorimeter/LArRegionSelector/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page LArRegionSelector_page 
 
 This package contains one Service, LArRegionSelectorTable, which generates the tables of element extents
  and ROBids used by the region selector.<br>
@@ -26,8 +26,6 @@ meant to be run in standalone, for test purposes.<br>
 
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/LArCalorimeter/LArSimEvent/doc/mainpage.h b/LArCalorimeter/LArSimEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 68%
rename from LArCalorimeter/LArSimEvent/doc/mainpage.h
rename to LArCalorimeter/LArSimEvent/doc/packagedoc.h
index ab95bde4a0aec2dc32755a56b4edc7333b9d9b79..4a8d0d1ea5107275cb340ae2a09180aaefc1e866
--- a/LArCalorimeter/LArSimEvent/doc/mainpage.h
+++ b/LArCalorimeter/LArSimEvent/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
-@mainpage LArSimEvent Package
+@page LArSimEvent_page LArSimEvent Package
 
 This package provides the simulation data model for LAr Calorimeter.
 
 @author Bill Seligman
 @author many many others
 
-@section LArSimEventHit Hit related classes
+@section LArSimEvent_LArSimEventHit Hit related classes
 
 LArHit describes the output of the G4 simulation. Each LArHit contains the energy deposit in the visible calorimeter per cell. All LArHits are saved in a LArHitsContainer.
 
-@section LArSimEventOther Other Simulation Data Model classes
+@section LArSimEvent_LArSimEventOther Other Simulation Data Model classes
 */
diff --git a/LArCalorimeter/LArTest/LArCalibTest/doc/mainpage.h b/LArCalorimeter/LArTest/LArCalibTest/doc/packagedoc.h
similarity index 84%
rename from LArCalorimeter/LArTest/LArCalibTest/doc/mainpage.h
rename to LArCalorimeter/LArTest/LArCalibTest/doc/packagedoc.h
index 4f2ad9ad3075381c5e5f4cc1f5695d786d6a3c3b..a32d4e9a885b842f4139417ecea1d4e7d37a7c35 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/doc/mainpage.h
+++ b/LArCalorimeter/LArTest/LArCalibTest/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage LArCalibTest Package
+@page LArCalibTest_page LArCalibTest Package
 
 This package is used to test calibration in the LAr calorimeter.
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/doc/mainpage.h b/LArCalorimeter/LArTest/LArConditionsTest/doc/packagedoc.h
similarity index 64%
rename from LArCalorimeter/LArTest/LArConditionsTest/doc/mainpage.h
rename to LArCalorimeter/LArTest/LArConditionsTest/doc/packagedoc.h
index 431afc88072c822fa4893cd0d6f43ef21d7e2eba..31ffd94af1439cffca177ee2cc8632d46a24e18c 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/doc/mainpage.h
+++ b/LArCalorimeter/LArTest/LArConditionsTest/doc/packagedoc.h
@@ -4,23 +4,23 @@
 
 /**
 
-@mainpage LArConditionsTest Package
+@page LArConditionsTest_page LArConditionsTest Package
 
 This package provides algorithms for testing LAr Calorimeter conditions data 
 
 @author Hong Ma <hma@bnl.gov>
 @author RD Schaffer 
 
-@section LArConditionsTestAlg Test LAr MC conditions data object
+@section LArConditionsTest_LArConditionsTestAlg Test LAr MC conditions data object
       LArConditionsTestAlg
 
-@section FixLArCondDB ElecCalib  Algorithms to fix the LAr conditions data 
+@section LArConditionsTest_FixLArCondDB ElecCalib Algorithms to fix the LAr conditions data
 
    FixLArElecCalib : fix electronics calibration data. 
 
    FixLArIdMap :     fix the LAr identifier mapping data 
 
-@section  DCSTest Test DCS data 
+@section LArConditionsTest_DCSTest Test DCS data
 
   LArFecLvTempDcsTest Test FrontEnd Crate Low Voltage DCS data in Athena
 
diff --git a/LArCalorimeter/LArTest/LArEventTest/doc/mainpage.h b/LArCalorimeter/LArTest/LArEventTest/doc/packagedoc.h
similarity index 83%
rename from LArCalorimeter/LArTest/LArEventTest/doc/mainpage.h
rename to LArCalorimeter/LArTest/LArEventTest/doc/packagedoc.h
index c3219a381b82b20fcb358ec3394ebaa36b4d1d93..390a78abdd0373aeb8b8078c92efda29389f5f92 100644
--- a/LArCalorimeter/LArTest/LArEventTest/doc/mainpage.h
+++ b/LArCalorimeter/LArTest/LArEventTest/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage LArEventTest Package
+@page LArEventTest_page LArEventTest Package
 
 This package is used to test the event datamodel in the LArCalorimeter
 
diff --git a/LArCalorimeter/LArTools/doc/mainpage.h b/LArCalorimeter/LArTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from LArCalorimeter/LArTools/doc/mainpage.h
rename to LArCalorimeter/LArTools/doc/packagedoc.h
index 273347003d9534783d57abba3a5e68b2f0ca50ed..920d1064c2dbaa1f510caa5024e3919e2c17dada
--- a/LArCalorimeter/LArTools/doc/mainpage.h
+++ b/LArCalorimeter/LArTools/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage LArTools Package
+@page LArTools_page LArTools Package
 
 This package provides tools for LAr identifier mapping. 
 
@@ -14,7 +14,7 @@ This package provides tools for LAr identifier mapping.
 @author Fabienne Ledroit <ledroit@lpsc.in2p3.fr>
 @author Arnaud Lucotte <arnaud.lucotte@lpsc.in2p3.fr>
 
-@section SignalMap Signal channel cabling mapping
+@section LArTools_SignalMap Signal channel cabling mapping
 
 LArCablingService (an AlgTool) provides the cabling mapping for signal channels, between online and offline identifiers.
 It also provide the definition of LArReadoutModuleID (defined in LArIdentifier package), and the mapping from FEB ID to 
@@ -27,7 +27,7 @@ LArFebRod_P and LArOnOffId_P are persistent data structure.
 web page:  http://lpsc.in2p3.fr/atlas/fabienne/identifiers.html
   http://lpsc.in2p3.fr/atlas/lucotte/3.SOFTWARE/software_online.html
 
-@section HVMap HV channel mapping
+@section LArTools_HVMap HV channel mapping
 
 LArHVCablingTool provides the mapping between the HV channel and the detector electrode.,
 It is also responsbile for encoding and decoding the LArHVCellID and LArHVDetectorID and LArHVElectrodeID.
@@ -37,7 +37,7 @@ LArHVMap is a data class that contains the mapping.
 web page:
 http://lpsc.in2p3.fr/atlas/lucotte/3.SOFTWARE/software_highvoltage.html
 
-@section OtherClasses Other classes
+@section LArTools_OtherClasses Other classes
 
 LArMCSymTool  is a tool that maps a LAr readout channel id to a channel that is considered good for MC symmetry. Typically it is first channel in phi.
 
diff --git a/LArCalorimeter/LArTrackingGeometry/doc/mainpage.h b/LArCalorimeter/LArTrackingGeometry/doc/packagedoc.h
similarity index 80%
rename from LArCalorimeter/LArTrackingGeometry/doc/mainpage.h
rename to LArCalorimeter/LArTrackingGeometry/doc/packagedoc.h
index 774f28c3dc5e35fe52f5cd0900e211a886c9b18a..3ff40e39b9304a75c91cd96861616bc3fd6953c3 100644
--- a/LArCalorimeter/LArTrackingGeometry/doc/mainpage.h
+++ b/LArCalorimeter/LArTrackingGeometry/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage LArTrackingGeometry package
+@page LArTrackingGeometry_page LArTrackingGeometry package
 
 @author Andreas.Salzburger@cern.ch
 
-@section LArTrackingGeometryIntro Introduction
+@section LArTrackingGeometry_LArTrackingGeometryIntro Introduction
 
 This packge contains a single AthAlgTool, the LArVolumeBuilder that
 translates the LArGeometry description into Trk::TrackingVolume objects.
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/doc/mainpage.h b/MuonSpectrometer/Amdcsimrec/AmdcAth/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 71%
rename from MuonSpectrometer/Amdcsimrec/AmdcAth/doc/mainpage.h
rename to MuonSpectrometer/Amdcsimrec/AmdcAth/doc/packagedoc.h
index 22b7f42c369de6630f73909ee1c672fb2c562137..27a97fd527e794287f5080f5be5d55087290f06d
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/doc/mainpage.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/doc/packagedoc.h
@@ -4,22 +4,22 @@
 
 /**
 
-@mainpage AmdcAth Package
+@page AmdcAth_page AmdcAth Package
 
 @author samusog@cern.ch
 
-@section IntroductionAmdcAth Introduction
+@section AmdcAth_IntroductionAmdcAth Introduction
 
 AmdcAth is a package of the Amdcsimrec package.
 It contains the service to access Amdcsimrec functionnalities
 
-@section OverviewAmdcAth Class Overview
+@section AmdcAth_OverviewAmdcAth Class Overview
 
 The AmdcAth package contains:
 
   - AmdcsimrecAthenaSvc is the service needed to access Amdcsimrec functionnalities
 
-@section ExtrasAmdcAth Extra Pages
+@section AmdcAth_ExtrasAmdcAth Extra Pages
 
   - @ref used_AmdcAth
   - @ref requirements_AmdcAth
@@ -28,10 +28,8 @@ The AmdcAth package contains:
 
 /**
 @page used_AmdcAth Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AmdcAth Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/doc/mainpage.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 74%
rename from MuonSpectrometer/Amdcsimrec/AmdcCore/doc/mainpage.h
rename to MuonSpectrometer/Amdcsimrec/AmdcCore/doc/packagedoc.h
index 7f8be23a91ecbef05407c11167dc9ebbb399da63..368ece254e494c1526f79af060bc20b0d9f68d24
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/doc/mainpage.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage AmdcCore Package
+@page AmdcCore_page AmdcCore Package
 
 @author samusog@cern.ch
 
-@section IntroductionAmdcCore Introduction
+@section AmdcCore_IntroductionAmdcCore Introduction
 
 AmdcCore is a package of the Amdcsimrec package.
 It contains the base interface to Amdcsimrec functionnalities
 
-@section OverviewAmdcCore Class Overview
+@section AmdcCore_OverviewAmdcCore Class Overview
 
 The AmdcCore package contains:
 
@@ -21,7 +21,7 @@ The AmdcCore package contains:
 
   - AmdcsimrecAccess: this class provides a static access to a Amdcsimrec interface
  
-@section ExtrasAmdcCore Extra Pages
+@section AmdcCore_ExtrasAmdcCore Extra Pages
 
   - @ref used_AmdcCore
   - @ref requirements_AmdcCore
@@ -30,10 +30,8 @@ The AmdcCore package contains:
 
 /**
 @page used_AmdcCore Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AmdcCore Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcData/doc/mainpage.h b/MuonSpectrometer/Amdcsimrec/AmdcData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 71%
rename from MuonSpectrometer/Amdcsimrec/AmdcData/doc/mainpage.h
rename to MuonSpectrometer/Amdcsimrec/AmdcData/doc/packagedoc.h
index 97f39937e429eebea3234eb27c98712e3ef3ba5a..b3b1402f03767fc98619e453bf460dbb65b11ef5
--- a/MuonSpectrometer/Amdcsimrec/AmdcData/doc/mainpage.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcData/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage AmdcData Package
+@page AmdcData_page AmdcData Package
 
 @author samusog@cern.ch
 
-@section IntroductionAmdcData Introduction
+@section AmdcData_IntroductionAmdcData Introduction
 
 AmdcData is a package of the Amdcsimrec package.
 It contains (share sub dir)
 the source Ascii files for the Muon Spectrometer geometry description
 
-@section ExtrasAmdcData Extra Pages
+@section AmdcData_ExtrasAmdcData Extra Pages
 
   - @ref used_AmdcData
   - @ref requirements_AmdcData
@@ -23,10 +23,8 @@ the source Ascii files for the Muon Spectrometer geometry description
 
 /**
 @page used_AmdcData Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AmdcData Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/doc/mainpage.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from MuonSpectrometer/Amdcsimrec/AmdcDb/doc/mainpage.h
rename to MuonSpectrometer/Amdcsimrec/AmdcDb/doc/packagedoc.h
index 257c0b94fbc7b24d00d86f522deb79e3dbcf2c94..333293423c1c496ea4f52e3efc6498e3faaf8467
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/doc/mainpage.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage AmdcDb Package
+@page AmdcDb_page AmdcDb Package
 
 @author samusog@cern.ch
 
-@section IntroductionAmdcDb Introduction
+@section AmdcDb_IntroductionAmdcDb Introduction
 
 AmdcDb is a package of the Amdcsimrec package.
 It contains an implementation of IRDBAccessSvc used
@@ -17,7 +17,7 @@ to do comparison of Amdc and Oracle tables.
 A documentation in pdf format is available in
 the CVS repository of the package in the sub dir doc/
 
-@section OverviewAmdcDb Class Overview
+@section AmdcDb_OverviewAmdcDb Class Overview
 
 The AmdcDb package contains:
 
@@ -36,7 +36,7 @@ The AmdcDb package contains:
   - AmdcDb2Sql is a class producing Sql files
 
 
-@section ExtrasAmdcDb Extra Pages
+@section AmdcDb_ExtrasAmdcDb Extra Pages
 
   - @ref used_AmdcDb
   - @ref requirements_AmdcDb
@@ -45,10 +45,8 @@ The AmdcDb package contains:
 
 /**
 @page used_AmdcDb Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AmdcDb Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcMGM/doc/mainpage.h b/MuonSpectrometer/Amdcsimrec/AmdcMGM/doc/packagedoc.h
similarity index 77%
rename from MuonSpectrometer/Amdcsimrec/AmdcMGM/doc/mainpage.h
rename to MuonSpectrometer/Amdcsimrec/AmdcMGM/doc/packagedoc.h
index 9dfd6280346a642524043eefab3501c28d9da08e..d00c4844597346702751a56fc9cab5c7b6d8067b 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcMGM/doc/mainpage.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcMGM/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage AmdcMGM Package
+@page AmdcMGM_page AmdcMGM Package
 
 @author samusog@cern.ch
 
-@section IntroductionAmdcMGM Introduction
+@section AmdcMGM_IntroductionAmdcMGM Introduction
 
 AmdcMGM is a package of the Amdcsimrec package.
 It compares positions of active elements of the 
@@ -18,14 +18,14 @@ the Muon GeoModel
 A documentation in pdf format is available in 
 the CVS repository of the package in the sub dir doc/
 
-@section OverviewAmdcMGM Class Overview
+@section AmdcMGM_OverviewAmdcMGM Class Overview
 
 The AmdcMGM package contains:
 
   - AmdcDumpGeoModel compares positions of active elements of the 
    Muon Spectrometer as computed by Amdcsimrec and the Muon GeoModel
 
-@section ExtrasAmdcMGM Extra Pages
+@section AmdcMGM_ExtrasAmdcMGM Extra Pages
 
   - @ref used_AmdcMGM
   - @ref requirements_AmdcMGM
@@ -34,10 +34,8 @@ The AmdcMGM package contains:
 
 /**
 @page used_AmdcMGM Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AmdcMGM Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/doc/mainpage.h b/MuonSpectrometer/Amdcsimrec/AmdcOracle/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 72%
rename from MuonSpectrometer/Amdcsimrec/AmdcOracle/doc/mainpage.h
rename to MuonSpectrometer/Amdcsimrec/AmdcOracle/doc/packagedoc.h
index e7a09516f59a124906703f934fdb0c47a3b76c4f..cd4b8f2b0960f6d0bb7b096c716680b978500842
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/doc/mainpage.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage AmdcOracle Package
+@page AmdcOracle_page AmdcOracle Package
 
 @author samusog@cern.ch
 
-@section IntroductionAmdcOracle Introduction
+@section AmdcOracle_IntroductionAmdcOracle Introduction
 
 AmdcOracle is a package of the Amdcsimrec package.
 It checks the content of Oracle tables
@@ -16,13 +16,13 @@ It checks the content of Oracle tables
 A documentation in pdf format is available in 
 the CVS repository of the package in the sub dir doc/
 
-@section OverviewAmdcOracle Class Overview
+@section AmdcOracle_OverviewAmdcOracle Class Overview
 
 The AmdcOracle package contains:
 
   - AmdcDumpOracle checks the content of Oracle tables
 
-@section ExtrasAmdcOracle Extra Pages
+@section AmdcOracle_ExtrasAmdcOracle Extra Pages
 
   - @ref used_AmdcOracle
   - @ref requirements_AmdcOracle
@@ -31,10 +31,8 @@ The AmdcOracle package contains:
 
 /**
 @page used_AmdcOracle Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AmdcOracle Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcStand/doc/mainpage.h b/MuonSpectrometer/Amdcsimrec/AmdcStand/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 70%
rename from MuonSpectrometer/Amdcsimrec/AmdcStand/doc/mainpage.h
rename to MuonSpectrometer/Amdcsimrec/AmdcStand/doc/packagedoc.h
index 914f169b07e7ef8a9054d0662e576cdbb7426e1e..f6c0dad3fb1c824d8cf1f39babd844d50be0ce0e
--- a/MuonSpectrometer/Amdcsimrec/AmdcStand/doc/mainpage.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcStand/doc/packagedoc.h
@@ -4,22 +4,22 @@
 
 /**
 
-@mainpage AmdcStand Package
+@page AmdcStand_page AmdcStand Package
 
 @author samusog@cern.ch
 
-@section IntroductionAmdcStand Introduction
+@section AmdcStand_IntroductionAmdcStand Introduction
 
 AmdcStand is a package of the Amdcsimrec package.
 It contains an implementation of the interface to Amdcsimrec functionnalities
 
-@section OverviewAmdcStand Class Overview
+@section AmdcStand_OverviewAmdcStand Class Overview
 
 The AmdcStand package contains:
 
   - AmdcsimrecStand is an interface to Amdcsimrec functionnalities
 
-@section ExtrasAmdcStand Extra Pages
+@section AmdcStand_ExtrasAmdcStand Extra Pages
 
   - @ref used_AmdcStand
   - @ref requirements_AmdcStand
@@ -28,10 +28,8 @@ The AmdcStand package contains:
 
 /**
 @page used_AmdcStand Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AmdcStand Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignEvent/doc/mainpage.h b/MuonSpectrometer/MuonAlignment/MuonAlignEvent/doc/packagedoc.h
similarity index 76%
rename from MuonSpectrometer/MuonAlignment/MuonAlignEvent/doc/mainpage.h
rename to MuonSpectrometer/MuonAlignment/MuonAlignEvent/doc/packagedoc.h
index 14f16b733a158cd9c7a46a31a6e1ec9563a448d5..e680d378f2ceb94dca3bad670bc2fc14745f3963 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignEvent/doc/mainpage.h
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignEvent/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MuonAlignEvent
+@page MuonAlignEvent_page MuonAlignEvent
 @author roberth@bu.edu
 
-@section MuonAlignEventIntro Introduction
+@section MuonAlignEvent_MuonAlignEventIntro Introduction
 
 This package contains classes to be used for alignment of muon chambers.
 
-@section MuonAlignEventOverview Class Overview
+@section MuonAlignEvent_MuonAlignEventOverview Class Overview
   The package contains the following classes:
 
   - MdtAlignModule: a generalized alignable module, consisting of groups of MDT detectors to be aligned as a single structure.  Inherits from Trk::AlignModule.
@@ -23,10 +23,8 @@ This package contains classes to be used for alignment of muon chambers.
 
 /**
 @page used_MuonAlignEvent Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonAlignEvent Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/doc/mainpage.h b/MuonSpectrometer/MuonAlignment/MuonAlignExample/doc/packagedoc.h
similarity index 70%
rename from MuonSpectrometer/MuonAlignment/MuonAlignExample/doc/mainpage.h
rename to MuonSpectrometer/MuonAlignment/MuonAlignExample/doc/packagedoc.h
index 2f7d7fcb73205e3bd6140922c15bcd7351d58e53..cee0b8ce905aeece1a3bc721d4c4c5b578ce91ef 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/doc/mainpage.h
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/doc/packagedoc.h
@@ -4,10 +4,9 @@
 
 /**
 
-@mainpage MuonAlignExample
+@page MuonAlignExample_page MuonAlignExample
 
 @author Robert Harrington 
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/doc/mainpage.h b/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/doc/packagedoc.h
similarity index 79%
rename from MuonSpectrometer/MuonAlignment/MuonAlignGenTools/doc/mainpage.h
rename to MuonSpectrometer/MuonAlignment/MuonAlignGenTools/doc/packagedoc.h
index 04504a8d4539b886c120070acd4eba6bf0d41966..951c96e2cdfc66265d7ddbe5ee67e2c88eb5ccb4 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage MuonAlignGenTools package
+@page MuonAlignGenTools_page MuonAlignGenTools package
 @author Robert Harrington <roberth@bu.edu>, Steffen Kaiser <Steffen.Kaiser@cern.ch>
 
-@section introduction Introduction
+@section MuonAlignGenTools_introduction Introduction
 
 This package provides tools for performing muon spectrometer alignment with tracks.  The 
 available tools are:
 
-@section MuonAlignGenToolsOverview Class Overview
+@section MuonAlignGenTools_MuonAlignGenToolsOverview Class Overview
  The MuonAlignGenTools package contains the following packages:
 
  - MuonGeometryManagerTool:  get the list of all MDT chambers from MuonDetectorManager
@@ -23,10 +23,8 @@ available tools are:
 
 /**
 @page used_MuonGeometryManagerTool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonGeometryManagerTool Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignmentData/doc/mainpage.h b/MuonSpectrometer/MuonAlignment/MuonAlignmentData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 66%
rename from MuonSpectrometer/MuonAlignment/MuonAlignmentData/doc/mainpage.h
rename to MuonSpectrometer/MuonAlignment/MuonAlignmentData/doc/packagedoc.h
index 2d9273914ce41bc280c6691c9e10192cfd5d1747..ea0ecab4bc9ae9f421e32ee7f5c56af6b1e868d2
--- a/MuonSpectrometer/MuonAlignment/MuonAlignmentData/doc/mainpage.h
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignmentData/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage MuonAlignmentData Package
+@page MuonAlignmentData_page MuonAlignmentData Package
 @author andrea.formica@cern.ch
         isabel.trigger@cern.ch
 
-@section MuonAlignmentDataIntro Introduction
+@section MuonAlignmentData_MuonAlignmentDataIntro Introduction
 
 This package contains the data structures
 used to store the alignment information retrieved from
 the ConditionDB. There are stl maps and other data container. 
 
-@section MuonAlignmentDataOverview Class Overview
+@section MuonAlignmentData_MuonAlignmentDataOverview Class Overview
   The MuonAlignmentData package contains of following classes:
 
 	- ALineParContainer.h
@@ -23,7 +23,6 @@ the ConditionDB. There are stl maps and other data container.
 	- CorrContainer.h
 	- MuonAlignmentPar.h
 
-@section MuonAlignmentDataReq Requirements
+@section MuonAlignmentData_MuonAlignmentDataReq Requirements
 
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonCablings/CSCcabling/doc/mainpage.h b/MuonSpectrometer/MuonCablings/CSCcabling/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 59%
rename from MuonSpectrometer/MuonCablings/CSCcabling/doc/mainpage.h
rename to MuonSpectrometer/MuonCablings/CSCcabling/doc/packagedoc.h
index abb3c3d92c6a2152f9a0a2016498564ad9a50aa4..45b3d18203d07fe9b4e2edc930bf9e03a53630c5
--- a/MuonSpectrometer/MuonCablings/CSCcabling/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCablings/CSCcabling/doc/packagedoc.h
@@ -4,18 +4,16 @@
 
 /**
 
-@mainpage CSC Cabling Service
+@page CSCcabling_page CSC Cabling Service
 
  - To convert online ROD identifier to offline ROD identifier and vice versa.
 
  - For questions or comments: Ketevi A. Assamagan
    ketevi@bnl.gov
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section CSCcabling_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section CSCcabling_requirements Requirements
 
 */
 
diff --git a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/doc/mainpage.h b/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from MuonSpectrometer/MuonCablings/MuonTGC_Cabling/doc/mainpage.h
rename to MuonSpectrometer/MuonCablings/MuonTGC_Cabling/doc/packagedoc.h
index 097496bc1f71eee4816d9e6c797703f8b82e6a9a..fc3a2d6dce2cca44d68ba3462445feb09ae2c403
--- a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/doc/packagedoc.h
@@ -3,20 +3,20 @@
 */
 
 /** 
-@mainpage MuonTGC_Cabling package
+@page MuonTGC_Cabling_page MuonTGC_Cabling package
 
 @author Susumu Oda <Susumu.Oda@cen.ch>
 @author Hisaya Kurashige
 
 
-@section MuonTGC_CablingAbout About this document
+@section MuonTGC_Cabling_MuonTGC_CablingAbout About this document
 This document is created from MuonSpectrometer/MuonCablings/TGCcabling12/doc/readme. 
 The file was originally written by Yousuke Kataoka and was updated by Hisaya Kurashige on August, 2007.
 This informaion can be obsolete as of June, 2009. 
 This document is being updated.
 
 
-@section MuonTGC_CablingSvc MuonTGC_CablingSvc
+@section MuonTGC_Cabling_MuonTGC_CablingSvc MuonTGC_CablingSvc
 MuonTGC_CablingSvc manages all cablings in TGC electronics system.
 
 @subsection MuonTGC_CablingElectronicsSystem TGC electronics system
@@ -44,7 +44,7 @@ Methods are
 - getReadoutIDfromOnlineID
 
 
-@section MuonTGC_CablingGetChannel getChannel method
+@section MuonTGC_Cabling_MuonTGC_CablingGetChannel getChannel method
 This method provides connections of channels shown below.
 
 @subsection MuonTGC_CablingChannels Channels
@@ -72,7 +72,7 @@ This method provides connections of channels shown below.
 - SLBOut <--> HPBIn : Mapping between SLB chip and HPB block. 
 
 
-@section MuonTGC_CablingGetModule getModule method
+@section MuonTGC_Cabling_MuonTGC_CablingGetModule getModule method
 This method provide connections of modules shown below.
 
 @subsection MuonTGC_CablingModules Modules
@@ -97,7 +97,7 @@ This method provide connections of modules shown below.
 - SSW <--> ROD : Some (10) to 1, in the same readout sector. 
 
 
-@section MuonTGC_CablingGetOfflineIDfromReadoutID getOfflineIDfromReadoutID method
+@section MuonTGC_Cabling_MuonTGC_CablingGetOfflineIDfromReadoutID getOfflineIDfromReadoutID method
 This method provide connections of IDs shown below.
 
 @subsection MuonTGC_CablingGetOfflineIDfromReadoutIDIDs IDs
@@ -214,7 +214,7 @@ Forward Inner
              B         B         B
 \endcode
 
-@section MuonTGC_CablingFiles Necessary files 
+@section MuonTGC_Cabling_MuonTGC_CablingFiles Necessary files
 Under share directory, there are necessary files. 
 These files describes connection in a 1/12 sector. 
 All 1/12 sectors are the same.  
@@ -257,6 +257,5 @@ The modification to use the correct SBLOCs are difficult.
 The correct SBLOCs of readout formatted data of Byte Stream are converted to the used SBLOC at the Byte Stream <--> RDO conversions. 
 https://savannah.cern.ch/bugs/?57051
 
-@include requirements
   
 */
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/doc/mainpage.h b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/doc/packagedoc.h
index 51861bbfabcb788d51e2c9db774aad4952a8587f..48f86f3c96692be5afba205562bdb2ee76193144 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage The CscCalibTools package
+@page CscCalibTools_page The CscCalibTools package
 
 - CscCalibToolBase: this class is the base class for CSC calibration tools and provides a 
 default implementation of the calibration tools. This class implements the charge to ADC 
@@ -27,9 +27,7 @@ corrections.
 For questions or comments: Ketevi A. Assamagan
    ketevi@bnl.gov
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section CscCalibTools_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section CscCalibTools_requirements Requirements
 */
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/doc/packagedoc.h
similarity index 94%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/doc/packagedoc.h
index e2c167b800ac750b825985b004e7a76a81016b0e..c8805928aaf7850ba24bfe07f4871b178b2b60ac 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage MdtCalibData Package
+@page MdtCalibData_page MdtCalibData Package
 @author Niels.Van.Eldik@cern.ch, Oliver.Kortner@cern.ch, Martin.Woudstra@cern.ch
                                                                                 
-@section MdtCalibDataIntro Introduction
+@section MdtCalibData_MdtCalibDataIntro Introduction
 This package contains the Mdt Calibration Data Model.
                                                                                 
-@section MdtCalibDataOverview Class Overview
+@section MdtCalibData_MdtCalibDataOverview Class Overview
 The MdtCalibData package contains the following classes:
 
 - MuonCalib::CalibFunc: Generic interface for a calibration function
@@ -43,10 +43,8 @@ The MdtCalibData package contains the following classes:
                                                                                 
 /**
 @page used_MdtCalibData Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibData Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/doc/packagedoc.h
similarity index 93%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/doc/packagedoc.h
index 40daccad4a7b39f8b505ed3e78011cb47fca880f..b8911a8c88447d1b0c7a2dbfcd9734b3e3590059 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage MdtCalibDbAsciiTool Package
+@page MdtCalibDbAsciiTool_page MdtCalibDbAsciiTool Package
 @author  Domizia.Orestano@cern.ch 
                                                                                 
-@section MdtCalibDbAsciiToolIntro Introduction
+@section MdtCalibDbAsciiTool_MdtCalibDbAsciiToolIntro Introduction
 This Tool is used by MdtCalibrationDbSvc to retreive some default 
 calibration constants (from ASCII files declared in jobOptions and from jobOptions), 
 unpack them and fill the transient classes used by the service.
@@ -15,7 +15,7 @@ all the processed events.
 For IOV based access to conditions DB please configure MdtCalibrationSvc to use
 MdtCalibDbCoolStrTool instead.
                                                                                 
-@section MdtCalibDbAsciiToolOverview Class Overview
+@section MdtCalibDbAsciiTool_MdtCalibDbAsciiToolOverview Class Overview
 The package contains a single Tool, 
 MuonCalib::MdtCalibDbAsciiTool, inheriting from MuonCalib::IMdtCalibDB.
 The Tool default options are set in the constructor
@@ -58,11 +58,9 @@ setting the OutputLevel to VERBOSE and look in the output for the string
                                                                                 
 /**
 @page used_MdtCalibDbAsciiTool Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibDbAsciiTool Requirements
-@include requirements
 */
  
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/doc/packagedoc.h
similarity index 93%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/doc/packagedoc.h
index 60e174690fe01ddca76153810b689592d249fbbb..931f06ae25290c1e440041c32905a2b5b2f458ec 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage MdtCalibDbCoolStrTool Package
+@page MdtCalibDbCoolStrTool_page MdtCalibDbCoolStrTool Package
 @author  Domizia.Orestano@cern.ch 
                                                                                 
-@section MdtCalibDbCoolStrToolIntro Introduction
+@section MdtCalibDbCoolStrTool_MdtCalibDbCoolStrToolIntro Introduction
 This Tool is used by MdtCalibrationDbSvc to retreive calibration constants 
 stored in COOL as CLOBS, unpack them and fill the transient classes used 
 by the service.
@@ -20,7 +20,7 @@ the types of simulated data and this Tool is used mainly in the
 commissioning environment. See MdtCalibSvc documentation for more details on 
 how to select it from your jobOptions.
 
-@section MdtCalibDbCoolStrToolOverview Class Overview
+@section MdtCalibDbCoolStrTool_MdtCalibDbCoolStrToolOverview Class Overview
 The package contains a single Tool, 
 MuonCalib::MdtCalibDbCoolStrTool, inheriting from MuonCalib::IMdtCalibDB.
                                                                                 
@@ -47,11 +47,9 @@ but be aware that folder name can change frequently
                                                                                 
 /**
 @page used_MdtCalibDbCoolStrTool Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibDbCoolStrTool Requirements
-@include requirements
 */
  
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibEventLoop/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibEventLoop/doc/packagedoc.h
similarity index 88%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibEventLoop/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibEventLoop/doc/packagedoc.h
index 52d015e8170d2eb0b1881899e5df5b20938e32fc..008469f44ff9f4b90b1b76fea33bcb4fbfed280a 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibEventLoop/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibEventLoop/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage MdtCalibEventLoop Package
+@page MdtCalibEventLoop_page MdtCalibEventLoop Package
 @author Niels.Van.Eldik@cern.ch
                                                                                 
-@section MdtCalibEventLoopIntro Introduction
+@section MdtCalibEventLoop_MdtCalibEventLoopIntro Introduction
 The Mdt calibration, and in particular the autocalibration, is an iterative
 procedure. In the Muon Calibration Framework track segments are stored
 in memory organized per calibration region (on chamber or one multilayer) 
 and are used one or more times by the calibration. This package
 provides the loop over these segments.
                                                                                 
-@section MdtCalibEventLoopOverview Class Overview
+@section MdtCalibEventLoop_MdtCalibEventLoopOverview Class Overview
 The MdtCalibEventLoop package contains a single class,
 MuonCalib::MdtCalibEventLoop, responsible for steering the Loop over the
 segments and perform calibration (derived from MuonCalib::IMdtCalibration).
@@ -27,11 +27,9 @@ also be used in a standalone environment.
                                                                                 
 /**
 @page used_MdtCalibEventLoop Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibEventLoop Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/doc/packagedoc.h
similarity index 88%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/doc/packagedoc.h
index 874015e5d5b5c1eaefccdded6bd45a2e855227e7..cdac8381f6b0ace3bd12eebc3ca989ebde346a88 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MdtCalibFitters Package
+@page MdtCalibFitters_page MdtCalibFitters Package
 @author Niels.Van.Eldik@cern.ch, Fabrizio.Petrucci@cern.ch
                                                                                 
-@section MdtCalibFittersIntro Introduction
+@section MdtCalibFitters_MdtCalibFittersIntro Introduction
 Package containing local pattern recognition algorithms and fitters that 
 work on segment level.
                                                                                 
-@section MdtCalibFittersOverview Class Overview
+@section MdtCalibFitters_MdtCalibFittersOverview Class Overview
 
 - MuonCalib::DCSLFitter: straight line fitter for drift circles
 - MuonCalib::LocalSegmentResolver: calculates the local position and direction of the segment using the hits on track
@@ -25,11 +25,9 @@ work on segment level.
                                                                                 
 /**
 @page used_MdtCalibFitters Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibFitters Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibITools/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibITools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibITools/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibITools/doc/packagedoc.h
index 31a334eb32e6821438fe70e2f3243b811d323799..46a08df523b27d0aede4f43602272d477a4c9cfc
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibITools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibITools/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage MdtCalibITools Package
+@page MdtCalibITools_page MdtCalibITools Package
 @author Niels.Van.Eldik@cern.ch
                                                                                 
-@section MdtCalibIToolsIntro Introduction
+@section MdtCalibITools_MdtCalibIToolsIntro Introduction
 Interface classes for the various tools implemented in MdtCalibTools package.
                                                                                 
-@section MdtCalibIToolsOverview Class Overview
+@section MdtCalibITools_MdtCalibIToolsOverview Class Overview
 The interface classes provided by MdtCalibITools package are:
 
 - MuonCalib::IMdtCalibTool: Interface class for Mdt Calibration Tools 
@@ -24,12 +24,10 @@ The interface classes provided by MdtCalibITools package are:
                                                                                 
 /**
 @page used_MdtCalibITools Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibITools Requirements
-@include requirements
 */
 
 Interface classes for the various tools implemented in MdtCalibTools package:
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces/doc/packagedoc.h
index 1d0e0840bde2da862cd89916c324336cc8ef5f59..807b478945a3853477bdaa86634386945b9d1dc2
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage MdtCalibInterfaces Package
+@page MdtCalibInterfaces_page MdtCalibInterfaces Package
 @author Niels.Van.Eldik@cern.ch
                                                                                 
-@section MdtCalibInterfacesIntro Introduction
+@section MdtCalibInterfaces_MdtCalibInterfacesIntro Introduction
 This package contains all the abstract interfaces which can be used in
 a standalone Muon calibration: pattern and segment selectors, calibration
 procedures.
                                                                                 
-@section MdtCalibInterfacesOverview Class Overview
+@section MdtCalibInterfaces_MdtCalibInterfacesOverview Class Overview
 The MdtCalibInterfaces package provides the following abstract interfaces:
                                                                                 
 - MuonCalib::IGlobalPatternSelector: Interface to MuonGlobalPatternSelectors
@@ -28,11 +28,9 @@ The MdtCalibInterfaces package provides the following abstract interfaces:
                                                                                 
 /**
 @page used_MdtCalibInterfaces Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibInterfaces Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/doc/packagedoc.h
similarity index 91%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/doc/packagedoc.h
index 013387dc5accd9a45fcc1951ca223e046c9b7ca6..fa8f5997f7d4f8051f3246564a343f6ec9d0c5c6 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage MdtCalibRt Package
+@page MdtCalibRt_page MdtCalibRt Package
 @author Fabrizio.Petrucci@cern.ch 
                                                                                 
-@section MdtCalibRtIntro Introduction
+@section MdtCalibRt_MdtCalibRtIntro Introduction
 This package is foreseen to collect the various implementations of Mdt Rt calibration. 
                                                                                 
-@section MdtCalibRtOverview Class Overview
+@section MdtCalibRt_MdtCalibRtOverview Class Overview
 The MdtCalibRt package contains at the moment the following classes:
 
 - MuonCalib::RtCalibrationAnalytic: This class performs the analytic autocalibration whose basic ideas were developed by Mario Deile (see ATL-MUON-2004-021)
@@ -30,11 +30,9 @@ The MdtCalibRt package contains at the moment the following classes:
                                                                                 
 /**
 @page used_MdtCalibRt Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibRt Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/doc/packagedoc.h
similarity index 96%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/doc/packagedoc.h
index b170258c8be1d54af78c6ed5dd694f292a03516e..bdaa8184d671a9398697e80665322ccb26083865 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage MdtCalibSvc package
+@page MdtCalibSvc_page MdtCalibSvc package
 @author Domizia.Orestano
 original authors Niels van Eldik & Martin Woudstra, Stefano Rosati
  
-@section MdtCalibSvcIntro Introduction
+@section MdtCalibSvc_MdtCalibSvcIntro Introduction
 This package contains the services (MdtCalibrationSvc) 
 responsible to provide to the
 clients (reconstruction) the calibrated information (drift radius and its 
@@ -83,10 +83,8 @@ List of settable properties:
 
 /**
 @page used_MdtCalibSvc Used Packages
-@htmlinclude used_packages.html
 */
                                                                                  /**
 @page requirements_MdtCalibSvc Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/doc/packagedoc.h
index 26ac53fdb550548cd01fb2af0b94fdd148a0677d..bd8cdeb46d8d24de32d381bce4e145d69d7433cf
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage MdtCalibT0 Package
+@page MdtCalibT0_page MdtCalibT0 Package
 @author Domizia.Orestano@cern.ch 
                                                                                 
-@section MdtCalibT0Intro Introduction
+@section MdtCalibT0_MdtCalibT0Intro Introduction
 This package is foreseen to collect the various implementations of Mdt T0 calibration. 
                                                                                 
-@section MdtCalibT0Overview Class Overview
+@section MdtCalibT0_MdtCalibT0Overview Class Overview
 The MdtCalibT0 package currently contains the following classes common to all the implementations:
 
 - MuonCalib::T0CalibrationOutput: Class for communication between event loop and T0 calibration  
@@ -38,11 +38,9 @@ The following classes related to "MT" implementation:
                                                                                 
 /**
 @page used_MdtCalibT0 Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibT0 Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/doc/packagedoc.h
similarity index 90%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/doc/packagedoc.h
index 90c586f476f963e0b55f3d0f4700549ba13d2079..42db45fd1c5627828656524a8f5682363b103bf4 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MdtCalibTools Package
+@page MdtCalibTools_page MdtCalibTools Package
 @author Niels.Van.Eldik@cern.ch
                                                                                 
-@section MdtCalibToolsIntro Introduction
+@section MdtCalibTools_MdtCalibToolsIntro Introduction
 This package contains the implementation of various tools derived from the
 abstract MuonCalib::MdtCalibITools classes.
                                                                                 
-@section MdtCalibToolsOverview Class Overview
+@section MdtCalibTools_MdtCalibToolsOverview Class Overview
 The MdtCalibTools package contains the following Tools selectable from MuonCalib::MuonCalibAlg jobOptions: 
 - MuonCalib::MdtCalibNtupleMakerTool: creates ntuple per calibration region containing segment information
 - MuonCalib::MdtCalibTool: steers Mdt Calibration within athena
@@ -28,11 +28,9 @@ in addition it also contains the following helper Tools:
                                                                                 
 /**
 @page used_MdtCalibTools Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibTools Requirements
-@include requirements
 */
  
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/doc/packagedoc.h
similarity index 91%
rename from MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/doc/packagedoc.h
index 82227d0baae5c387c9a452408e6350c1af4a74ff..b2675e832cb97c9f78bc2598b2da6935817e9f1a 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage MdtCalibUtils Package
+@page MdtCalibUtils_page MdtCalibUtils Package
 @author Niels.Van.Eldik@cern.ch
                                                                                 
-@section MdtCalibUtilsIntro Introduction
+@section MdtCalibUtils_MdtCalibUtilsIntro Introduction
 This package contains the utilities used for Mdt calibration.
                                                                                 
-@section MdtCalibUtilsOverview Class Overview
+@section MdtCalibUtils_MdtCalibUtilsOverview Class Overview
 The MdtCalibUtils package contains the following classes and structures:
 
 - LookUpTable: Generic lookup table (template)
@@ -30,11 +30,9 @@ The MdtCalibUtils package contains the following classes and structures:
                                                                                 
 /**
 @page used_MdtCalibUtils Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MdtCalibUtils Requirements
-@include requirements
 */
  
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/doc/packagedoc.h
similarity index 79%
rename from MuonSpectrometer/MuonCalib/MuonCalibAlgs/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibAlgs/doc/packagedoc.h
index bf192873d791220c571387eb2c9961a240476652..39fdff729e25afd7a79e681ea49d14d421e16777 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage MuonCalibAlgs Package
+@page MuonCalibAlgs_page MuonCalibAlgs Package
 @author Niels.Van.Eldik@cern.ch
 
-@section MuonCalibAlgsIntro Introduction 
+@section MuonCalibAlgs_MuonCalibAlgsIntro Introduction
 This package contains the ATHENA algorithms that are common for all muon 
 technologies.
 
-@section MuonCalibAlgsOverview Class Overview
+@section MuonCalibAlgs_MuonCalibAlgsOverview Class Overview
 The MuonCalibAlgs package contains the following class
 
 - MuonCalib::MuonCalibAlg: ATHENA Algorithm retrieving the 'ingredients' to construct a MuonCalibEvent from storegate and passing them to a calibration tool. See the MuonCalibEvent class description for the content of a MuonCalibEvent.
@@ -24,11 +24,9 @@ The MuonCalibAlgs package contains the following class
 
 /**
 @page used_MuonCalibAlgs Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonCalibAlgs Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibEvent/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibEvent/doc/packagedoc.h
similarity index 85%
rename from MuonSpectrometer/MuonCalib/MuonCalibEvent/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibEvent/doc/packagedoc.h
index 9712198b35de182904b28dd0afbf2e1712fcb4ac..ceeff46608e3f29b97e1cce564f278071ec4253d 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibEvent/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibEvent/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage MuonCalibEvent Package
+@page MuonCalibEvent_page MuonCalibEvent Package
 @author Martin.Woudstra@nikhef.nl, Niels.Van.Eldik@cern.ch
 
-@section MuonCalibEventIntro Introduction
+@section MuonCalibEvent_MuonCalibEventIntro Introduction
 This package contains the event model classes internally used by the 
 calibration.  
 
-@section MuonCalibEventOverview Class Overview
+@section MuonCalibEvent_MuonCalibEventOverview Class Overview
 The MuonCalibEvent package contains the following class:
 
 - MdtCalibHit: an object containing all the intermediate information needed in the conversion of raw Mdt data to a drift radius with its error.
@@ -28,10 +28,8 @@ and a typedef:
                                                                                 
 /**
 @page used_MuonCalibEvent Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibEvent Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibEventBase/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibEventBase/doc/packagedoc.h
similarity index 92%
rename from MuonSpectrometer/MuonCalib/MuonCalibEventBase/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibEventBase/doc/packagedoc.h
index 0e964c980b62071a1d438c27ccf5938882fb86e6..bcb8a2effa90a20440001f95d3c55afc7a9c0e69 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibEventBase/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibEventBase/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage MuonCalibEventBase Package
+@page MuonCalibEventBase_page MuonCalibEventBase Package
 @author Niels.Van.Eldik@cern.ch and Zdenko.Van.Kesteren@cern.ch
 
-@section MuonCalibEventBaseIntro Introduction 
+@section MuonCalibEventBase_MuonCalibEventBaseIntro Introduction
 This package implements the internal Muon calibration EDM,
 with no dependencies on ATHENA. This feature allows processing the CalibrationNtuples within the Muon calibration EDM, without ATHENA dependencies.
 
-@section MuonCalibEventBaseOverview Class Overview
+@section MuonCalibEventBase_MuonCalibEventBaseOverview Class Overview
 The MuonCalibEventBase package contains the following classes :
 - MuonCalib::MuonCalibEvent             : a container class containing all information needed for calibration.
 - MuonCalib::MuonCalibEventInfo         : contains extra information of the CalibEvent (runnumber/eventnumber/timestamp/tag).
@@ -44,10 +44,8 @@ The MuonCalibEventBase package contains the following classes :
 
 /**
 @page used_MuonCalibEventBase Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonCalibEventBase Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/doc/packagedoc.h
index f26aaaceeb9bd0a7d0962630752e70d8d78818b3..431baf8faa80509857cf22892b5803956e19e898 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MuonCalibExtraNtuple Package
+@page MuonCalibExtraNtuple_page MuonCalibExtraNtuple Package
 @author Zdenko.Van.Kesteren@cern.ch
 
-@section MuonCalibExtraNtupleIntro Introduction
+@section MuonCalibExtraNtuple_MuonCalibExtraNtupleIntro Introduction
 
 MuonCalibExtraNtuple is the package where one builds its analysis based on the extended CalibrationNtuple. 
 
-@section MuonCalibExtraNtupleOverview Class Overview
+@section MuonCalibExtraNtuple_MuonCalibExtraNtupleOverview Class Overview
 
 MuonCalibExtraNtuple contains several classes:
 
@@ -35,11 +35,9 @@ And some analysis programmes:
                                                                                 
 /**
 @page used_MuonCalibExtraNtuple Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibExtraNtuple Requirements
-@include requirements
 */
        
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/doc/packagedoc.h
similarity index 87%
rename from MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/doc/packagedoc.h
index 3acebdfa87baddadc8d9092ebb65434fa6290a97..904ed88530dd1a795c0afcfd5d44d50cecae0bf7 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage MuonCalibExtraTreeAlg Package
+@page MuonCalibExtraTreeAlg_page MuonCalibExtraTreeAlg Package
 @author Zdenko.Van.Kesteren@cern.ch
 
-@section MuonCalibExtraTreeAlgIntro Introduction
+@section MuonCalibExtraTreeAlg_MuonCalibExtraTreeAlgIntro Introduction
 
 MuonCalibExtraTreeAlgAlg is the package responsible for configuring the filling of the extended CalibrationNtuple within athena. 
 
 
-@section MuonCalibExtraTreeAlgOverview Class Overview
+@section MuonCalibExtraTreeAlg_MuonCalibExtraTreeAlgOverview Class Overview
 
 - MuonCalib::MuonCalibExtraTreeAlg : package configuring the filling of the extended CalibrationNtuple within athena. 
 
@@ -34,11 +34,9 @@ MuonCalibExtraTreeAlgAlg is the package responsible for configuring the filling
                                                                                 
 /**
 @page used_MuonCalibExtraTreeAlg Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibExtraTreeAlg Requirements
-@include requirements
 */
        
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/doc/packagedoc.h
similarity index 80%
rename from MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/doc/packagedoc.h
index db5b59e8d3ee8572bb856b740f46a9dbc2021cd1..6b87cff44841eb9df8390b8e70e66a213b1d502d 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage MuonCalibExtraTreeEvent Package
+@page MuonCalibExtraTreeEvent_page MuonCalibExtraTreeEvent Package
 @author Zdenko.Van.Kesteren@cern.ch
 
-@section MuonCalibExtraTreeEventIntro Introduction
+@section MuonCalibExtraTreeEvent_MuonCalibExtraTreeEventIntro Introduction
 
 MuonCalibExtraTreeEventEvent is the package responsible for configuring the filling of the extended CalibrationNtuple within athena. 
 
 
-@section MuonCalibExtraTreeEventOverview Class Overview
+@section MuonCalibExtraTreeEvent_MuonCalibExtraTreeEventOverview Class Overview
 
 - MuonCalib::MuonCalibEvent_E :
 
@@ -30,11 +30,9 @@ MuonCalibExtraTreeEventEvent is the package responsible for configuring the fill
                                                                                 
 /**
 @page used_MuonCalibExtraTreeEvent Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibExtraTreeEvent Requirements
-@include requirements
 */
        
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibITools/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibITools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from MuonSpectrometer/MuonCalib/MuonCalibITools/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibITools/doc/packagedoc.h
index dab6a7ecf5a0164f1fe0b6fd2e4ba612e94e4d15..e4f98cd24de85016e2e052cc5b1b9a262014b2f7
--- a/MuonSpectrometer/MuonCalib/MuonCalibITools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibITools/doc/packagedoc.h
@@ -4,15 +4,15 @@
 
 /**
 
-@mainpage MuonCalibITools Package
+@page MuonCalibITools_page MuonCalibITools Package
 @author Niels.Van.Eldik@cern.ch
 
-@section MuonCalibIToolsIntro Introduction
+@section MuonCalibITools_MuonCalibIToolsIntro Introduction
 Interface classes for the various tools implemented in MuonCalibTools package:
 pattern selectors, calibration region selectors.
                                                                                 
                                                                                 
-@section MuonCalibIToolsOverview Class Overview
+@section MuonCalibITools_MuonCalibIToolsOverview Class Overview
 The MuonCalibITools package contains the following interface classes:
 
 - MuonCalib::IMooPatternForCalibrationTool: base class for the Moore Pattern Tools (obsolete)  
@@ -31,11 +31,9 @@ The MuonCalibITools package contains the following interface classes:
                                                                                 
 /**
 @page used_MuonCalibITools Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibITools Requirements
-@include requirements
 */
  
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from MuonSpectrometer/MuonCalib/MuonCalibIdentifier/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibIdentifier/doc/packagedoc.h
index dc8411a8cec5b7a96dc0fac7740ef7091243b4eb..57ddb7e074fb6fd9be92d612efd9a0050b92e3fb
--- a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
-@mainpage MuonCalibIdentifier Package
+@page MuonCalibIdentifier_page MuonCalibIdentifier Package
 @author Domizia.Orestano@cern.ch 
 
 Original authors are Martin Woudstra, Zdenko van Kesteren and Peter Kluit 
 
-@section MuonCalibIdentifierIntro Introduction 
+@section MuonCalibIdentifier_MuonCalibIdentifierIntro Introduction
 MuonCalibIdentifier is a utility package which collects classes and macros 
 defining identifiers and hashes internally used by the Muon Calibration 
 
-@section MuonCalibIdentifierOverview Class Overview
+@section MuonCalibIdentifier_MuonCalibIdentifierOverview Class Overview
 The MuonCalibIdentifier package contains the following classes used by other 
 MuonCalib packages
 
@@ -38,10 +38,8 @@ and many others used internally to provide the above functionalities (see Class
 
 /**
 @page used_MuonCalibIdentifier Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonCalibIdentifier Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/doc/packagedoc.h
similarity index 91%
rename from MuonSpectrometer/MuonCalib/MuonCalibNtuple/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibNtuple/doc/packagedoc.h
index a3bf38c17391415431f56302626796d57536e126..81237036617fa1a6401b59673e4a2a874f839ec9 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage MuonCalibNtuple Package
+@page MuonCalibNtuple_page MuonCalibNtuple Package
 @author Niels.Van.Eldik@cern.ch, Zdenko.Van.Kesteren@cern.ch
                                                                                 
-@section MuonCalibNtupleIntro Introduction
+@section MuonCalibNtuple_MuonCalibNtupleIntro Introduction
                                                                                 
 Contains tools to create ntuples at various levels of the calibration.
 
-@section MuonCalibNtupleOverview Class Overview
+@section MuonCalibNtuple_MuonCalibNtupleOverview Class Overview
 The MuonCalibNtuple package provides various classes implementing ntuples and branches, together with various helper classes used by the above ones.
 These classes are used by MuonCalib::PatternNtupleMaker (MuonCalibTools) and by MuonCalib::MdtCalibNtupleMakerTool (MdtCalibTools) to create the ntuple containing all patterns for a given event or an ntuple per calibration region which is filled with segments, respectively.
                                                             
@@ -29,11 +29,9 @@ For the content of the CalibrationNtuple, see <a href="https://twiki.cern.ch/twi
                                                                                 
 /**
 @page used_MuonCalibNtuple Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibNtuple Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/doc/packagedoc.h
similarity index 85%
rename from MuonSpectrometer/MuonCalib/MuonCalibPatRec/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibPatRec/doc/packagedoc.h
index f6ecebf7c6e37c913317c5425ca3d725c7652393..bbb829ae3b53b24e6dd2fbf2023ed64347d6023c 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage MuonCalibPatRec Package
+@page MuonCalibPatRec_page MuonCalibPatRec Package
 @author Niels.Van.Eldik@cern.ch
                                                                                 
-@section MuonCalibPatRecIntro Introduction
+@section MuonCalibPatRec_MuonCalibPatRecIntro Introduction
 ATHENA algorithms are need to retreive reconstructed 
 segments and store them in MuonCalibEvent objects.
 
-@section MuonCalibPatRecOverview Class Overview
+@section MuonCalibPatRec_MuonCalibPatRecOverview Class Overview
 The MuonCalibPatRec package contains the following classes:
                                                                                 
 - MuonCalib::MboyFillPatterns: fills calibration EDM from Muonboy
@@ -26,11 +26,9 @@ The MuonCalibPatRec package contains the following classes:
                                                                                 
 /**
 @page used_MuonCalibPatRec Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibPatRec Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/doc/packagedoc.h
similarity index 74%
rename from MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/doc/packagedoc.h
index e1899d19025c76eae38fff7c3f841206810d1135..41e421f646dc127f9a1075ffc858e44970bf9df8 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/doc/packagedoc.h
@@ -5,30 +5,26 @@
 /**
 
 
-@mainpage
+@page CalibNtupleReader_page 
 @author Zdenko.Van.Kesteren@cern.ch
 
-@section CalibNtupleReaderIntro Introduction
+@section CalibNtupleReader_CalibNtupleReaderIntro Introduction
 Package responsible for reading in the CalibrationNtuple, storing the variables into Calib-EDM classes (as described in MuonCalibEventBase).
 
-@section CalibNtupleReaderOverview Class Overview
+@section CalibNtupleReader_CalibNtupleReaderOverview Class Overview
 This package consists out of two classes:
 - NTReaderBase : This is a helper class, designed to store the CalibrationNtuple variables
 - MuonCalib::NTReader : class which fills the Calib-EDM classes with the CalibrationNtuple variables
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
 
 
 /**
 @page used_CalibNtupleReader Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_CalibNtupleReader Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/doc/packagedoc.h
similarity index 94%
rename from MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/doc/packagedoc.h
index a348afc066021adf453991c20789a815b82fa14c..bdee770d08981ebcf3331aea2c688aa6c6035752 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage
+@page CalibNtupleUtils_page 
 @author Zdenko.Van.Kesteren@cern.ch, Niels.Van.Eldik@cern.ch
 
-@section CalibNtupleUtilsIntro Introduction
+@section CalibNtupleUtils_CalibNtupleUtilsIntro Introduction
 
 Helper packages for the MuonCalibStandAlone packages.
 
@@ -31,10 +31,8 @@ This set of classes are usefull whilst analysing/handling CalibrationNtuples. It
 
 /**
 @page used_CalibNtupleUtils Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_CalibNtupleUtils Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibTools/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibTools/doc/packagedoc.h
similarity index 87%
rename from MuonSpectrometer/MuonCalib/MuonCalibTools/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibTools/doc/packagedoc.h
index 9932c7a2c4477ce1728db5d57b7e0c6526d9635b..f9fd3c07e0a6a2db6553846088cc5ea9184746d4 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibTools/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage MuonCalibTools Package
+@page MuonCalibTools_page MuonCalibTools Package
 @author Niels.Van.Eldik@cern.ch, ketevi@bnl.gov, Zdenko.Van.Kesteren@cern.ch
 
-@section MuonCalibToolsIntro Introduction
+@section MuonCalibTools_MuonCalibToolsIntro Introduction
 This package contains general tools needed by the Muon Calibration Framework
 
-@section MuonCalibToolsOverview Class Overview
+@section MuonCalibTools_MuonCalibToolsOverview Class Overview
 
 - MuonCalib::AtlasRegionSelectorTool: default Region Selector for Atlas calibration, segments are selected by chamber
 
@@ -27,11 +27,9 @@ This package contains general tools needed by the Muon Calibration Framework
                                                                                 
 /**
 @page used_MuonCalibTools Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibTools Requirements
-@include requirements
 */
        
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath/doc/packagedoc.h
index 3b70164cda9f10afec279ff22493b729175c7ae6..cc91a621022a7832889264634721a9697fe156a2 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage MuonCalibMath Package
+@page MuonCalibMath_page MuonCalibMath Package
 @author Oliver.Kortner@cern.ch 
                                                                                 
-@section MuonCalibMathIntro Introduction
+@section MuonCalibMath_MuonCalibMathIntro Introduction
 This package collects all the utilities used to fit and parametrize sets of sample points.
                                                                                 
-@section MuonCalibMathOverview Class Overview
+@section MuonCalibMath_MuonCalibMathOverview Class Overview
 The MuonCalibMath package contains the following classes:
 
 - MuonCalib::BaseFunction: This is an abstract base class for a set of base functions for fits to sample points
@@ -26,11 +26,9 @@ The MuonCalibMath package contains the following classes:
                                                                                 
 /**
 @page used_MuonCalibMath Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibMath Requirements
-@include requirements
 */
  
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/doc/mainpage.h b/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/doc/mainpage.h
rename to MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/doc/packagedoc.h
index a6a48afb457541b01ae3774258e13c7271bfb0ed..48fd1a190b2004548eb667e58fd52c737d172335
--- a/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage MuonCalibStl Package
+@page MuonCalibStl_page MuonCalibStl Package
 @author Niels.Van.Eldik@cern.ch
                                                                                 
-@section MuonCalibStlIntro Introduction
+@section MuonCalibStl_MuonCalibStlIntro Introduction
 This package contains some utilities related to the handling of Stl classes.
                                                                                 
-@section MuonCalibStlOverview Class Overview
+@section MuonCalibStl_MuonCalibStlOverview Class Overview
 The MuonCalibStl package contains the following classes:
 
 - MuonCalib::DeleteObject: An operator to delete the object pointed by a pointer to a template class
@@ -22,11 +22,9 @@ The MuonCalibStl package contains the following classes:
                                                                                 
 /**
 @page used_MuonCalibStl Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCalibStl Requirements
-@include requirements
 */
  
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/doc/packagedoc.h
similarity index 61%
rename from MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/doc/packagedoc.h
index df268e6c0d68ec8c949f5fa114d547f9542b7a2e..28f669bcffa1b1d50e371eb54691e19383d29247 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage MuonAssociationTools Package
+@page MuonCSC_CnvTools_page MuonCSC_CnvTools Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Edward Moyse <Edward.Moyse@cern.ch>
 
-@section MuonAssociationToolsIntro Introduction
+@section MuonCSC_CnvTools_MuonCSC_CnvToolsIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section MuonAssociationToolsReq Requirements
+@section MuonCSC_CnvTools_MuonCSC_CnvToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/doc/packagedoc.h
similarity index 77%
rename from MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/doc/packagedoc.h
index 457e88a53aceba39f88f3a073130ccc9ee63a6d2..758c485fc386a8bf1c75779c5f083ebfd59ea786 100644
--- a/MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/doc/packagedoc.h
@@ -6,10 +6,8 @@
 
  <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
 
-@mainpage
+@page MuonCnvToolInterfaces_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/doc/packagedoc.h
similarity index 80%
rename from MuonSpectrometer/MuonCnv/MuonEventAthenaPool/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonEventAthenaPool/doc/packagedoc.h
index 514b1a8193621fc42c08077c541ee1105aff4917..8395e7b284e676ece3b9e9056957954866612c74 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage MuonEventAthenaPool
+@page MuonEventAthenaPool_page MuonEventAthenaPool
     @author Edward.Moyse@cern.ch
     @author Tadashi.Maeno@cern.ch
 
-@section MuonEventAthenaPoolIntro Introduction
+@section MuonEventAthenaPool_MuonEventAthenaPoolIntro Introduction
 
 This package handles the persistency of Muon EDM classes.
 
@@ -23,10 +23,8 @@ This package handles the persistency of Muon EDM classes.
 
 /**
 @page used_MuonEventAthenaPool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonEventAthenaPool Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonEventCnvTools/doc/packagedoc.h
similarity index 76%
rename from MuonSpectrometer/MuonCnv/MuonEventCnvTools/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonEventCnvTools/doc/packagedoc.h
index cb2973323e28dc6db7acf400d90c91b544895298..3d89f869765b743cb7eab1ce6abca0c7c30c215d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventCnvTools/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage MuonEventCnvTools 
+@page MuonEventCnvTools_page MuonEventCnvTools
 @author Edward.Moyse@cern.ch
 
-@section MuonEventCnvToolsIntro Introduction
+@section MuonEventCnvTools_MuonEventCnvToolsIntro Introduction
 
 This package contains a Tools (currently only one in fact), which are used by the persistency convertors 
 (e.g. TrackCollectionCnv in TrkEventAthenaPool) to rebuild the Muon EDM objects.
 
-@section MuonEventCnvToolsOverview Class Overview
+@section MuonEventCnvTools_MuonEventCnvToolsOverview Class Overview
   The MuonEventCnvTools package contains of following classes:
 
   - MuonEventCnvTool which implements the Trk::ITrkEventCnvTool interface.
@@ -24,10 +24,8 @@ This package contains a Tools (currently only one in fact), which are used by th
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/doc/packagedoc.h
similarity index 91%
rename from MuonSpectrometer/MuonCnv/MuonEventTPCnv/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonEventTPCnv/doc/packagedoc.h
index e5c3f59a5a9959d186660a1a7fe0d207d5616079..944da362d51363df732d162d63891d770b684ef3 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /** 
-@mainpage  MuonEventTPCnv
+@page MuonEventTPCnv_page MuonEventTPCnv
 @author Edward.Moyse@cern.ch
 
-@section MuonEventTPCnvIntro Introduction
+@section MuonEventTPCnv_MuonEventTPCnvIntro Introduction
 
 This package handles the transient / persistent separation for the persistification of Muon EDM classes
 
@@ -32,7 +32,7 @@ Summary of old  convertors (as defined in OLD_selection.xml):
 
 The ARA convertors are defined in ARA_selection.xml
   
-@section MuonEventTPCnvLinks Further links
+@section MuonEventTPCnv_MuonEventTPCnvLinks Further links
 @see https://twiki.cern.ch/twiki/bin/view/Atlas/MuonEventDataModel
 @see https://twiki.cern.ch/twiki/bin/view/Atlas/TransientPersistentSeparation
 @see https://twiki.cern.ch/twiki/bin/view/Atlas/WriteReadDataViaPool
@@ -45,11 +45,9 @@ The ARA convertors are defined in ARA_selection.xml
 
 /**
 @page used_MuonEventTPCnv Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonEventTPCnv Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonJiveXML/doc/packagedoc.h
similarity index 94%
rename from MuonSpectrometer/MuonCnv/MuonJiveXML/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonJiveXML/doc/packagedoc.h
index 78b0ea1ae745e9d29b1a7ccbf299975615e96032..a2decc84ac7c781e2a8defd99cec2108cab9a44a 100644
--- a/MuonSpectrometer/MuonCnv/MuonJiveXML/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page MuonJiveXML_page 
 @author Nikos.Konstantinidis -at- cern.ch, Eric.Jansen -at- hef.ru.nl, Juergen.Thomas -at- cern.ch
-@section IntroMuonJiveXML Introduction
+@section MuonJiveXML_IntroMuonJiveXML Introduction
 
 This package contains the AlgToos that produce the XML fragments of Muon related datatypes for the XML files read by atlantis.
 The AlgTools, all inheriting from JiveXML::DataRetriever, are the following:
@@ -31,8 +31,6 @@ The AlgTools, all inheriting from JiveXML::DataRetriever, are the following:
       - StoreGateKey : ( default "TGC_Measurements" ) the StoreGate location of the TGC hits container.
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/doc/packagedoc.h
similarity index 61%
rename from MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/doc/packagedoc.h
index c8f858145cbedebad8655599472d26138d827d8d..17f6a03ce5928f735c1fb3e931d63a9523eb54f8 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage MuonCSC_CnvTools Package
+@page MuonMDT_CnvTools_page MuonMDT_CnvTools Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Edward Moyse <Edward.Moyse@cern.ch>
 
-@section MuonCSC_CnvToolsIntro Introduction
+@section MuonMDT_CnvTools_MuonMDT_CnvToolsIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section MuonCSC_CnvToolsReq Requirements
+@section MuonMDT_CnvTools_MuonMDT_CnvToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonCnv/MuonPrdSelector/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonPrdSelector/doc/packagedoc.h
similarity index 92%
rename from MuonSpectrometer/MuonCnv/MuonPrdSelector/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonPrdSelector/doc/packagedoc.h
index 4dc817943ace627625707e227ed68cbdd8621ccb..389b7e0d65f8649afcb528f1df6795af0a138dcf 100644
--- a/MuonSpectrometer/MuonCnv/MuonPrdSelector/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonPrdSelector/doc/packagedoc.h
@@ -4,22 +4,22 @@
 
 /**
 
-@mainpage MuonPrdSelector Package
+@page MuonPrdSelector_page MuonPrdSelector Package
 @author Zdenko.van.Kesteren@cern.ch
 @author Andrew Meade (ameade@physics.umass.edu)                                                                            
-@section MuonPrdSelectorIntro Introduction
+@section MuonPrdSelector_MuonPrdSelectorIntro Introduction
                                                                                 
 Contains jobOptions to read and reconstruct cosmic data (real data and simulation)
 
 
-@section MuonPrdSelector Class Overview
+@section MuonPrdSelector_MuonPrdSelector Class Overview
 The MuonPrdSelector package is an Athena algorithm filtering Muon::MuonPrepDataCollection. The program writes a new collection for each old collection and sellects only the events that pass all cuts.  The cuts are defined by MuonIdCutTool, and can include cuts on technology, station name or region, eta/phi station numbers, and or more specific cuts.  The downstream reconstruction programmes do not need to be adjusted to run over the skimmed set of MuonPrepDataCollections since the jobOptions change the storeGate name of the original Containers. The original name of the input Containers is assigned for the outputContainers.
 
 - MuonPrdSelectorAlg: The algorithm retrieves the unfiltered Muon::MuonPrepDataContainer, loops over each event in each of the Muon::MuonPrepDataCollections and stores the selected hits in new Muon::MuonPrepDataCollections into another Muon::MuonPrepDataContainer.
 
 - MuonIdCutTool: This tool's main function: bool IsCut(Identifier).  False signifies all cuts are passed.  In principle any cut based on Identifier could be implimented.  The tool is overloaded to accept a MuonFixedId as well.
 
-@section MuonPrdSelector Usage Information
+@section MuonPrdSelector_MuonPrdSelector Usage Information
 
 To use this package, you must insert the following lines in top options:
     if doPrdSelect:
@@ -39,11 +39,9 @@ For most top options this is done in MuonRec_jobOptions.py in MuonRecExample.  A
                                                                                 
 /**
 @page used_MuonPrdSelector Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonPrdSelector Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/doc/packagedoc.h
similarity index 61%
rename from MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/doc/packagedoc.h
index f6fb5f51f04784c13a573d1be981b2f6c5fa9ee6..1728e0c2e5c22c1b0077bb6c2866c9ba3dd17be6 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage MuonMDT_CnvTools Package
+@page MuonRPC_CnvTools_page MuonRPC_CnvTools Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Edward Moyse <Edward.Moyse@cern.ch>
 
-@section MuonMDT_CnvToolsIntro Introduction
+@section MuonRPC_CnvTools_MuonRPC_CnvToolsIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section MuonMDT_CnvToolsReq Requirements
+@section MuonRPC_CnvTools_MuonRPC_CnvToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from MuonSpectrometer/MuonCnv/MuonRdoToPrepData/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonRdoToPrepData/doc/packagedoc.h
index 1eb73a9da706bd6606a0e7b4b85d40980793e578..2450e445cc9176fc890fc106fcbb40ab05952648
--- a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/doc/packagedoc.h
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-\mainpage Short Description: Muon RDO conversion to PrepRawData
+@page MuonRdoToPrepData_page Short Description: Muon RDO conversion to PrepRawData
 
  - The Raw Data Object (RDO) classes of the MuonSpectrometer are implemented in the package MuonRDO. The 
 Reconstruction Input/Output Object (RIO) classes are in MuonDetRec/MuonPrepRawData.
diff --git a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/doc/mainpage.h b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/doc/packagedoc.h
similarity index 97%
rename from MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/doc/mainpage.h
rename to MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/doc/packagedoc.h
index dabb82eab1035721e414e84f72dd3691ccfd61c1..c2ee183788ac3ad487ba8949227d0107be0d7b86 100644
--- a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage MuonTGC_CnvTools Package
+@page MuonTGC_CnvTools_page MuonTGC_CnvTools Package
 
 MuonTGC_CnvTools package contains classes for conversions among BS, RDO, PRD etc. of TGC. 
 
@@ -13,7 +13,7 @@ MuonTGC_CnvTools package contains classes for conversions among BS, RDO, PRD etc
 @author Hisaya Kurashige 
 @author Edward Moyse 
 
-@section MuonTGC_CnvToolsIntro Introduction
+@section MuonTGC_CnvTools_MuonTGC_CnvToolsIntro Introduction
 MuonTGC_CnvTools package contains classes for conversions among BS, ROD (ROB fragment in BS), RDO, PRD and Digit of TGC. 
 
 - Conversion from BS to RDO
@@ -43,7 +43,7 @@ Many information can be accessed from
 Doxygen documentation of MuonTGC_CnvTools in dev nightly in html can be accessed at 
 - http://atlas-computing.web.cern.ch/atlas-computing/links/nightlyDevDirectory/AtlasOffline/latest_doxygen/InstallArea/doc/MuonTGC_CnvTools/html/ 
 
-@section MuonTGC_CnvToolsID Identifier 
+@section MuonTGC_CnvTools_MuonTGC_CnvToolsID Identifier
 TGC has four kinds of identifiers, Offline ID, Online ID, Readout ID and Trigger ID.  
 
 @subsection MuonTGC_CnvToolsOfflineID Offline ID
@@ -89,7 +89,7 @@ Specification
 Trigger ID is an identifier for individual trigger electronics component (Sector, LowPt (Tracklet), HighPt and SectorLogic). 
 Trigger ID is used in trigger RDO and simulation (TrigT1TGC package). 
 
-@section MuonTGC_CnvToolsRDO RDO 
+@section MuonTGC_CnvTools_MuonTGC_CnvToolsRDO RDO
 RDO (Raw Data Object) is written by ReadoutID. 
 It is well described Tables, 7, 9, 11 and 12 in http://cern.ch/Atlas-TGC/doc/ROBformat.pdf .
 
@@ -166,7 +166,7 @@ It is well described Tables, 7, 9, 11 and 12 in http://cern.ch/Atlas-TGC/doc/ROB
 - veto : bool, 0-> success of Inner-Coincidence, 1->vetoed
  - https://twiki.cern.ch/twiki/pub/Main/TgcDocument/RoI_Numbering-080815.pdf
 
-@section MuonTGC_CnvToolsPRD PRD
+@section MuonTGC_CnvTools_MuonTGC_CnvToolsPRD PRD
 Variables of Prep Raw Data (PRD) are as follows:
 @subsection MuonTGC_CnvToolsPRDHit Hit PRD Variables 
 Muon::TgcPrepData class is used for Hit PRD. 
@@ -234,7 +234,7 @@ Muon::TgcCoinData class is used for SL PRD.
 - int pt : The pT threshold (1-6)
 - bool isPositiveDeltaR : The sign of delta of HipT Wire (isMuplus)
 
-@section MuonTGC_CnvToolsDataFormat Data Format
+@section MuonTGC_CnvTools_MuonTGC_CnvToolsDataFormat Data Format
 The formats in Byte Stream is written in http://cern.ch/Atlas-TGC/doc/ROBformat.pdf and http://atlas-proj-tgc.web.cern.ch/atlas-proj-tgc/doc/FElnkprotocol.pdf .
 - TGC Rawdata format is the data sent from Star Switch (SSW). 
 - TGC Readout format is written in Readout ID by Readout Driver (ROD). 
@@ -247,8 +247,7 @@ based on muonRecFlags.doTGC_rawdataROD flag defined in MuonSpectrometer/MuonReco
 
 TGC has 24 (12 sectors x 2 sides) Readout Buffers (ROBs). 
 
-@section MuonTGC_CnvToolsReq Requirements
+@section MuonTGC_CnvTools_MuonTGC_CnvToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/doc/mainpage.h b/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/doc/packagedoc.h
similarity index 96%
rename from MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/doc/mainpage.h
rename to MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/doc/packagedoc.h
index 510d5dc8111c92302bef74b6da924f764a4756bd..7ab9ecc37464ae12864a8bf830566abd05c15b7f 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/doc/mainpage.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/doc/packagedoc.h
@@ -3,21 +3,21 @@
 */
 
 /** 
-@mainpage TGC_CondCabling Package
+@page TGC_CondCabling_page TGC_CondCabling Package
 
 TGC_CondCabling package contains a class (TGCCablingDbTool) to retrieve TGC cabling map database from COOL. 
 
 @author Monica Verducci
 @author Susumu Oda <Susumu.Oda@cern.ch>
 
-@section TGC_CondCablingIntro Introduction 
+@section TGC_CondCabling_TGC_CondCablingIntro Introduction
 This package has been created to retrieve the TGC cabling map database in COOL. 
 The database describes wrong cabling connections between ASD and Patch Panel (PP). 
 The database was MuonSpectrometer/MuonCablings/TGCcabling12/share/ASD2PP_diff_12.db. 
 However, the wrong cabling connections are time-dependent and we moved the file to the COOL database.   
 There are no found wrong connections as of August 30, 2009. 
 
-@section TGCCablingDbTool TGCCablingDbTool
+@section TGC_CondCabling_TGCCablingDbTool TGCCablingDbTool
 @subsection TGCCablingDbToolloadASD2PP_DIFF_12 loadASD2PP_DIFF_12 
 TGCCablingDbTool retrieves the TGC wrong connection map from the COOL database by the loadASD2PP_DIFF_12 method with Interval of Validity (IoV =Run*2^32+LumiBlock). 
 This loadASD2PP_DIFF_12 method is called by MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/MuonTGC_CablingSvc.cxx as call-back. 
@@ -99,7 +99,7 @@ declareProperty("filename_ASD2PP_DIFF_12", m_filename="ASD2PP_diff_12.db");
 \endcode
 This method is used for debug and test. 
 
-@section TGCCablingDbToolHowToUpdataDatabase How to update database? 
+@section TGC_CondCabling_TGCCablingDbToolHowToUpdataDatabase How to update database?
 The current tags are ideal cabling connections without wrong connections.
 We will keep the map database ideal for simulation. We will update the map database for real data. 
 The following is the update prodedure.  
@@ -164,7 +164,6 @@ The official authentication.xml file will be updated automatically.
 
 It is better to associate the leaf tag to a global tag and test the database with the global tag first. 
 If there is no problem, then you ask Paul and Richard to associate the leaf tag to other global tags.  
-@include requirements
 
 */
 
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/doc/mainpage.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/doc/mainpage.h
rename to MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/doc/packagedoc.h
index 64cc76cb47cf297316b20a77da3b9684af5dabf3..c01bab2962d03647354ceeac99c034e59a57f0dd 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/doc/mainpage.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage MuonCondCool Package
+@page MuonCondCool_page MuonCondCool Package
 @author Monica.Verducci@cern.ch
                                                                                 
-@section MuonCondCoolIntro Introduction
+@section MuonCondCool_MuonCondCoolIntro Introduction
                                                                                 
 Contains algorithms and services to put and retrieve data from the COOL Condition Database.
 
-@section MuonCondCoolOverview Class Overview
+@section MuonCondCool_MuonCondCoolOverview Class Overview
 The MuonCondCool package provides different algorithms to access to the Conditiond Databse for different Muon technologies.
 
 - MdtReadWriteCoolStr, CscReadWriteCoolStr provide the methods to put data inside the folders (packing them before) 
@@ -30,11 +30,9 @@ with the flags Read/Write True.
                                                                                 
 /**
 @page used_MuonCondCool Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCondCool Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/doc/mainpage.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/doc/packagedoc.h
similarity index 71%
rename from MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/doc/mainpage.h
rename to MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/doc/packagedoc.h
index d843b390e0c88a7c3a43b1329ff4e294aa8eeb0f..6aeda17552a352c21bb8d5fcdc8568a983b3349a 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/doc/mainpage.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage MuonCondData Package
+@page MuonCondData_page MuonCondData Package
 @author lampen@physics.arizona.edu
 
-@section MuonCondDataIntro Introduction 
+@section MuonCondData_MuonCondDataIntro Introduction
 This package contains Csc Container
 
-@section MuonCondDataOverview Class Overview
+@section MuonCondData_MuonCondDataOverview Class Overview
 The MuonCondData package contains the methods
 GetParameter, GetXXX that hold the database parameters
 
@@ -22,12 +22,10 @@ GetParameter, GetXXX that hold the database parameters
 
 /**
 @page used_MuonCondData Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonCondData Requirements
-@include requirements
 */
 
 
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/doc/mainpage.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/doc/packagedoc.h
similarity index 86%
rename from MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/doc/mainpage.h
rename to MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/doc/packagedoc.h
index 0f8e540ed234eb037748e88a61085f2e707b2d45..37a9341a50380cdfea1fd0ff74b67965b39d7a65 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/doc/mainpage.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MuonCondInterface Package
+@page MuonCondInterface_page MuonCondInterface Package
 @author Monica.Verducci@cern.ch
                                                                                 
-@section MuonCondInterfaceIntro Introduction
+@section MuonCondInterface_MuonCondInterfaceIntro Introduction
 This package contains all the abstract interfaces which can be used in
 a standalone Muon Conditions applications.
                                                                                 
-@section MuonCondInterfaceOverview Class Overview
+@section MuonCondInterface_MuonCondInterfaceOverview Class Overview
 The MuonCondInterface package provides the following abstract interfaces:
                                                                                 
 - MuonCalib::IMuonAlignmentDbTool:: Interface class for Tools accessing conditions DB for Alignment
@@ -23,12 +23,10 @@ The MuonCondInterface package provides the following abstract interfaces:
                                                                                 
 /**
 @page used_MuonCondInterface Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCondInterface Requirements
-@include requirements
 */
 
 
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/doc/mainpage.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/doc/mainpage.h
rename to MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/doc/packagedoc.h
index 37adde9355486e14ef3f6382c6be69969ca65c4a..ed139df0d6685b5f9577f127b9255ccf4c0bd568
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/doc/mainpage.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage MuonCondSvc package
+@page MuonCondSvc_page MuonCondSvc package
 @author Monica.Verducci@cern.ch
 
  
-@section MuonCondSvcIntro Introduction
+@section MuonCondSvc_MuonCondSvcIntro Introduction
 This package contains the services 
 responsible to provide to the
 clients (reconstruction) the conditions information from the COOL Database
@@ -27,9 +27,7 @@ MuonDetectorStatusDbSvc
 
 /**
 @page used_MuonCondSvc Used Packages
-@htmlinclude used_packages.html
 */
 /**
 @page requirements_MuonCondSvc Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/doc/mainpage.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 75%
rename from MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/doc/mainpage.h
rename to MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/doc/packagedoc.h
index fc658485ae0cdce65d62658223babc5502c5a696..d0c13bddfa5ec5695cfdadc7abaf17db243403b8
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/doc/mainpage.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage MuonCondTest Package
+@page MuonCondTest_page MuonCondTest Package
 @author Monica.Verducci@cern.ch
 
-@section MuonCondTestIntro Introduction 
+@section MuonCondTest_MuonCondTestIntro Introduction
 This package contains an ATHENA algorithm 
 used to test the Alignment staff
 
-@section MuonCondTestOverview Class Overview
+@section MuonCondTest_MuonCondTestOverview Class Overview
 The MuonCondTest package contains the following class
 
 - MuonCalib::MuonCondTest: algorithm used to initialize the service 
@@ -25,12 +25,10 @@ used for the alignment Conditions Access (only test)
 
 /**
 @page used_MuonCondTest Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonCondTest Requirements
-@include requirements
 */
 
 
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/doc/mainpage.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/doc/mainpage.h
rename to MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/doc/packagedoc.h
index 6d6838ef3e36d6992878df0df6365599560d4fd6..a2372f27a052fe4c79031aa4e8d7475bbc520d5a 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/doc/mainpage.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MuonCondTool Package
+@page MuonCondTool_page MuonCondTool Package
 @author Monica.Verducci@cern.ch
                                                                                 
-@section MuonCondToolIntro Introduction
+@section MuonCondTool_MuonCondToolIntro Introduction
 This package contains the implementation of various tools derived from the
 abstract MuonCalib::MuonCondITool classes.
                                                                                 
-@section MuonCondToolOverview Class Overview
+@section MuonCondTool_MuonCondToolOverview Class Overview
 The MuonCondTool package contains the following Tools  
 - MuonCalib::MuonDetectorStatusDbTool: access information on the tube status directly by COOL Database Folders
 - MuonCalib::MuonAlignmentDbTool:  access information on A and B lines from COOL Database Folders
@@ -31,11 +31,9 @@ Both tools register a callback to update in the TDS the data objetcs
                                                                                 
 /**
 @page used_MuonCondTool Used Packages
-@htmlinclude used_packages.html
 */
                                                                                 
 /**
 @page requirements_MuonCondTool Requirements
-@include requirements
 */
  
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/doc/mainpage.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/doc/packagedoc.h
similarity index 79%
rename from MuonSpectrometer/MuonDetDescr/MuonRegionSelector/doc/mainpage.h
rename to MuonSpectrometer/MuonDetDescr/MuonRegionSelector/doc/packagedoc.h
index eddf14d4e22fbb9fcb03b7fcdb159d5635c30cc2..0fe59e7738cfdab81529e5239df883509e4d53fa 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/doc/mainpage.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage MuonRegionSelector Package
+@page MuonRegionSelector_page MuonRegionSelector Package
 
 @authors Mark Sutton, Stefania Spagnolo
 
-@section MuonRegionSelectorIntro Introduction 
+@section MuonRegionSelector_MuonRegionSelectorIntro Introduction
 
 This package contains code to generate the tables of element extents
 used by the region selector for the Muon system
@@ -34,7 +34,7 @@ of the roi along the beamline. The default z range (DeltaZ in the old version)
 is now more properly a property of the calling algorithm. 
 
 
-@section MuonRegionSelectorClassOverview  Class Overview
+@section MuonRegionSelector_MuonRegionSelectorClassOverview Class Overview
 
 The package contains the two tools:
 
@@ -44,14 +44,13 @@ The package contains the two tools:
   - CSC_RegionSelectorTable:  CSC
 
 
-@section MuonRegionSelectorJobOptions  Job Options
+@section MuonRegionSelector_MuonRegionSelectorJobOptions Job Options
 
 
  - MuonRegionSelectorTable_jobOptions.py: Job option fragment for initializing all tools using genConf. 
    Makes use of DetFlags to control which tables will be created.
 
-@section MuonRegionSelectorReq Requirements
+@section MuonRegionSelector_MuonRegionSelectorReq Requirements
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/doc/mainpage.h b/MuonSpectrometer/MuonDigitization/CSC_Digitization/doc/packagedoc.h
similarity index 95%
rename from MuonSpectrometer/MuonDigitization/CSC_Digitization/doc/mainpage.h
rename to MuonSpectrometer/MuonDigitization/CSC_Digitization/doc/packagedoc.h
index 69120554c1eed07ed426dacb020eca94f43cfa40..f5db723a57f9b944f6855ba21f1d37b022b7d83f 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/doc/mainpage.h
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-\mainpage Short Description of CSC Digitization
+@page CSC_Digitization_page Short Description of CSC Digitization
 
  - This is a package to simulate the charge (in number of equivalent electrons) induced on the segmented 
 CSC cathode strips by the avalanche on the anode wires given a Geant4 hit in the sensitive gas. For a 
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/doc/mainpage.h b/MuonSpectrometer/MuonDigitization/MDT_Digitization/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonDigitization/MDT_Digitization/doc/mainpage.h
rename to MuonSpectrometer/MuonDigitization/MDT_Digitization/doc/packagedoc.h
index b0e374f35a8f543c403c3b1ad04d93173316d3fb..5bda2568d8e7499d3bbe556d32e759543595df14 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/doc/mainpage.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage MDT_Digitization package
+@page MDT_Digitization_page MDT_Digitization package
 	@author Daniela.Rebuzzi <daniela.rebuzzi@pv.infn.it>
 	@author Niels Van Eldik <nveldik@nikhef.nl>
 	
-@section MDT_DigitizationIntro Introduction
+@section MDT_Digitization_MDT_DigitizationIntro Introduction
 
 Package to generate MDT digits starting from Geant4 hits.
 The MDT Digit object consist of an Offline ID, a TDC count and an ADC count.
 
-@section MDT_DigitizationOverview Class Overview
+@section MDT_Digitization_MDT_DigitizationOverview Class Overview
 
 This package contains the MDT_Digitizer algorithm. 
 It takes care of all the steps necessary to simulate the MDT tube response and
@@ -26,7 +26,7 @@ performed by the given converter - RDOs are the persistified objects):
       - Trigger match for the digits
       - Total time -> TDC counts conversion for the "good" digits
 
-@section MDT_DigitizationDetails Working principles
+@section MDT_Digitization_MDT_DigitizationDetails Working principles
 
 In the MDT_Digitizer, the following effects taken into account:
 
@@ -61,7 +61,7 @@ In the MDT_Digitizer, the following effects taken into account:
           corrupted hits (i.e. hits with invalid tube radius, or invalid
 	  position in the tube or with tof > 10*minTof) are discarted
 
-@section MDT_DigitizationTools Digitization Tools
+@section MDT_Digitization_MDT_DigitizationTools Digitization Tools
 
 For the r->t conversion, two different tools are available and selectable via
 jobOptions, setting the property DigitizationTool of the MDT_Digitizer:
@@ -74,7 +74,7 @@ jobOptions, setting the property DigitizationTool of the MDT_Digitizer:
 	rt relation, coming from data or from Garfiled simulation, for example
 	(here the ADC count is set to a fixed value)
 	
-@section ExtrasMDT_Digitization Extra Pages
+@section MDT_Digitization_ExtrasMDT_Digitization Extra Pages
 
  - @ref UsedMDT_Digitization
  - @ref RequirementsMDT_Digitization
@@ -82,12 +82,10 @@ jobOptions, setting the property DigitizationTool of the MDT_Digitizer:
 
 /**
 @page UsedMDT_Digitization Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMDT_Digitization Requirements
-@include requirements
 
  - For more detailed information, see the note on the Muon Digitization.
 
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Response/doc/mainpage.h b/MuonSpectrometer/MuonDigitization/MDT_Response/doc/packagedoc.h
similarity index 77%
rename from MuonSpectrometer/MuonDigitization/MDT_Response/doc/mainpage.h
rename to MuonSpectrometer/MuonDigitization/MDT_Response/doc/packagedoc.h
index 24aaa11c2f1cf821e5f9dfb2910ac63013f621ec..7f9dbf41332494c6dae3862f465b0022a8dba847 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Response/doc/mainpage.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Response/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage MDT_Response package
+@page MDT_Response_page MDT_Response package
 	 @author Niels.Van.Eldik@cern.ch
 	
-@section MDT_ResponseIntro Introduction
+@section MDT_Response_MDT_ResponseIntro Introduction
 
 The MDT_Response package contains the digitization code used the 
 convert drift radii into drift times during the MDT_Digization. 
@@ -20,7 +20,7 @@ PhD Thesis, Niels van Eldik
 
 
  	
-@section ExtrasMDT_Response Extra Pages
+@section MDT_Response_ExtrasMDT_Response Extra Pages
 
  - @ref UsedMDT_Response
  - @ref RequirementsMDT_Response
@@ -28,11 +28,9 @@ PhD Thesis, Niels van Eldik
 
 /**
 @page UsedMDT_Response Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMDT_Response Requirements
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/doc/mainpage.h b/MuonSpectrometer/MuonDigitization/RPC_Digitization/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonDigitization/RPC_Digitization/doc/mainpage.h
rename to MuonSpectrometer/MuonDigitization/RPC_Digitization/doc/packagedoc.h
index 16c8414d867d79a73a1a604077b748531420b552..6f7578ff18289730c59635d63a88a16a7d4f54e0 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/doc/mainpage.h
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage RPC_Digitization Package
+@page RPC_Digitization_page RPC_Digitization Package
 @author Andrea.Di.Simone@cern.ch
 
-@section RPC_DigitizationIntro Introduction
+@section RPC_Digitization_RPC_DigitizationIntro Introduction
 
 Package to generate RPC digits starting from Geant4 hits.
 
-@section RPC_DigitizationOverview Class Overview
+@section RPC_Digitization_RPC_DigitizationOverview Class Overview
   
 This package contains the RPC_Digitizer algorithm. It takes care of all the steps necessary for RPC hits
 digitization:
@@ -19,7 +19,7 @@ digitization:
       - Cluster simulation (According to experimental data)
       - Propagation time calculation.
 
-@section  RPC_DigitizationDetails Working principles
+@section RPC_Digitization_RPC_DigitizationDetails Working principles
 
 RPC hits are generated by the SensitiveDetector (SD) which assigns to them a 
 Simulation Identifier (SimID), uniquely identifying the gas gap each hit is 
@@ -38,7 +38,7 @@ assign this global time to the digit. The information obtained is
 stored in a new instance of the class RPCDigit and posted in StoreGate 
 for further processing.
 
-@section  RPC_DigitizationCluster Cluster simulation
+@section RPC_Digitization_RPC_DigitizationCluster Cluster simulation
 
 When a particle generates an avalanche in an RPC, charge signals are 
 induced (and detected) on the readout strips. A set of $n$ adjacent strips 
@@ -63,8 +63,7 @@ Particular attention needs to be paid to the way the additional digits are
 created around the one actually crossed by the muon. The decision of which strip
 to turn on is made according to experimental distributions.
 
-@section Req Requirements
+@section RPC_Digitization_Req Requirements
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/doc/mainpage.h b/MuonSpectrometer/MuonDigitization/TGC_Digitization/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonDigitization/TGC_Digitization/doc/mainpage.h
rename to MuonSpectrometer/MuonDigitization/TGC_Digitization/doc/packagedoc.h
index ee7ebe55fb99a268eb0210d2f4de313700a5cb5c..805a469334a156504f3d1ec7d15cd4d15f7a3e70 100644
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/doc/mainpage.h
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage Short Description of TGC Digitization Package
+@page TGC_Digitization_page Short Description of TGC Digitization Package
 
 @author Yoji.Hasegawa@cern.ch
 
-@section TGC Digitization Introduction
+@section TGC_Digitization_TGC Digitization Introduction
 
 This is a short description on the package. A detailed description is
 available in the note on the Muon Digitization.
@@ -18,7 +18,7 @@ This package has the following functionalities:
   - conversion TGC hits generated by the simulation to TGC digits and
   - simulation of TGC detector response.
 
-@section Conversion of Hits to Digits
+@section TGC_Digitization_Conversion of Hits to Digits
 
 Hit positions of R and phi coordinates in TGC can be read by gangs of
 wires and strips, respectively. The parameters needed for digitization,
@@ -31,7 +31,7 @@ As the result of the digitization, TGC digits have offline ID which
 describes stationName/statonPhi/stationEta/gasGap/is_strip/channel for
 the digits.
 
-@section Detector Response Simulation
+@section TGC_Digitization_Detector Response Simulation
 
 TGC digitization simulates the following detector responses:
 
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/doc/mainpage.h b/MuonSpectrometer/MuonG4/MuonG4SD/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from MuonSpectrometer/MuonG4/MuonG4SD/doc/mainpage.h
rename to MuonSpectrometer/MuonG4/MuonG4SD/doc/packagedoc.h
index 4ad10bddd885c0bdde17574041fd5d6fc3a38b7f..67dceda8aaa77c3530102c94cb794d01db6b1cd5
--- a/MuonSpectrometer/MuonG4/MuonG4SD/doc/mainpage.h
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page MuonG4SD_page 
 
    @package MuonG4SD 
    
@@ -54,7 +54,7 @@ EndOfEvent()
     occasionally created in your sensitive detector can be associated to the 
     G4HCofThisEvent object. 
 
-@section ExtrasMuonG4SD Extra Pages
+@section MuonG4SD_ExtrasMuonG4SD Extra Pages
 
  - @ref UsedMuonG4SD
  - @ref RequirementsMuonG4SD
@@ -62,11 +62,9 @@ EndOfEvent()
 
 /**
 @page UsedMuonG4SD Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonG4SD Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonGMdbObjects/doc/mainpage.h b/MuonSpectrometer/MuonGMdbObjects/doc/packagedoc.h
similarity index 87%
rename from MuonSpectrometer/MuonGMdbObjects/doc/mainpage.h
rename to MuonSpectrometer/MuonGMdbObjects/doc/packagedoc.h
index af36eabe997036319e2fa335df1b3ffa78a1e602..08b42dbd3cf1bf9ae223f1581fee323c683389d5 100644
--- a/MuonSpectrometer/MuonGMdbObjects/doc/mainpage.h
+++ b/MuonSpectrometer/MuonGMdbObjects/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage The MuonGMdbObjects Package 
+@page MuonGMdbObjects_page The MuonGMdbObjects Package
 
-@section  IntroMuonGMdbObjects Introduction
+@section MuonGMdbObjects_IntroMuonGMdbObjects Introduction
 
 This package contains objects used for reading from the Geometry DataBase the main tables containing the MS primary numbers;
 The need for this kind of objects came at the time when the Nova DB and the Oracle DB where running at the same time, holding copies of the same layouts in addition to
@@ -22,11 +22,9 @@ following the data structure of the Nova Objects and using templated functions i
 
 /**
 @page used_GMdbObjects Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_GMdbObjects Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonGeoModel/doc/mainpage.h b/MuonSpectrometer/MuonGeoModel/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from MuonSpectrometer/MuonGeoModel/doc/mainpage.h
rename to MuonSpectrometer/MuonGeoModel/doc/packagedoc.h
index 5b3a6510822401bbb50daff1b0dd31a0ccd06975..de75286333d871c42d991156515ed90e12d6d860
--- a/MuonSpectrometer/MuonGeoModel/doc/mainpage.h
+++ b/MuonSpectrometer/MuonGeoModel/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage The MuonGeoModel Package 
+@page MuonGeoModel_page The MuonGeoModel Package
 
-@section  IntroMuonGeoModel Introduction
+@section MuonGeoModel_IntroMuonGeoModel Introduction
 
 This package provides the implementation of GeoModel for the various MuonSpectrometer layouts (from layout P to layout R'').
 This geometry description is used for simulation (feed to G4 via the Geo2G4 tool) and reconstruction.
@@ -13,13 +13,13 @@ Reconstruction and generic geometry clients will need to depend on a few classes
 This sub-set of classes, usually referred as "readout geometry", will be decoupled from the so called "raw geometry",
 i.e. the tree of volumes, with associated materials and transforms which are directly translated into G4.
 
-@section MGMRawGeometry MuonGeoModel Raw Geometry
+@section MuonGeoModel_MGMRawGeometry MuonGeoModel Raw Geometry
 For the moment, please, refer to http://atlas.web.cern.ch/Atlas/GROUPS/DATABASE/detector_description/Muon.html
 
-@section MGMReadoutGeometry MuonGeoModel Readout Geometry
+@section MuonGeoModel_MGMReadoutGeometry MuonGeoModel Readout Geometry
 For the moment, please, refer to http://atlas.web.cern.ch/Atlas/GROUPS/DATABASE/detector_description/Muon.html
 
-@section MuonGeoModelClasses Class Overview
+@section MuonGeoModel_MuonGeoModelClasses Class Overview
 
 The MuonGeoModel package contains the following main classes:
 
@@ -60,11 +60,9 @@ Please, refer to the Classes section for more details (especially about the Read
 
 /**
 @page used_MuonGeoModel Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonGeoModel Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonGeoModelTest/doc/mainpage.h b/MuonSpectrometer/MuonGeoModelTest/doc/packagedoc.h
similarity index 91%
rename from MuonSpectrometer/MuonGeoModelTest/doc/mainpage.h
rename to MuonSpectrometer/MuonGeoModelTest/doc/packagedoc.h
index 82e8b81cf83a6140a8090ad536b92d85611bab9c..b8143e2a5ce739f0e5e56642edd77a130abdf8c2 100644
--- a/MuonSpectrometer/MuonGeoModelTest/doc/mainpage.h
+++ b/MuonSpectrometer/MuonGeoModelTest/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage The MuonGeoModelTest Package 
+@page MuonGeoModelTest_page The MuonGeoModelTest Package
 
-@section  IntroMuonGeoModelTest Introduction
+@section MuonGeoModelTest_IntroMuonGeoModelTest Introduction
 
 This package is a colection of algorithms used for stand-alone tests of the geometry implementation provided by MuonGeoModel.
 
-@section MuonGeoModelTestAlgos Algorithm Overview
+@section MuonGeoModelTest_MuonGeoModelTestAlgos Algorithm Overview
 
 MuonGMCheck       - can be run in several modes, depending on the setting of internal flags (job-options);
                     most relevant are:
@@ -37,11 +37,9 @@ MuonHitRelocation - runs on SimHit files; gets the local_position of the hit and
 
 /**
 @page used_MuonGeoModelTest Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonGeoModelTest Requirements
-@include requirements
 */
 
diff --git a/MuonSpectrometer/MuonIdHelpersAlgs/doc/mainpage.h b/MuonSpectrometer/MuonIdHelpersAlgs/doc/packagedoc.h
similarity index 81%
rename from MuonSpectrometer/MuonIdHelpersAlgs/doc/mainpage.h
rename to MuonSpectrometer/MuonIdHelpersAlgs/doc/packagedoc.h
index 9a222be441bdc5337560bc6c310c29645b0602bb..4f91c1459f0fe8e4331a806e2d295504d5b1b7b9 100644
--- a/MuonSpectrometer/MuonIdHelpersAlgs/doc/mainpage.h
+++ b/MuonSpectrometer/MuonIdHelpersAlgs/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage Compact Identifier tests
+@page MuonIdHelpersAlgs_page Compact Identifier tests
 
  - This package was designed to test the compact identifiers and to do timing tests on the packing and 
 unpacking of identifiers. The detector elements and the readout channel identifiers are checked: the 
@@ -16,11 +16,9 @@ implementation of identifiers.
  - For questions or comments: Ketevi A. Assamagan
    ketevi@bnl.gov
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section MuonIdHelpersAlgs_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section MuonIdHelpersAlgs_requirements Requirements
 
 
 */
diff --git a/MuonSpectrometer/MuonOverlay/CscOverlay/doc/mainpage.h b/MuonSpectrometer/MuonOverlay/CscOverlay/doc/packagedoc.h
similarity index 66%
rename from MuonSpectrometer/MuonOverlay/CscOverlay/doc/mainpage.h
rename to MuonSpectrometer/MuonOverlay/CscOverlay/doc/packagedoc.h
index ec7dd12befeed7cf1675c7a520925d97960c8731..799927822ab7f07d6531072e41476dcd5e16d9e0 100644
--- a/MuonSpectrometer/MuonOverlay/CscOverlay/doc/mainpage.h
+++ b/MuonSpectrometer/MuonOverlay/CscOverlay/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage  CSC Overlay
+@page CscOverlay_page CSC Overlay
 
  - Pileup with real data: overlay of physics simulated RDO onto the zero bias real data. The case of the CSC
    where we do RDO+RDO type of overlay
@@ -12,11 +12,9 @@
  - For questions or comments: Ketevi A. Assamagan
    ketevi@bnl.gov
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section CscOverlay_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section CscOverlay_requirements Requirements
 
 
 */
diff --git a/MuonSpectrometer/MuonRDO/doc/mainpage.h b/MuonSpectrometer/MuonRDO/doc/packagedoc.h
similarity index 82%
rename from MuonSpectrometer/MuonRDO/doc/mainpage.h
rename to MuonSpectrometer/MuonRDO/doc/packagedoc.h
index 00a8262a660fe0764052d5065592e96630ae6a94..3116f1160440351d3cc104934f6d5e8b805f1a13 100644
--- a/MuonSpectrometer/MuonRDO/doc/mainpage.h
+++ b/MuonSpectrometer/MuonRDO/doc/packagedoc.h
@@ -3,8 +3,8 @@
 */
 
 /**
-@mainpage 
-@section introductionMuonRDO Introduction
+@page MuonRDO_page 
+@section MuonRDO_introductionMuonRDO Introduction
 
 This package contains the Muon 'Raw Data Objects' or RDOs. These are the objects representing the Muon bytestream
 
@@ -34,10 +34,8 @@ Finally, there are the raw data objects:
 
 @sa The official Muon EDM webpage is https://twiki.cern.ch/twiki/bin/view/Atlas/MuonEventDataModel
 
-@section used_packagesMuonRDO Used Packages
-@htmlinclude used_packages.html
+@section MuonRDO_used_packagesMuonRDO Used Packages
 
-@section requirementsMuonRDO Requirements
-@include requirements
+@section MuonRDO_requirementsMuonRDO Requirements
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/doc/packagedoc.h
index 65a8ebcd1e4750ed0448c373a58b011a7b21c4c1..a5411729d36be869e4c7f4693629ca16c84cd383
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage CscClusterization package
+@page CscClusterization_page CscClusterization package
 
 @author dladams@bnl.gov
 
-@section IntroductionCscClusterization Introduction
+@section CscClusterization_IntroductionCscClusterization Introduction
 
 The main purpose of this package is to provide an algorithm to build CSC
 (cathode strip chamber) clusters. The latter serve as input for the
@@ -16,7 +16,7 @@ fitting. The currently supported algorithm is called CscThresholdClusterBuilder
 and it uses a simple strategy of clustering adjacent hit strips whose total
 charge is above a threshold specified in the job options.
 
-@section ToolsCscClusterization Tools
+@section CscClusterization_ToolsCscClusterization Tools
 
 The package also provide some supporting tools that may also be used in other
 contexts. Strip fitters (interface ICscStripFitter) are used to assign the total
@@ -33,7 +33,7 @@ the center of the cluster and uses the effective with (cluster minus inherent)
 to assign an error. QratCscClusterFitter use the method of adjacent charge ratios
 with a lookup table to convert strip position to geometric position.
 
-@section ConfigurationCscSegmentMakers Configuration
+@section CscClusterization_ConfigurationCscSegmentMakers Configuration
 
 The tools and algorithm are configured in python. Use the following to access the default
 instances:
@@ -45,13 +45,13 @@ from CscClusterization.QratCscClusterFitter import theQratCscClusterFitter
 from CscClusterization.CscThresholdClusterBuilder import theCscThresholdClusterBuilder
 </pre>
 
-@section DeprecatedCscClusterization Deprecated code
+@section CscClusterization_DeprecatedCscClusterization Deprecated code
 
 The orginal clusterization algorithm CscClusterBuilder is deprecated and has been
 removed. Some of its supporting components, CscAverage, CscFit and CscParabola,
 have been retained for possible future use.
 
-@section AdditionalCscClusterization Additional information
+@section CscClusterization_AdditionalCscClusterization Additional information
 
  - @ref UsedCscClusterization
  - @ref RequirementsCscClusterization
@@ -60,10 +60,8 @@ have been retained for possible future use.
 
 /**
 @page UsedCscClusterization Used packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsCscClusterization Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/doc/packagedoc.h
similarity index 74%
rename from MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/doc/packagedoc.h
index 6205942c311a927ad06063c6962fb3a82414006b..a3fa4f7f8e1004bdb37775eb4ed7445bd949bdd3 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MuonCombinePatternTools Package
+@page MuonCombinePatternTools_page MuonCombinePatternTools Package
 @author Jochem Snuverink <jsnuverink@nikhef.nl>
 
-@section MuonCombinePatternToolsIntro Introduction
+@section MuonCombinePatternTools_MuonCombinePatternToolsIntro Introduction
 
 This AlgTool will combine global eta and phi patterns from the HoughPatternTool into combined Patterns, using the track model used in the houghtransforms and a distance cut
 
-@section MuonCombinePatternToolsOverview Class Overview
+@section MuonCombinePatternTools_MuonCombinePatternToolsOverview Class Overview
   The MuonCombinePatternTools package contains the following classes:
 
   - MuonCombinePatternTool: combines eta and phi patterns
@@ -23,10 +23,8 @@ This AlgTool will combine global eta and phi patterns from the HoughPatternTool
 
 /**
 @page used_MuonCombinePatternTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonCombinePatternTools Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/doc/packagedoc.h
similarity index 76%
rename from MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/doc/packagedoc.h
index 74d2aacf39c1a7f045c7d60c3b6f0d4f48f5ac11..dc19801565860e6b433e2a63d9a770a7f631cdd5 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MuonHoughPatternTools Package
+@page MuonHoughPatternTools_page MuonHoughPatternTools Package
 @author Jochem Snuverink <jsnuverink@nikhef.nl>
 
-@section MuonHoughPatternToolsIntro Introduction
+@section MuonHoughPatternTools_MuonHoughPatternToolsIntro Introduction
 
 This AlgTool will make global eta and phi patterns using uncalibrated muon detector hits.
 
-@section MuonHoughPatternToolsOverview Class Overview
+@section MuonHoughPatternTools_MuonHoughPatternToolsOverview Class Overview
   The MuonHoughPatternTools package contains the following classes:
 
   - MuonHoughPatternFinderTool: AlgTool that steers the patternfinder and has the dependency to StoreGate
@@ -24,10 +24,8 @@ This AlgTool will make global eta and phi patterns using uncalibrated muon detec
 
 /**
 @page used_MuonHoughPatternTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonHoughPatternTools Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/doc/packagedoc.h
similarity index 71%
rename from MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/doc/packagedoc.h
index cda82a9dab811a7c1f63538be7c9b0e4fbb89323..45245b45c3b5203f17a55ca46315441e6cae211c 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page MdtDriftCircleOnTrackCreator_page 
 
-@section MdtDriftCircleOnTrackCreatorDocIntro Overview
+@section MdtDriftCircleOnTrackCreator_MdtDriftCircleOnTrackCreatorDocIntro Overview
 
 This package provides a tool, Muon::MdtDriftCircleOnTrackCreator, which turns
 Muon::MdtPrepData into Muon::MdtDriftCircleOnTrack objects
@@ -20,10 +20,9 @@ track prediction and calibrates its error estimate.
 More general information on RIO_OnTrackCreation and instructions
 how to use these tools can be found under Trk::RIO_OnTrackCreator.
 
-@section MdtDriftCircleOnTrackCreatorDocReq The requirements file
-@include requirements
+@section MdtDriftCircleOnTrackCreator_MdtDriftCircleOnTrackCreatorDocReq The requirements file
 
-@section MdtDriftCircleOnTrackCreatorDocMgr Package Managers
+@section MdtDriftCircleOnTrackCreator_MdtDriftCircleOnTrackCreatorDocMgr Package Managers
 The Muon::MdtDriftCircleOnTrackCreator package is currently maintained by Niels van Eldik
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 77%
rename from MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/doc/packagedoc.h
index 9cd080466c8ed0ed346b28c3a5992e6617be5dae..6c2f30d2a6ea9c1cc45be45abbec4c564c4059b9
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page MuonClusterOnTrackCreator_page 
 
-@section MuonClusterOnTrackToolDocIntro Overview
+@section MuonClusterOnTrackCreator_MuonClusterOnTrackToolDocIntro Overview
 
 This package provides a tool, MuonClusterOnTrackTool, which turns
 Muon::MuonCluster into Muon::MuonClusterOnTrack objects
@@ -30,13 +30,13 @@ It is, of course, switched off by default.
 More general information on RIO_OnTrackCreation and instructions
 how to use these tools can be found under Trk::RIO_OnTrackCreator.
 
-@section MuonClusterOnTrackToolDocCsc CSC clusters
+@section MuonClusterOnTrackCreator_MuonClusterOnTrackToolDocCsc CSC clusters
 
 The position resolution for CSC clusters depend on the angle of
 incidence and this tool provides means to correct the measurement
 errors accordingly, making use of a CSC cluster fitting tool.
 
-@section MuonClusterOnTrackToolConfiguration Configuration
+@section MuonClusterOnTrackCreator_MuonClusterOnTrackToolConfiguration Configuration
 
 The tool is configured in python. Use the following to access the default
 instance:
@@ -44,10 +44,9 @@ instance:
 from MuonClusterOnTrackCreator.DefaultMuonClusterOnTrackCreator import theMuonClusterOnTrackCreator
 </pre>
 
-@section MuonClusterOnTrackToolDocReq The requirements file
-@include requirements
+@section MuonClusterOnTrackCreator_MuonClusterOnTrackToolDocReq The requirements file
 
-@section MuonClusterOnTrackToolDocMgr Package Managers
+@section MuonClusterOnTrackCreator_MuonClusterOnTrackToolDocMgr Package Managers
 The MuonClusterOnTrackTool package is currently maintained by
 N. van Eldik and W. Liebig.
 
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/doc/mainpage.h
deleted file mode 100644
index 56c53609d1981cef9557280ae2fbb1d5a0243026..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/doc/mainpage.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
-@mainpage
-
-@section MuonCompetingClustersOnTrackCreatorDocIntro Overview
-
-The package contains several tool to create MuonCompetingClustersOnTrack objects.
-
-@section MuonCompetingClustersOnTrackCreatorDocReq The requirements file
-@include requirements
-
-@section MuonCompetingClustersOnTrackCreatorDocMgr Package Managers
-The MuonCompetingClustersOnTrackCreator package is currently maintained by Niels van Eldik.
-
-*/
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/doc/packagedoc.h b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..13c4af16f388a94ed84ec64fd002b44f00956254
--- /dev/null
+++ b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/doc/packagedoc.h
@@ -0,0 +1,18 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+
+@page MuonCompetingClustersOnTrackCreator_page 
+
+@section MuonCompetingClustersOnTrackCreator_MuonCompetingClustersOnTrackCreatorDocIntro Overview
+
+The package contains several tool to create MuonCompetingClustersOnTrack objects.
+
+@section MuonCompetingClustersOnTrackCreator_MuonCompetingClustersOnTrackCreatorDocReq The requirements file
+
+@section MuonCompetingClustersOnTrackCreator_MuonCompetingClustersOnTrackCreatorDocMgr Package Managers
+The MuonCompetingClustersOnTrackCreator package is currently maintained by Niels van Eldik.
+
+*/
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonCompetingRIOsOnTrack/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonCompetingRIOsOnTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonCompetingRIOsOnTrack/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonCompetingRIOsOnTrack/doc/packagedoc.h
index e6a23395f75b3a832e2279b8e3063dfa2909cc32..d80750cfbfcc226b3da67e63f50be0858d692448
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonCompetingRIOsOnTrack/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonCompetingRIOsOnTrack/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage The MuonCompetingRIOsOnTrack package
+@page MuonCompetingRIOsOnTrack_page The MuonCompetingRIOsOnTrack package
 The Muon package for CompetingRIOsOnTrack.
 
 @author niels.van.Eldik@cern.ch
 
-@section introductionMuonCompetingRIOsOnTrack Introduction
+@section MuonCompetingRIOsOnTrack_introductionMuonCompetingRIOsOnTrack Introduction
 
 This package contains the Muon classes which inherit from Trk::CompetingRIOsOnTrack that extends 
 the Trk::MeasurementBase class.
@@ -19,7 +19,7 @@ handle several RIO_OnTracks in one "effective detector layer"
 localParameters() and localErrorMatrix() return the mean values according to the weights (assignment probabilities).
   
 
-@section ExtrasMuonCompetingRIOsOnTrack Extra Pages
+@section MuonCompetingRIOsOnTrack_ExtrasMuonCompetingRIOsOnTrack Extra Pages
 
  - @ref UsedMuonCompetingRIOsOnTrack
  - @ref requirementsMuonCompetingRIOsOnTrack
@@ -27,10 +27,8 @@ localParameters() and localErrorMatrix() return the mean values according to the
 
 /**
 @page UsedMuonCompetingRIOsOnTrack Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsMuonCompetingRIOsOnTrack Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/doc/packagedoc.h
similarity index 82%
rename from MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/doc/packagedoc.h
index ad3327462a9101bb9a5ccd27b8f10bd6196032f0..613d4b3fc81c9418f258f8724e5e1291d7835487 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage MyPackage Package
+@page MuonEDM_AssociationObjects_page MyPackage Package
 @author niels.van.eldik@cern.ch
 
-@section MuonEDM_AssociationObjectsIntro Introduction
+@section MuonEDM_AssociationObjects_MuonEDM_AssociationObjectsIntro Introduction
 
 This package contains Muon specific implementations of Association Maps, used to store links between EDM objects.
 
@@ -24,10 +24,8 @@ For more information on how to use these objects, there are some instructions in
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 */
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/doc/packagedoc.h
index 25d4c388504794b62529fc12bb8dfdf84fc79da1..ae36624e4da6262a9bd8d91989b74f24d5566a1c 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MuonHoughPatternEvent Package
+@page MuonHoughPatternEvent_page MuonHoughPatternEvent Package
 @author jsnuverink@nikhef.nl
 
-@section MuonHoughPatternEventIntro Introduction
+@section MuonHoughPatternEvent_MuonHoughPatternEventIntro Introduction
 
 This package contains the different HoughTransforms used in the HoughPatternTool and also the internal EDM. Every houghtransformer does both the histogram filling and the association step.
 
-@section MuonHoughPatternEventOverview Class Overview
+@section MuonHoughPatternEvent_MuonHoughPatternEventOverview Class Overview
   The MuonHoughPatternEvent package contains of following classes:
 
   - MuonHoughHisto2D: Histogram class, similar to Root's TH2D
@@ -36,10 +36,8 @@ This package contains the different HoughTransforms used in the HoughPatternTool
 
 /**
 @page used_MuonHoughPatternEvent Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonHoughPatternEvent Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern/doc/packagedoc.h
similarity index 91%
rename from MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern/doc/packagedoc.h
index 6bf64c3aff8b5583827224b72f3f0b73610e2501..1e186d3879def0432e87ab7d6d6fe8f4fd9b83b2 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage MuonPattern package
+@page MuonPattern_page MuonPattern package
 	@author Niels Van Eldik <niels.van.eldik@cern.ch>
 	
-@section MuonPatternIntro Introduction
+@section MuonPattern_MuonPatternIntro Introduction
 
 Package containing classes to store sets of Trk::PrepRawData objects that are the output of the
 initial road finding in the muon spectrometer.
@@ -28,7 +28,7 @@ The objects can be stored in StoreGate using the following collections:
 - MuonPrdPatternCollection: a vector of Muon::MuonPrdPattern objects
 - MuonPatternCombinationCollection: a vector of Muon::MuonPatternCombination objects
 	
-@section ExtrasMuonPattern Extra Pages
+@section MuonPattern_ExtrasMuonPattern Extra Pages
 
  - @ref UsedMuonPattern
  - @ref RequirementsMuonPattern
@@ -36,11 +36,9 @@ The objects can be stored in StoreGate using the following collections:
 
 /**
 @page UsedMuonPattern Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonPattern Requirements
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/doc/packagedoc.h
index 0fe9e89aae38f3979810c150e6f7f4b2fb56b1ca..7b25a8c2048040cfc05f78c64e4872939f450350
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage
+@page MuonPrepRawData_page 
 
-\section introductionMuonPRD Introduction
+@section MuonPrepRawData_introductionMuonPRD Introduction
 
 The MuonPrepRawData package provides Muon Spectrometer specific implementations of the common TrkPrepRawData classes.
 
@@ -25,7 +25,7 @@ The MuonPrepRawData are stored in IdentifiableContainers (collections of collect
 instantiations of the Muon::MuonPrepDataCollection template, and where the containers are likewise typedefs to the Muon::MuonPrepDataContainer 
 template
 
-\section MuonPRDCollections Muon PRD Data Collections
+@section MuonPrepRawData_MuonPRDCollections Muon PRD Data Collections
 
 This package also provides collections:
    - Muon::MuonPrepDataCollection
@@ -43,8 +43,6 @@ Which are stored inside the containers:
       - Muon::TgcPrepDataContainer
       - Muon::MdtPrepDataContainer
    
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack/doc/packagedoc.h
index 071df58e00836c974220b6a7624d3e631125f6b3..b73a8d6088a7ec783bfa93a1bb3373e9df287a95 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage
+@page MuonRIO_OnTrack_page 
 
-@section introductionMuonROT Introduction
+@section MuonRIO_OnTrack_introductionMuonROT Introduction
 
 This package provides Muon specific implementations of the Trk::RIO_OnTrack class, namely:
     - Muon::MuonClusterOnTrack - base class for technology-specific cluster implementations
@@ -28,8 +28,6 @@ For the Muons, the specific implementations are:
 @see Muon::MuonClusterOnTrackCreator
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/doc/packagedoc.h
similarity index 77%
rename from MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/doc/packagedoc.h
index f22dca31780333a72bfb50869b43566b73a821b9..aef69f2b0820c5688066c4026f74ee8ce52e3e48 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage MuonSegment package
+@page MuonSegment_page MuonSegment package
 	 @author Niels.Van.Eldik@cern.ch, Edward.Moyse@cern.ch, Andreas.Salzburger@cern.ch
 	
-@section MuonSegmentIntro Introduction
+@section MuonSegment_MuonSegmentIntro Introduction
 
 
 The package contains the following objects:
@@ -18,7 +18,7 @@ The objects can be stored in StoreGate using the following collections:
 - MuonSegmentCollection
 - MuonSegmentCombinationCollection
 	
-@section ExtrasMuonSegment Extra Pages
+@section MuonSegment_ExtrasMuonSegment Extra Pages
 
  - @ref UsedMuonSegment
  - @ref RequirementsMuonSegment
@@ -26,11 +26,9 @@ The objects can be stored in StoreGate using the following collections:
 
 /**
 @page UsedMuonSegment Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonSegment Requirements
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecExample/doc/packagedoc.h
similarity index 95%
rename from MuonSpectrometer/MuonReconstruction/MuonRecExample/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecExample/doc/packagedoc.h
index ba8d85dbb6363761644e356f95ffa54c92f4da56..ee3b26a0fdc14faa52f66a0ba9c8b494a2037da8 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage MuonRecExample
+@page MuonRecExample_page MuonRecExample
 
 @author Martin Woudstra (current main maintainer)
 @author Rosy Nikolaidou (contributor)
@@ -15,7 +15,7 @@
 @author Stephane Willocq (contributor)
 @author Ed Moyse (contributor)
 
-@section MuonRecExampleIntro Introduction
+@section MuonRecExample_MuonRecExampleIntro Introduction
 
 This package configures the Muon Standalone Reconstruction. It contains only python jobOptions 
 and python modules for configuration purposes. It contains no C++ code.
@@ -27,7 +27,7 @@ It has a dual role:
    - share/MuonRec_myTopOptions.py: run on Monte-Carlo events
    - share/MuonDataRec_myTopOptions.py: run on real data events
 
-@section MuonRecExampleRun Running Muon Standalone Reconstruction
+@section MuonRecExample_MuonRecExampleRun Running Muon Standalone Reconstruction
 To run on Monte Carlo:<br>
 <code>
 get_joboptions MuonRecExample/MuonRec_myTopOptions.py<br>
@@ -104,10 +104,8 @@ because that calls the function @c MuonRecFlags.sync_DetFlags() and you will los
 
 
 
-@section MuonRecExampleUsedPack Used packages
-@htmlinclude used_packages.html
+@section MuonRecExample_MuonRecExampleUsedPack Used packages
 
-@section MuonRecExamplerequirements requirements file
-@include requirements
+@section MuonRecExample_MuonRecExamplerequirements requirements file
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/doc/packagedoc.h
similarity index 71%
rename from MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/doc/packagedoc.h
index 52337b99945245f2cf0dcff9d3e740b791477380..6d36fc468fe75c448373d0ccc817b67d27fb07f2 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage MuonAmbiTrackSelectionTool Package
+@page MuonAmbiTrackSelectionTool_page MuonAmbiTrackSelectionTool Package
 
 @author Niels van Eldik <niels.van.eldik@cern.ch>
 
-@section MuonAmbiTrackSelectionToolIntro Introduction
+@section MuonAmbiTrackSelectionTool_MuonAmbiTrackSelectionToolIntro Introduction
 
 This tool is a helper tool to the ambiguity processing. 
 It decides which hits remain on a track and which hits have to be removed, because they are already used on other tracks. 
@@ -16,8 +16,7 @@ is used. Some inline methods of the selection tool allow the client to use some
 selection tool.
 
 
-@section MuonAmbiTrackSelectionToolReq Requirements
+@section MuonAmbiTrackSelectionTool_MuonAmbiTrackSelectionToolReq Requirements
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/doc/packagedoc.h
similarity index 58%
rename from MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/doc/packagedoc.h
index 07340ff5bc712bb9adb83d3c958fbfa8f46a7cdb..d5405e468febed878b68be8bc7784a13726d58de 100644
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage MuonRPC_CnvTools Package
+@page MuonAssociationTools_page MuonAssociationTools Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Edward Moyse <Edward.Moyse@cern.ch>
 
-@section MuonRPC_CnvToolsIntro Introduction
+@section MuonAssociationTools_MuonAssociationToolsIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section MuonRPC_CnvToolsReq Requirements
+@section MuonAssociationTools_MuonAssociationToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/doc/packagedoc.h
similarity index 77%
rename from MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/doc/packagedoc.h
index 0e9d2f69aa763cf61dba56d3f848722c0c877c60..62c2e481ad28ece4fd0a15d7d75c7aae53286639 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage MuonErrorScalingTools Package
+@page MuonErrorScalingTools_page MuonErrorScalingTools Package
 
 @author roberth@bu.edu 
 
-@section DescriptionMuonErrorScalingTools General description
+@section MuonErrorScalingTools_DescriptionMuonErrorScalingTools General description
 
 MuonErrorScalingTools is a package providing tools used to scale errors for muon hits used in muon track reconstruction.  Tools provided are:
 - Muon::MuonErrorScaleDbTool, used to retrieve error scaling constants from conditions database
@@ -19,10 +19,8 @@ MuonErrorScalingTools is a package providing tools used to scale errors for muon
 
 /**
 @page UsedMuonErrorScalingTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonErrorScalingTools Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/doc/packagedoc.h
similarity index 68%
rename from MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/doc/packagedoc.h
index 2f62a88fed88d26e266f1858cfc7d602f36b8b5e..1ad2e152f20ccb87d2c2412ecdee6e94bdd80ecb 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage MuonRecHelperTools package
+@page MuonRecHelperTools_page MuonRecHelperTools package
 	 @author Niels.Van.Eldik@cern.ch
 	
-@section MuonRecHelperTools Introduction
+@section MuonRecHelperTools_MuonRecHelperTools Introduction
 
 This package contains a set of helper tools for Muon EDM objects and Identifiers
  	
-@section ExtrasMuonRecHelperTools Extra Pages
+@section MuonRecHelperTools_ExtrasMuonRecHelperTools Extra Pages
 
  - @ref UsedMuonRecHelperTools
  - @ref RequirementsMuonRecHelperTools
@@ -19,11 +19,9 @@ This package contains a set of helper tools for Muon EDM objects and Identifiers
 
 /**
 @page UsedMuonRecHelperTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonRecHelperTools Requirements
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/doc/packagedoc.h
similarity index 88%
rename from MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/doc/packagedoc.h
index bf43dd7e00799a6040f17ba70917c6cc62723f57..537d63d07ceba188665d4eeb6dc82654ae5f088c 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage MuonRecToolInterfaces Package
+@page MuonRecToolInterfaces_page MuonRecToolInterfaces Package
 
 @author Niels.van.Eldik@cern.ch 
 
-@section DescriptionMuonRecToolInterfaces General description
+@section MuonRecToolInterfaces_DescriptionMuonRecToolInterfaces General description
 
 The MuonRecToolInterfaces is a packages providing pure virtual interfaces needed in the muon reconstruction.
 The following interface are available:
@@ -25,7 +25,7 @@ The following interface are available:
 - Muon::IMuonRIO_OnTrackErrorScalingTool, interface for tools to set error scaling for muon detectors
 - Muon::IMuonErrorScaleDbTool, interface for tools to retrieve constants from conditions database for error scaling 
 
-@section ExtrasMuonRecToolInterfaces Extra Pages
+@section MuonRecToolInterfaces_ExtrasMuonRecToolInterfaces Extra Pages
 
  - @ref UsedMuonRecToolInterfaces
  - @ref RequirementsMuonRecToolInterfaces
@@ -34,10 +34,8 @@ The following interface are available:
 
 /**
 @page UsedMuonRecToolInterfaces Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonRecToolInterfaces Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/doc/packagedoc.h
similarity index 84%
rename from MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/doc/packagedoc.h
index 2f62055e28c8c64524130d0d12aea79070c74f0e..d6aef41e2d812aa2639639b412d9e5585bf242a4 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage MuonResidualPullCalculators Package
+@page MuonResidualPullCalculators_page MuonResidualPullCalculators Package
 
 This package extends the residual calculation tools from
 the Tracking realm towards MuonSpectrometer-specific
@@ -13,7 +13,7 @@ in order to calculate the residual correctly.
 
 @author  Wolfgang Liebig <http://consult.cern.ch/xwho/people/54608>
 
-@section MuonResidualPullCalculatorsUsage Usage
+@section MuonResidualPullCalculators_MuonResidualPullCalculatorsUsage Usage
 
 To have hit residuals and pull calculated for any kind
 of hits on (Muon) tracks, please use from the Tracking
@@ -33,7 +33,7 @@ configured as
   ToolSvc += MuonResPullCalculator
 </pre>
 
-@section ExtrasMuonResidualPullCalculators Extra Pages
+@section MuonResidualPullCalculators_ExtrasMuonResidualPullCalculators Extra Pages
 
  - @ref UsedMuonResidualPullCalculators
  - @ref RequirementsMuonResidualPullCalculators
@@ -41,10 +41,8 @@ configured as
 
 /**
 @page UsedMuonResidualPullCalculators Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonResidualPullCalculators Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/doc/packagedoc.h
similarity index 83%
rename from MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/doc/packagedoc.h
index 04e35479bdb07ae9e1634bfef161bd94df641107..3d73d6b5cc42a2c1228449a7fe974587ba25f338 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  MuonTrackSummaryHelperTool
+@page MuonTrackSummaryHelperTool_page MuonTrackSummaryHelperTool
 @author Edward.Moyse@cern.ch
 
-@section MuonTrackSummaryHelperToolIntro Introduction
+@section MuonTrackSummaryHelperTool_MuonTrackSummaryHelperToolIntro Introduction
 
 This package provides an implementation of the Trk::ITrackSummaryHelperTool interface, which is used by the Trk::TrackSummaryTool
 to handle Muon specific measurements on a track
@@ -28,10 +28,8 @@ This tool also makes use of the Muon::MuonHolesOnTrackTool to count the missing
 
 /**
 @page used_MuonTrackSummaryHelperTool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonTrackSummaryHelperTool Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/doc/packagedoc.h
similarity index 67%
rename from MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/doc/packagedoc.h
index 75f999d352b8743adf1e7d2bb2d5514d913efc76..f273084c89c648f2ec167d697ab4c4cd70a8b186 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage MuonStationIntersectSvc package
+@page MuonStationIntersectSvc_page MuonStationIntersectSvc package
 	 @author Niels.Van.Eldik@cern.ch
 	
-@section MuonStationIntersectSvcIntro Introduction
+@section MuonStationIntersectSvc_MuonStationIntersectSvcIntro Introduction
 
 The MuonStationIntersectSvc is a service that can be used to calculate which MDT tubes were 
 intersected by a give trajectory.
 
 
  	
-@section ExtrasMuonStationIntersectSvc Extra Pages
+@section MuonStationIntersectSvc_ExtrasMuonStationIntersectSvc Extra Pages
 
  - @ref UsedMuonStationIntersectSvc
  - @ref RequirementsMuonStationIntersectSvc
@@ -22,11 +22,9 @@ intersected by a give trajectory.
 
 /**
 @page UsedMuonStationIntersectSvc Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonStationIntersectSvc Requirements
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/doc/packagedoc.h
similarity index 53%
rename from MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/doc/packagedoc.h
index 21fb08bc0a4ceb0eb3a204306adadf4b733fe649..416afc55f8e7d705cb0a7cf11a95b57384b41fa0 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage MooSegmentCombinationFinder Package
+@page MooSegmentCombinationFinder_page MooSegmentCombinationFinder Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Edward Moyse <edward.moyse@cern.ch>
 
-@section MooSegmentCombinationFinderIntro Introduction
+@section MooSegmentCombinationFinder_MooSegmentCombinationFinderIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section MooSegmentCombinationFinderReq Requirements
+@section MooSegmentCombinationFinder_MooSegmentCombinationFinderReq Requirements
 
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/doc/mainpage.h
deleted file mode 100644
index 8d563728d4a6b763c0b9f3fc0ef30b2a058ccb0a..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/doc/mainpage.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-@mainpage MuonCurvedSegmentCombiner Package
-
->> Please enter an overview of the created package here: What does it contain?
-
-@author Edward Moyse <Edward.Moyse@cern.ch>
-
-@section MuonCurvedSegmentCombinerIntro Introduction
-
->> Please enter a brief description of the package here.
-
-@section MuonCurvedSegmentCombinerReq Requirements
-
-@include requirements
-
-*/
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/doc/packagedoc.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..c8d669a6edd4ed5546675c1858ba145f8ee5a299
--- /dev/null
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/doc/packagedoc.h
@@ -0,0 +1,19 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+@page MuonCurvedSegmentCombiner_page MuonCurvedSegmentCombiner Package
+
+>> Please enter an overview of the created package here: What does it contain?
+
+@author Edward Moyse <Edward.Moyse@cern.ch>
+
+@section MuonCurvedSegmentCombiner_MuonCurvedSegmentCombinerIntro Introduction
+
+>> Please enter a brief description of the package here.
+
+@section MuonCurvedSegmentCombiner_MuonCurvedSegmentCombinerReq Requirements
+
+
+*/
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMakerToolInterfaces/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonSegmentCombinerToolInterfaces/doc/packagedoc.h
similarity index 85%
rename from MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMakerToolInterfaces/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonSegmentCombinerToolInterfaces/doc/packagedoc.h
index 2adc093c118b67cd88a2f77d12746aefc62ab5fc..634d0797ab3384ad331fcdda32414b8fe5d6deb8 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMakerToolInterfaces/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonSegmentCombinerToolInterfaces/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage MuonRecToolInterfaces Package
+@page MuonSegmentCombinerToolInterfaces_page MuonRecToolInterfaces Package
 
 @author Niels.van.Eldik@cern.ch 
 
-@section DescriptionMuonRecToolInterfaces General description
+@section MuonSegmentCombinerToolInterfaces_DescriptionMuonRecToolInterfaces General description
 
 The MuonRecToolInterfaces is a packages providing pure virtual interfaces needed in the muon reconstruction.
 The following interface are available:
@@ -23,7 +23,7 @@ The following interface are available:
 - Muon::IMuonSegmentMomentumEstimator, interface for tools estimating the mometum of a muon from a list of Muon::MuonSegment objects
 - Muon::IPRDHitsInConeTools, interface for tools to find hits in the region of a muon track
 
-@section ExtrasMuonRecToolInterfaces Extra Pages
+@section MuonSegmentCombinerToolInterfaces_ExtrasMuonRecToolInterfaces Extra Pages
 
  - @ref UsedMuonRecToolInterfaces
  - @ref RequirementsMuonRecToolInterfaces
@@ -32,10 +32,8 @@ The following interface are available:
 
 /**
 @page UsedMuonRecToolInterfaces Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonRecToolInterfaces Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 77%
rename from MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/doc/packagedoc.h
index 7d40872ff63bcae10ca5c19618113b289c8ed021..b5fe355dc0466364b8843abe434294fa4734750d
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-@mainpage CscSegmentMakers package
+@page CscSegmentMakers_page CscSegmentMakers package
 
 @author dladams@bnl.gov
 
-@section IntroductionCscSegmentMakers Introduction
+@section CscSegmentMakers_IntroductionCscSegmentMakers Introduction
 
 This packge provides algorithms for constructing CSC (cathode strip chamber)
 segments. There are two algorithms: Csc2DSegmentMaker constructs 2D segments
 (1D position and 1D direction) from clusters and Csc4dSegmentMaker constructs
 4D segments (2D position and 2D direction) from 2D segments.
 
-@section ConfigurationCscSegmentMakers Configuration
+@section CscSegmentMakers_ConfigurationCscSegmentMakers Configuration
 
 The algorithms are configured in python. Use the following to access the default
 instances:
@@ -23,7 +23,7 @@ from CscSegmentMakers.Csc2dSegmentMaker import theCsc2dSegmentMaker
 from CscSegmentMakers.Csc4dSegmentMaker import theCsc4dSegmentMaker
 </pre>
 
-@section AdditionalCscSegmentMakers Additional information
+@section CscSegmentMakers_AdditionalCscSegmentMakers Additional information
 
  - @ref UsedCscSegmentMakers
  - @ref RequirementsCscSegmentMakers
@@ -32,10 +32,8 @@ from CscSegmentMakers.Csc4dSegmentMaker import theCsc4dSegmentMaker
 
 /**
 @page UsedCscSegmentMakers Used packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsCscSegmentMakers Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/doc/packagedoc.h
similarity index 89%
rename from MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/doc/packagedoc.h
index 9b62f9ebc45c6910849c56f3ce256b9b5dbf3b31..a530f24fc6c64bfbe1c700afe3043c06ef7ada9c 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage DCMathSegmentMaker Package
+@page DCMathSegmentMaker_page DCMathSegmentMaker Package
 
 @author Niels.van.Eldik@cern.ch 
 
-@section DescriptionDCMathSegmentMaker General description
+@section DCMathSegmentMaker_DescriptionDCMathSegmentMaker General description
 
 TODO: This page needs an update - DCMath now supports calling arbitrary segment finders
 
@@ -31,7 +31,7 @@ The ATLAS muon spectrometer, calibration and pattern recognition,
 PhD Thesis, Niels van Eldik
     
 
-@section UsageDCMathSegmentMaker Usage of the DCMathSegmentMaker
+@section DCMathSegmentMaker_UsageDCMathSegmentMaker Usage of the DCMathSegmentMaker
 
 The DCMathSegmentMaker inherits from the IMuonSegmentMaker interface. 
 Clients should not directly use the DCMathSegmentMaker but rather use the package via the interface.
@@ -79,7 +79,7 @@ m_mdtSegmentMaker->find( );
 
 
 
-@section ExtrasDCMathSegmentMaker Extra Pages
+@section DCMathSegmentMaker_ExtrasDCMathSegmentMaker Extra Pages
 
  - @ref UsedDCMathSegmentMaker
  - @ref RequirementsDCMathSegmentMaker
@@ -87,10 +87,8 @@ m_mdtSegmentMaker->find( );
 
 /**
 @page UsedDCMathSegmentMaker Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsDCMathSegmentMaker Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 100%
rename from MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/doc/packagedoc.h
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/doc/mainpage.h
deleted file mode 100644
index d2d410485156bde05c4b8ad107434c122bd67933..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/doc/mainpage.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-@mainpage MuonPatternSegmentMaker Package
-
->> Please enter an overview of the created package here: What does it contain?
-
-@author Edward Moyse <Edward.Moyse@cern.ch>
-
-@section MuonPatternSegmentMakerIntro Introduction
-
->> Please enter a brief description of the package here.
-
-@section MuonPatternSegmentMakerReq Requirements
-
-@include requirements
-
-*/
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/doc/packagedoc.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..d2ccfafe12d3e2ac0e15acb2d62f81c00db51496
--- /dev/null
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/doc/packagedoc.h
@@ -0,0 +1,19 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+@page MuonPatternSegmentMaker_page MuonPatternSegmentMaker Package
+
+>> Please enter an overview of the created package here: What does it contain?
+
+@author Edward Moyse <Edward.Moyse@cern.ch>
+
+@section MuonPatternSegmentMaker_MuonPatternSegmentMakerIntro Introduction
+
+>> Please enter a brief description of the package here.
+
+@section MuonPatternSegmentMaker_MuonPatternSegmentMakerReq Requirements
+
+
+*/
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/doc/packagedoc.h
similarity index 79%
rename from MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/doc/packagedoc.h
index 11f8c96350928b6c489ad26002ecafa29169f5bc..be4b3b7f5cc9c507b3f9380d0eec9b22cbd7090f 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage MuonSegmentCleaner Package
+@page MuonSegmentCleaner_page MuonSegmentCleaner Package
 @author Peter Kluit <s01@nikhef.nl>
 @author Jochem Snuverink <jsnuverink@nikhef.nl>
 
-@section MuonSegmentCleanerIntro Introduction
+@section MuonSegmentCleaner_MuonSegmentCleanerIntro Introduction
 
 This package contains tools that clean segments, e.g. outliers, delta electrons, trigger ambiguities 
 
-@section MuonSegmentCleanerOverview Class Overview
+@section MuonSegmentCleaner_MuonSegmentCleanerOverview Class Overview
   The MuonSegmentCleaner package contains the following classes:
 
   - MuonPhiHitSelector: cleans Phi segments from outliers, build rio's, competing rio's (ambiguous hits) and perform clusterization
@@ -25,10 +25,8 @@ This package contains tools that clean segments, e.g. outliers, delta electrons,
 
 /**
 @page used_MuonSegmentCleaner Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonSegmentCleaner Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonSegmentCombinerToolInterfaces/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMakerToolInterfaces/doc/packagedoc.h
similarity index 86%
rename from MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonSegmentCombinerToolInterfaces/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMakerToolInterfaces/doc/packagedoc.h
index 2adc093c118b67cd88a2f77d12746aefc62ab5fc..ba64b2d94c72004edff51fb35a02108561d44df3 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonSegmentCombinerToolInterfaces/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMakerToolInterfaces/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage MuonRecToolInterfaces Package
+@page MuonSegmentMakerToolInterfaces_page MuonRecToolInterfaces Package
 
 @author Niels.van.Eldik@cern.ch 
 
-@section DescriptionMuonRecToolInterfaces General description
+@section MuonSegmentMakerToolInterfaces_DescriptionMuonRecToolInterfaces General description
 
 The MuonRecToolInterfaces is a packages providing pure virtual interfaces needed in the muon reconstruction.
 The following interface are available:
@@ -23,7 +23,7 @@ The following interface are available:
 - Muon::IMuonSegmentMomentumEstimator, interface for tools estimating the mometum of a muon from a list of Muon::MuonSegment objects
 - Muon::IPRDHitsInConeTools, interface for tools to find hits in the region of a muon track
 
-@section ExtrasMuonRecToolInterfaces Extra Pages
+@section MuonSegmentMakerToolInterfaces_ExtrasMuonRecToolInterfaces Extra Pages
 
  - @ref UsedMuonRecToolInterfaces
  - @ref RequirementsMuonRecToolInterfaces
@@ -32,10 +32,8 @@ The following interface are available:
 
 /**
 @page UsedMuonRecToolInterfaces Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonRecToolInterfaces Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/doc/packagedoc.h
similarity index 80%
rename from MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/doc/packagedoc.h
index b3a46f711f720363ecda3c01530b792e89120ca0..4fa8ade499374615973c753bcb3c6304e6e9a2a7 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage MuonSegmentMomentum Package
+@page MuonSegmentMomentum_page MuonSegmentMomentum Package
 @author Peter Kluit <s01@nikhef.nl>
 @author Jochem Snuverink <jsnuverink@nikhef.nl>
 
-@section MuonSegmentMomentumIntro Introduction
+@section MuonSegmentMomentum_MuonSegmentMomentumIntro Introduction
 
 This tool fits a momentum to a vector of segments or 2 segments using a curved track model, similar to the one that is used in the pattern recognition tool MuonHoughPatternTool. Tool can also be used for cosmics, a straight line model with ni interaction point constraint is used in that case
 
-@section MuonSegmentMomentumOverview Class Overview
+@section MuonSegmentMomentum_MuonSegmentMomentumOverview Class Overview
   The MuonSegmentMomentum package contains the following classes:
 
   - MuonSegmentMomentum: calculates a momentum estimate for segments, 2 methods, one for 2 segments, one for a vector 
@@ -24,10 +24,8 @@ This tool fits a momentum to a vector of segments or 2 segments using a curved t
 
 /**
 @page used_MuonSegmentMomentum Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonSegmentMomentum Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/doc/mainpage.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/doc/packagedoc.h
similarity index 72%
rename from MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/doc/mainpage.h
rename to MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/doc/packagedoc.h
index 0a01f52ba57c2dda03693f13472253bfda927573..8b690893972148f1fca58519996d7135adc468cc 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/doc/mainpage.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/doc/packagedoc.h
@@ -4,15 +4,15 @@
 
 /**
 
-@mainpage MuonSegmentTrackMaker package
+@page MuonSegmentTrackMaker_page MuonSegmentTrackMaker package
 	 @author Niels.Van.Eldik@cern.ch
 	
-@section MuonSegmentTrackMakerIntro Introduction
+@section MuonSegmentTrackMaker_MuonSegmentTrackMakerIntro Introduction
 
 The MuonSegmentTrackMaker is a package containing an algorithm to find tracks in the muon spectrometer
 starting from MuonSegmentCombinations. It uses a combination of extrapolation + fitting to build the tracks
  	
-@section ExtrasMuonSegmentTrackMaker Extra Pages
+@section MuonSegmentTrackMaker_ExtrasMuonSegmentTrackMaker Extra Pages
 
  - @ref UsedMuonSegmentTrackMaker
  - @ref RequirementsMuonSegmentTrackMaker
@@ -20,11 +20,9 @@ starting from MuonSegmentCombinations. It uses a combination of extrapolation +
 
 /**
 @page UsedMuonSegmentTrackMaker Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonSegmentTrackMaker Requirements
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonTruthAlgs/doc/mainpage.h b/MuonSpectrometer/MuonTruthAlgs/doc/packagedoc.h
similarity index 81%
rename from MuonSpectrometer/MuonTruthAlgs/doc/mainpage.h
rename to MuonSpectrometer/MuonTruthAlgs/doc/packagedoc.h
index ce720374e806abe9679ce6ece92283376eca357a..43d306c229574e483d060555e367a3ff90d21516 100644
--- a/MuonSpectrometer/MuonTruthAlgs/doc/mainpage.h
+++ b/MuonSpectrometer/MuonTruthAlgs/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage  MuonTruthAlgs
+@page MuonTruthAlgs_page MuonTruthAlgs
 @author Edward.Moyse@cern.ch
 
-@section MuonTruthAlgsIntro Introduction
+@section MuonTruthAlgs_MuonTruthAlgsIntro Introduction
 
 This package provides algorithms which produces the 'truth' information for Muon EDM classes. For example, MuonDetailedTrackTruthMaker implements the common 
 tracking interface Trk::IDetailedTrackTruthBuilder.
 
-@section MuonTruthAlgsOverview Class Overview
+@section MuonTruthAlgs_MuonTruthAlgsOverview Class Overview
   The MuonTruthAlgs package contains of following classes:
 
    - MuonDetailedTrackTruthMaker : produces truth for tracks
@@ -27,10 +27,8 @@ tracking interface Trk::IDetailedTrackTruthBuilder.
 
 /**
 @page used_MuonTruthAlgs Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MuonTruthAlgs Requirements
-@include requirements
 */
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonValidation/MuonCscValidation/CscClusterPerformance/doc/mainpage.h b/MuonSpectrometer/MuonValidation/MuonCscValidation/CscClusterPerformance/doc/packagedoc.h
similarity index 82%
rename from MuonSpectrometer/MuonValidation/MuonCscValidation/CscClusterPerformance/doc/mainpage.h
rename to MuonSpectrometer/MuonValidation/MuonCscValidation/CscClusterPerformance/doc/packagedoc.h
index e1ff90d723a504fccb6b34c8a638d9b0b9202cce..4c5c32e7f73e1cc1b778a1a3386e41e2b078288b 100644
--- a/MuonSpectrometer/MuonValidation/MuonCscValidation/CscClusterPerformance/doc/mainpage.h
+++ b/MuonSpectrometer/MuonValidation/MuonCscValidation/CscClusterPerformance/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage CscClusterPerformance package
+@page CscClusterPerformance_page CscClusterPerformance package
 
 @author dladams@bnl.gov
 
-@section IntroductionCscClusterPerformance Introduction
+@section CscClusterPerformance_IntroductionCscClusterPerformance Introduction
 
 This package is used to check the performance of CSC cluster building
 by comparing the contents of the cluster validation tree (see package
@@ -21,7 +21,7 @@ trees.
  - cscperf.C - macros for analyzing the cluster performance tree
  - report.C - macro to create an HTML report from a tree
 
-@section AdditionalCscClusterPerformance Additional information
+@section CscClusterPerformance_AdditionalCscClusterPerformance Additional information
 
  - @ref UsedCscClusterPerformance
  - @ref RequirementsCscClusterPerformance
@@ -30,10 +30,8 @@ trees.
 
 /**
 @page UsedCscClusterPerformance Used packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsCscClusterPerformance Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonValidation/MuonCscValidation/CscSegmentPerformance/doc/mainpage.h b/MuonSpectrometer/MuonValidation/MuonCscValidation/CscSegmentPerformance/doc/packagedoc.h
similarity index 85%
rename from MuonSpectrometer/MuonValidation/MuonCscValidation/CscSegmentPerformance/doc/mainpage.h
rename to MuonSpectrometer/MuonValidation/MuonCscValidation/CscSegmentPerformance/doc/packagedoc.h
index 596aa19af9f0aee25f12c5d98d8391c84f5ac831..6f2a872dca1a3a21608ade821eaeace8abe18c31 100644
--- a/MuonSpectrometer/MuonValidation/MuonCscValidation/CscSegmentPerformance/doc/mainpage.h
+++ b/MuonSpectrometer/MuonValidation/MuonCscValidation/CscSegmentPerformance/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage CscSegmentPerformance package
+@page CscSegmentPerformance_page CscSegmentPerformance package
 
 @author dladams@bnl.gov
 
-@section IntroductionCscSegmentPerformance Introduction
+@section CscSegmentPerformance_IntroductionCscSegmentPerformance Introduction
 
 This package is used to check the performance of CSC segment building
 by comparing the contents of the segment validation trees (see package
@@ -25,7 +25,7 @@ trees.
  - report2d.C - macro to create and html report from a 2D performance tree
  - report4d.C - macro to create and html report from a 4D performance tree
 
-@section AdditionalCscSegmentPerformance Additional information
+@section CscSegmentPerformance_AdditionalCscSegmentPerformance Additional information
 
  - @ref UsedCscSegmentPerformance
  - @ref RequirementsCscSegmentPerformance
@@ -34,10 +34,8 @@ trees.
 
 /**
 @page UsedCscSegmentPerformance Used packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsCscSegmentPerformance Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/doc/mainpage.h b/MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 71%
rename from MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/doc/mainpage.h
rename to MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/doc/packagedoc.h
index c7b9b82d842fab60b2e134846ff2750ee992b4de..5885a72a05d9410017496b699930263a46e604de
--- a/MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/doc/mainpage.h
+++ b/MuonSpectrometer/MuonValidation/MuonCscValidation/CscValidationUtil/doc/packagedoc.h
@@ -3,27 +3,27 @@
 */
 
 /**
-@mainpage CscValidationUtil package
+@page CscValidationUtil_page CscValidationUtil package
 
 @author dladams@bnl.gov
 
-@section IntroductionCscValidationUtil Introduction
+@section CscValidationUtil_IntroductionCscValidationUtil Introduction
 
 This package provides utilities and root macros for use by CSC (cathode
 strip chamber) validation packages and others.
 
-@section UtilitiesCscValidationUtil Utilities
+@section CscValidationUtil_UtilitiesCscValidationUtil Utilities
 
 CscValidationHelper provides methods for  working with CSC entities.
 
-@section RootMacrosCscValidationUtil Root macros
+@section CscValidationUtil_RootMacrosCscValidationUtil Root macros
 
  - CscTupleSequencer - Class to order events in a tree.
  - CscChamberPlot - Class to draw CSC strips, clusters and segments.
 
-@section CommandsCscValidationUtil Commands
+@section CscValidationUtil_CommandsCscValidationUtil Commands
 
-@section AdditionalCscValidationUtil Additional information
+@section CscValidationUtil_AdditionalCscValidationUtil Additional information
 
 Many of the utilities that once resided here may now be found in
 PhysicsAnalysis/MuonID/MuonRootUtils.
@@ -38,10 +38,8 @@ The atlas release macro and python accessor are in PhysicsAnalysis/MuonAtlasRele
 
 /**
 @page UsedCscValidationUtil Used packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsCscValidationUtil Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/doc/mainpage.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/doc/mainpage.h
rename to MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/doc/packagedoc.h
index e3596fda0eb1e94fa5ec26a8772144cc8cc9b525..ff0960cb1ad3f50587a3024d3dd3c4a279ce5ee3
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/doc/mainpage.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage The MooPerformance package
+@page MooPerformance_page The MooPerformance package
 
-@section introMooPerformance Introduction
+@section MooPerformance_introMooPerformance Introduction
 
 MooPerformance is a sub-package of the Moore package.
 It is intended to contain the files needed to
@@ -15,7 +15,7 @@ Moore and Muid. The package is interfaced with the
 Run Time Tester (RTT) system to provide performance
 validation of the nightly and stable releases.
 
-@section MooPerformanceSoft Software
+@section MooPerformance_MooPerformanceSoft Software
 
 The MooPerformance package is structured as follows:
 
@@ -27,7 +27,7 @@ validation studies are included (MooPerformance.C and MooHists.C).
 - test: Directory containing configuration files needed for automatic validation
 in the nightlies and stable releases (e.g. RTT).
 
-@section MooPerformanceMeasures Performance Measures
+@section MooPerformance_MooPerformanceMeasures Performance Measures
 
 Different performance measures are implemented:
 
@@ -53,7 +53,7 @@ Different performance measures are implemented:
 - OverlayPlots: comparison of performance measures for the four stages
   of reconstruction.
 
-@section MooPerformanceRunning How to Run
+@section MooPerformance_MooPerformanceRunning How to Run
 
 To produce the above series of plots, one can run ROOT at the
 interactive prompt:
@@ -71,7 +71,7 @@ interactive prompt:
 - A series of postscript files are produced containing the various plots
   described above.
 
-@section MooPerformanceSamples Samples for RTT
+@section MooPerformance_MooPerformanceSamples Samples for RTT
 
 A series of RTT jobs are defined in the configuration file
 MooPerformance_TestConfiguration.xml:
@@ -80,7 +80,7 @@ MooPerformance_TestConfiguration.xml:
 
 - Z->mumu events with (sf05) and without cavern background.
 
-@section MooPerformanceMatch Truth Matching in MooHists
+@section MooPerformance_MooPerformanceMatch Truth Matching in MooHists
 
 In the absence of hit-based matching between reco and truth
 information, the following approaches are implemented in MooHists:
@@ -114,7 +114,7 @@ At the moment, we are using matchAlg=1.
   step allows us to compare a reconstructed Combined muon to the
   generated one.
 
-@section ExtrasMooPerformance Extra Pages
+@section MooPerformance_ExtrasMooPerformance Extra Pages
 
   - @ref used_MooPerformance
   - @ref requirements_MooPerformance
@@ -123,10 +123,8 @@ At the moment, we are using matchAlg=1.
 
 /**
 @page used_MooPerformance Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MooPerformance Requirements
-@include requirements
 */
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/doc/mainpage.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/doc/packagedoc.h
similarity index 73%
rename from MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/doc/mainpage.h
rename to MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/doc/packagedoc.h
index 6b9ecc900ec828e503f9b199f73a9cc663cb35d8..6b3f9e3935c50d5aa594c4973ad7fed49b97e886 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/doc/mainpage.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage MuonTrackPerformance package
+@page MuonTrackPerformance_page MuonTrackPerformance package
 	 @author Niels.Van.Eldik@cern.ch
 	
-@section MuonTrackPerformanceIntro Introduction
+@section MuonTrackPerformance_MuonTrackPerformanceIntro Introduction
 
 The MuonTrackPerformance is a package to monitor the performance of the muon track finding.
 It can be used to produce track and segment based histograms. 
 When running on simulated data it can be configured to perform truth matching as well.
  	
-@section ExtrasMuonTrackPerformance Extra Pages
+@section MuonTrackPerformance_ExtrasMuonTrackPerformance Extra Pages
 
  - @ref UsedMuonTrackPerformance
  - @ref RequirementsMuonTrackPerformance
@@ -21,11 +21,9 @@ When running on simulated data it can be configured to perform truth matching as
 
 /**
 @page UsedMuonTrackPerformance Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonTrackPerformance Requirements
-@include requirements
 
 */
diff --git a/MuonSpectrometer/MuonValidation/MuonTrackValidation/doc/mainpage.h b/MuonSpectrometer/MuonValidation/MuonTrackValidation/doc/packagedoc.h
similarity index 59%
rename from MuonSpectrometer/MuonValidation/MuonTrackValidation/doc/mainpage.h
rename to MuonSpectrometer/MuonValidation/MuonTrackValidation/doc/packagedoc.h
index f22d3ab4592c45111a0a97246556ae00c6fec8a2..5465faf5a8519448402303c7a25c0c295ac66c9e 100644
--- a/MuonSpectrometer/MuonValidation/MuonTrackValidation/doc/mainpage.h
+++ b/MuonSpectrometer/MuonValidation/MuonTrackValidation/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage MuonTrackValidation Package
+@page MuonTrackValidation_page MuonTrackValidation Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Wolfgang Liebig <wolfgang.liebig -at- cern.ch>
 
-@section MuonTrackValidationIntro Introduction
+@section MuonTrackValidation_MuonTrackValidationIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section MuonTrackValidationReq Requirements
+@section MuonTrackValidation_MuonTrackValidationReq Requirements
 
-@include requirements
 
 */
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 82%
rename from PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/doc/packagedoc.h
index 40632919e363a5dc85b9174c00a741451c2f1153..fbda2c3e51be3251a27216573d19a2824f389983
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-@mainpage AnalysisAssociation Package
+@page AnalysisAssociation_page AnalysisAssociation Package
 
 This package provides classes to store associations between AOD classes as well as filters to build these associations.
 
 @author Sebastien Binet
 
 
-@section AnalysisAssociationIntro Introduction
+@section AnalysisAssociation_AnalysisAssociationIntro Introduction
 
 The Association data classes are the objects which can build relations between (multiple) AOD objects. To ease the building of such links filters are provided. Up to now only four momentum-like cut variables can be constructed to filter on. Associations between @c IParticles and between @c INavigable4Momentum objects can be made persistent (<i>ie:</i> one can store them in a POOL file).
 
-@section AnalysisAssociationOverview Class Overview
+@section AnalysisAssociation_AnalysisAssociationOverview Class Overview
 
   The AnalysisAssociation package contains the following classes:
  
@@ -22,14 +22,14 @@ The Association data classes are the objects which can build relations between (
   - AssocFilter : templated class which implements 4-momentum cuts for association filters.
   - IParticleAssocFilter: specialised class to work on IParticle data objects. It inherits from AssocFilter and set the templated classes T to IParticle.
 
-@section AnalysisAssociationSeeAlso See also
+@section AnalysisAssociation_AnalysisAssociationSeeAlso See also
 
 You may also be interested in:
 
    - AnalysisUtils : IFilterCuts, IFilter<T>, MomentumFilter<T>, IParticleFilter and McVtxFilter
 
 
-@section AnalysisAssociationReq Requirements
+@section AnalysisAssociation_AnalysisAssociationReq Requirements
 
 @ref used_AnalysisUtils
 
@@ -39,10 +39,8 @@ You may also be interested in:
 
 /**
 @page used_AnalysisAssociation Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AnalysisAssociation Requirements
-@include requirements
 */
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/doc/packagedoc.h
similarity index 98%
rename from PhysicsAnalysis/AnalysisCommon/AnalysisExamples/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/AnalysisExamples/doc/packagedoc.h
index 3b1222a1ed52df48eb050bf4cfe7839c39c456c1..896b0249234a438b68bf1fe656550d7cda5619df 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage Analysis Examples
+@page AnalysisExamples_page Analysis Examples
 
  - In this package, we have few complete analysis codes to show the user how
 to do analyses on ESD and AOD.
@@ -212,11 +212,9 @@ method which does the copy and the filtering in one go.
  - For questions or comments: Ketevi A. Assamagan
    ketevi@bnl.gov
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section AnalysisExamples_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section AnalysisExamples_requirements Requirements
 
 
 */
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/doc/packagedoc.h
similarity index 81%
rename from PhysicsAnalysis/AnalysisCommon/AnalysisTest/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/AnalysisTest/doc/packagedoc.h
index 84b698d6091e5d53f044a60e172317f241fdba0b..23ef6a61bf5f62896f0a300ec7a8e49cfb7de75f 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-\mainpage AnalysisTest
+@page AnalysisTest_page AnalysisTest
 
-\section introductionAnalysisTest Introduction
+@section AnalysisTest_introductionAnalysisTest Introduction
 This package contains test algs for AODs
 
-\section packagecontentAnalysisTest Package Contents
+@section AnalysisTest_packagecontentAnalysisTest Package Contents
 AnalysisTest contains the following algs/files:
 
 - ReadXYZ : a simple alg to retrieve XYZ-object from TDS
@@ -31,10 +31,8 @@ AnalysisTest contains the following algs/files:
 
 /**
 @page used_AnalysisTest Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AnalysisTest Requirements
-@include requirements
 */
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/doc/mainpage.h
deleted file mode 100644
index 71149acfc2d9809bad5f8df05a9eb3ac06ef3509..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/doc/mainpage.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-\mainpage AnalysisTools
-
-\section introductionAnalysisTools Introduction
-This package contains general Gaudi-Tools
-
-\section packagecontentAnalysisTools Package Contents
-AnalysisTools contains the following classes:
-
-- AnalysisTools : provides I/F to analysis tools
-
-\section used_packagesAnalysisTools Used packages
-@htmlinclude used_packages.html
-
-\section requirementsAnalysisTools Requirements
-@include requirements
-
-*/
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/doc/packagedoc.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..53ddd52c0d88bb3f04c771753cd3f48e3edbb298
--- /dev/null
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/doc/packagedoc.h
@@ -0,0 +1,20 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+@page AnalysisTools_page AnalysisTools
+
+@section AnalysisTools_introductionAnalysisTools Introduction
+This package contains general Gaudi-Tools
+
+@section AnalysisTools_packagecontentAnalysisTools Package Contents
+AnalysisTools contains the following classes:
+
+- AnalysisTools : provides I/F to analysis tools
+
+@section AnalysisTools_used_packagesAnalysisTools Used packages
+
+@section AnalysisTools_requirementsAnalysisTools Requirements
+
+*/
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/doc/packagedoc.h
similarity index 95%
rename from PhysicsAnalysis/AnalysisCommon/AnalysisUtils/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/AnalysisUtils/doc/packagedoc.h
index 3b1df45b16993f05f7e1f7b6450649f1ac300f7e..af68a8eeef9a2523de9324bd3e222c582696d729 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
-@mainpage AnalysisUtils Package
+@page AnalysisUtils_page AnalysisUtils Package
 
 The package which provides some utils for the AOD objects.
 
 @authors Sebastien Binet, Tadashi Maeno
 
 
-@section AnalysisUtilsIntro Introduction
+@section AnalysisUtils_AnalysisUtilsIntro Introduction
 
-@section AnalysisUtilsOverview Class Overview
+@section AnalysisUtils_AnalysisUtilsOverview Class Overview
 
   The AnalysisUtils package contains of following classes:
  
@@ -83,7 +83,7 @@ It is also used by the custom POOL converter for TruthParticleContainer to recre
 ITruthParticleCnvTool also provides some helper functions related with mother/daughter relationships in the TruthParticle context.
 
 
-@section AnalysisUtilsSeeAlso See also
+@section AnalysisUtils_AnalysisUtilsSeeAlso See also
 
 You may also be interested in:
 
@@ -101,10 +101,8 @@ You may also be interested in:
 
 /**
 @page used_AnalysisUtils Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_AnalysisUtils Requirements
-@include requirements
 */
diff --git a/PhysicsAnalysis/AnalysisCommon/CompositeParticleEvent/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/CompositeParticleEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from PhysicsAnalysis/AnalysisCommon/CompositeParticleEvent/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/CompositeParticleEvent/doc/packagedoc.h
index 1fca0d2223f08b3cc37fa237c4164ada760a53b3..0ae9685a5539ff53dd9be27d6fccf6d022bb8ed2
--- a/PhysicsAnalysis/AnalysisCommon/CompositeParticleEvent/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/CompositeParticleEvent/doc/packagedoc.h
@@ -3,20 +3,20 @@
 */
 
 /**
-@mainpage CompositeParticleEvent Package
+@page CompositeParticleEvent_page CompositeParticleEvent Package
 
 The package which defines composite AOD particle classes.
 
 @authors Ketevi Assamagan, Sebastien Binet, Kyle Cranmer, Hong Ma
 
 
-@section CompositeParticleEventIntro Introduction
+@section CompositeParticleEvent_CompositeParticleEventIntro Introduction
 
 AOD particle classes can be associated into another class : CompositeParticle.
 This class provides an easy way to model particles which can be reconstructed from a set of other particles (<i>eg</i> a top, a \f$W^\pm\f$ or any other decaying particle).
 Note that CompositeParticle implements the IParticle interface, so you have all the functionalities you are already familiar with if you know the ParticleEvent package.
 
-@section CompositeParticleEventOverview Class Overview
+@section CompositeParticleEvent_CompositeParticleEventOverview Class Overview
 
   The CompositeParticleEvent package contains of following classes:
  
@@ -30,7 +30,7 @@ Note that CompositeParticle implements the IParticle interface, so you have all
 
   - WBoson: a specialisation of the Boson class (the PDG Id is defaulted to the good one)
 
-@section CompositeParticleEventSeeAlso See also
+@section CompositeParticleEvent_CompositeParticleEventSeeAlso See also
 
 You may also be interested in:
 
@@ -44,9 +44,8 @@ You may also be interested in:
 
    - AnalysisExamples : a set of example Algorithms. See the ttbar algorithm which exercises the composition of jets into a W as well as BJet and W into a top.
 
-@section CompositeParticleEventReq Requirements
+@section CompositeParticleEvent_CompositeParticleEventReq Requirements
 
-@include requirements
 
 */
 
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEvent/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/ParticleEvent/doc/packagedoc.h
similarity index 86%
rename from PhysicsAnalysis/AnalysisCommon/ParticleEvent/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/ParticleEvent/doc/packagedoc.h
index 20ab7d5c1949438aaf8c09b857fa1bc5abebe8f0..982d3245eacd1149d74f546adee290f1a89e54ab 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEvent/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEvent/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage ParticleEvent Package
+@page ParticleEvent_page ParticleEvent Package
 
 The package which defines the AOD particle classes.
 
 @authors Ketevi Assamagan, Sebastien Binet, Kyle Cranmer, Tadashi Maeno
 
 
-@section ParticleEventIntro Introduction
+@section ParticleEvent_ParticleEventIntro Introduction
 
 The AOD particle classes are the basic objects to be used in physics
 analysis, and are the bulk of the AOD.  Each particle class has some
@@ -38,7 +38,7 @@ full simulation use the IParticle::dataType() method.
 
 
 
-@section ParticleEventOverview Class Overview
+@section ParticleEvent_ParticleEventOverview Class Overview
 
   The ParticleEvent package contains of following classes:
  
@@ -48,7 +48,7 @@ full simulation use the IParticle::dataType() method.
     by hand or by one of the SpecialUtils.
 
 
-@section ParticleEventBuilders Particle Builders
+@section ParticleEvent_ParticleEventBuilders Particle Builders
 
   Each of the particles is built by an algorithm in the
   PhysicsAnalysis package.  If you want to know what pre-selection is
@@ -58,7 +58,7 @@ full simulation use the IParticle::dataType() method.
   - Neutrino: not built from ESD, but created during analysis either
     by hand or by one of the SpecialUtils.
 
-@section ParticleEventStoreGateKeys StoreGate Keys
+@section ParticleEvent_ParticleEventStoreGateKeys StoreGate Keys
 
   The storegate keys for the particle containers is defined in the
   jobOptions files of the builder algorithms above.  It is tempting to
@@ -67,7 +67,7 @@ full simulation use the IParticle::dataType() method.
   https://uimon.cern.ch/twiki/bin/view/Atlas/StoregateKeysForAOD 
 
 
-@section ParticleEventSeeAlso See also
+@section ParticleEvent_ParticleEventSeeAlso See also
 
 You may also be interested in:
 
@@ -89,8 +89,7 @@ You may also be interested in:
 
    - TruthParticle in TruthParticleID/McParticleEvent
 
-@section ParticleEventReq Requirements
+@section ParticleEvent_ParticleEventReq Requirements
 
-@include requirements
 
 */
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 69%
rename from PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/doc/packagedoc.h
index 312c0059da704fe48e77f406e12ed0655293054c..325c26d32ea9f64d4b1fa28c411790d7869976be
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventAthenaPool/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-\mainpage ParticleEventAthenaPool
+@page ParticleEventAthenaPool_page ParticleEventAthenaPool
 
-\section introductionParticleEventAthenaPool Introduction
+@section ParticleEventAthenaPool_introductionParticleEventAthenaPool Introduction
 This package contains POOL converters for Particles and jobOs for AOD making.
 
-\section packagecontentParticleEventAthenaPool Package Contents
+@section ParticleEventAthenaPool_packagecontentParticleEventAthenaPool Package Contents
 ParticleEventAthenaPool contains the following topOs and jobOs:
 
 - RecExToAOD_topOptions.py : topO for RecEx -> AOD
@@ -27,10 +27,8 @@ ParticleEventAthenaPool contains the following topOs and jobOs:
 
 - AODFlags.py : flags for AOD making
 
-\section used_packagesParticleEventAthenaPool Used packages
-@htmlinclude used_packages.html
+@section ParticleEventAthenaPool_used_packagesParticleEventAthenaPool Used packages
 
-\section requirementsParticleEventAthenaPool Requirements
-@include requirements
+@section ParticleEventAthenaPool_requirementsParticleEventAthenaPool Requirements
 
 */
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/doc/packagedoc.h
similarity index 65%
rename from PhysicsAnalysis/AnalysisCommon/ParticleJetTools/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/ParticleJetTools/doc/packagedoc.h
index 42ae055f4f8d544ffd820dae5843ead993ec318d..5c86df737de2f6caaea50fba27aa58dcbaa1475c 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-\mainpage The ParticleJetTools package
+@page ParticleJetTools_page The ParticleJetTools package
 
 This package contains tools which work on ParticleJet.
 
-\section ParticleJetToolsIntroduction Introduction
+@section ParticleJetTools_ParticleJetToolsIntroduction Introduction
 
 For the moment there are following tools (in development):
 <table>
@@ -29,15 +29,13 @@ For the moment there are following tools (in development):
 
 </table>
 
-\section ParticleJetToolsComments Comments
+@section ParticleJetTools_ParticleJetToolsComments Comments
 
 Please let me know of any errors, or if anything is unclear.
 Andreas.Wildauer@cern.ch
 
-\section ParticleJetTools_used_packages Used Packages
-@htmlinclude used_packages.html
+@section ParticleJetTools_ParticleJetTools_used_packages Used Packages
 
-\section requirements Requirements
-@include requirements
+@section ParticleJetTools_requirements Requirements
 */
 
diff --git a/PhysicsAnalysis/AnalysisCommon/SpecialUtils/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/SpecialUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from PhysicsAnalysis/AnalysisCommon/SpecialUtils/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/SpecialUtils/doc/packagedoc.h
index c4022ec80577b763b4945ab852644e0877bb8392..4a87e2146f4eb50596f24f4990e0cc55aaec5a26
--- a/PhysicsAnalysis/AnalysisCommon/SpecialUtils/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/SpecialUtils/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-\mainpage SpecialUtils
+@page SpecialUtils_page SpecialUtils
 
-\section introductionSpecialUtils Introduction
+@section SpecialUtils_introductionSpecialUtils Introduction
 This package contains non-general tools, i.e., tools for Neutrino. General tools should be put in AnalysisTools/Utils.
 
-\section packagecontentSpecialUtils Package Contents
+@section SpecialUtils_packagecontentSpecialUtils Package Contents
 SpecialUtils contains the following classes:
 
 - NeutrinoUtils : tools for Neutrino. There 2 utilities here. One where the W mass constraint is used to find 
@@ -20,10 +20,8 @@ the collinear approximation to solve for the neutrinos in the decay X --> a + b
 carry (1-x_a) of that tau's momentum. Both of these 2 utilities return a container of Neutrino Objects. There is 
 a class for the neutrino, Netrino.h, in the package PhyscisAnalysis/AnalysisCommon/ParticleEvent. 
 
-\section used_packagesSpecialUtils Used packages
-@htmlinclude used_packages.html
+@section SpecialUtils_used_packagesSpecialUtils Used packages
 
-\section requirementsSpecialUtils Requirements
-@include requirements
+@section SpecialUtils_requirementsSpecialUtils Requirements
 
 */
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/doc/mainpage.h b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from PhysicsAnalysis/AnalysisCommon/UserAnalysis/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisCommon/UserAnalysis/doc/packagedoc.h
index c2a38a727bb51083816608a307b42224f65a0b06..bc22052a36b850b8e7e091bb7c49e69c82c63ede
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage The User Analysis Package
+@page UserAnalysis_page The User Analysis Package
 
  - This class is an analysis skeleton - The user can implement his analysis here
 
@@ -33,11 +33,9 @@ analysis examples, look in CVS: PhysicsAnalysis/AnalysisCommon/AnalysisExamples/
  - For questions or comments: Ketevi A. Assamagan
    ketevi@bnl.gov
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section UserAnalysis_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section UserAnalysis_requirements Requirements
 
 */
 
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/doc/mainpage.h b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/doc/packagedoc.h
index ac18eb2c4bc9969848391a16ac6d2dffd364c172..21ce75c88844c981b125bf65a1dc8b36466ad86c
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage
+@page AnalysisJiveXML_page 
 @author Nikos.Konstantinidis -at- cern.ch, Eric.Jansen -at- hef.ru.nl, Juergen.Thomas -at- cern.ch
-@section IntroCaloJiveXML Introduction
+@section AnalysisJiveXML_IntroCaloJiveXML Introduction
 
 This package contains the AlgToos that produce the XML fragments of AOD related datatypes for the XML files read by atlantis.
 The AlgTools, all inheriting from JiveXML::DataRetriever, are the following:
@@ -42,8 +42,6 @@ The AlgTools, all inheriting from JiveXML::DataRetriever, are the following:
       - StoreGateKey : ( default "TrackParticleCandidate" ) the StoreGate location of the Rec::TrackParticleContainer.
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/doc/mainpage.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/doc/packagedoc.h
similarity index 82%
rename from PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/doc/packagedoc.h
index 8b7d0b3795393cf501a5549064f33949ad0de163..a2fdfea4910d1ff0d260b95d315c564b225bc105 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/doc/packagedoc.h
@@ -3,25 +3,25 @@
 */
 
 /**
-@mainpage AnalysisTriggerAlgs Package
+@page AnalysisTriggerAlgs_page AnalysisTriggerAlgs Package
 
 @author Tadashi.Maeno <Tadashi.Maeno@cern.ch>
 @author Attila Kraznahorkay Jr. <Attila.Krasznahorkay@cern.ch>
 @author Alan Watson <Alan.Watson@cern.ch>
 @author Wolfgang Ehrenfeld <Wolfgang.Ehrenfeld@desy.de>
 
-@section AnalysisTriggerAlgsIntro Introduction
+@section AnalysisTriggerAlgs_AnalysisTriggerAlgsIntro Introduction
 
 This package contains some algorithms to create Trigger ESD/AOD objects.
 
-@section AnalysisTriggerAlgsOverview Class Overview
+@section AnalysisTriggerAlgs_AnalysisTriggerAlgsOverview Class Overview
   The AnalysisTriggerAlgs package contains of following classes:
 
   - RoIBResultToAOD: convert ROIB::RoIBResult into CTP_Decision and LVL1_ROI.
                      One important feature is the rebuilding of the trigger type.
 		     For the configuration see section \ref AnalysisTriggerAlgsJobOptions.
 
-@section AnalysisTriggerAlgsJobOptions Job Options
+@section AnalysisTriggerAlgs_AnalysisTriggerAlgsJobOptions Job Options
   The algorithms of the AnalysisTriggerAlgs package can be configured using configurables.
   For an example see AnalysisTrigger_jobOptions.py:
   @include AnalysisTrigger_jobOptions.py
@@ -34,7 +34,7 @@ This package contains some algorithms to create Trigger ESD/AOD objects.
   The list of properties for each algorithm can be found here:
   - @link RoIBResultToAOD::RoIBResultToAOD @endlink
 
-@section AnalysisTriggerAlgs Extra Pages
+@section AnalysisTriggerAlgs_AnalysisTriggerAlgs Extra Pages
 
 - @ref used_AnalysisTriggerAlgs
 - @ref requirements_AnalysisTriggerAlgs
@@ -42,10 +42,8 @@ This package contains some algorithms to create Trigger ESD/AOD objects.
 
 /**
    @page used_AnalysisTriggerAlgs Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_AnalysisTriggerAlgs Requirements
-   @include requirements
 */
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/doc/mainpage.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/doc/packagedoc.h
index ba3a84c2955a6d5effda79eacb896cccdcd858b3..621dccdeb4e02e030da1dbb1c25c59331c0380bf
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-   @mainpage AnalysisTriggerEvent
+@page AnalysisTriggerEvent_page AnalysisTriggerEvent
 
    @author Tadashi.Maeno <Tadashi.Maeno@cern.ch>
    @author Attila Kraznahorkay Jr. <Attila.Krasznahorkay@cern.ch>
    @author Alan Watson <Alan.Watson@cern.ch>
    @author Wolfgang Ehrenfeld <Wolfgang.Ehrenfeld@desy.de>
 
-   @section introductionAnalysisTriggerEvent Introduction
+@section AnalysisTriggerEvent_introductionAnalysisTriggerEvent Introduction
 
    AnalysisTriggerEvent contains ESD/AOD classes to store LVL1 trigger information.
 
-   @section packagecontentAnalysisTriggerEvent Package Contents
+@section AnalysisTriggerEvent_packagecontentAnalysisTriggerEvent Package Contents
 
    AnalysisTriggerEvent contains the following files/classes:
    - CTP_Decision ... LVL1 result decided by Central Trigger Processor (legacy object)
@@ -26,7 +26,7 @@
    - Muon_ROI ... ROI from Muon trigger
    - FakeHLTWord ... result of HLT system, which is used for DC2 and should retire near future. This is needed for streaming.
 
-   @section AnalysisTriggerEvent Extra Pages
+@section AnalysisTriggerEvent_AnalysisTriggerEvent Extra Pages
 
    - @ref used_AnalysisTriggerEvent
    - @ref requirements_AnalysisTriggerEvent
@@ -34,10 +34,8 @@
 
 /**
    @page used_AnalysisTriggerEvent Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_AnalysisTriggerEvent Requirements
-   @include requirements
 */
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/doc/mainpage.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/doc/mainpage.h
deleted file mode 100755
index 4d0c7874195389ba66476b88d72ab8b440feb293..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/doc/mainpage.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-\mainpage AnalysisTriggerEventAthenaPool
-
-\section introductionAnalysisTriggerEventAthenaPool Introduction
-AnalysisTriggerEventAthenaPool contains POOL converters for Trigger ESD/AOD.
-
-\section used_packagesAnalysisTriggerEventAthenaPool Used packages
-@htmlinclude used_packages.html
-
-\section requirementsAnalysisTriggerEventAthenaPool Requirements
-@include requirements
-
-*/
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/doc/packagedoc.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..71aee13fdb563b5be33ab24562b63bed56fe785e
--- /dev/null
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/doc/packagedoc.h
@@ -0,0 +1,15 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+@page AnalysisTriggerEventAthenaPool_page AnalysisTriggerEventAthenaPool
+
+@section AnalysisTriggerEventAthenaPool_introductionAnalysisTriggerEventAthenaPool Introduction
+AnalysisTriggerEventAthenaPool contains POOL converters for Trigger ESD/AOD.
+
+@section AnalysisTriggerEventAthenaPool_used_packagesAnalysisTriggerEventAthenaPool Used packages
+
+@section AnalysisTriggerEventAthenaPool_requirementsAnalysisTriggerEventAthenaPool Requirements
+
+*/
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/doc/mainpage.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/doc/packagedoc.h
similarity index 81%
rename from PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/doc/mainpage.h
rename to PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/doc/packagedoc.h
index 76ba5b5b6c8e8be7eb2a4d2493934a0351ad7c8a..73122f77b43936a766173196f1c5c54704c2f974 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/doc/mainpage.h
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-@mainpage AnalysisTriggerEventTPCnv Package
+@page AnalysisTriggerEventTPCnv_page AnalysisTriggerEventTPCnv Package
 
 @author Attila Kraznahorkay Jr. <Attila.Krasznahorkay@cern.ch>
 @author Wolfgang Ehrenfeld <Wolfgang.Ehrenfeld@desy.de>
 @author Alan Watson <Alan.Watson@cern.ch>
 
-@section AnalysisTriggerEventTPCnvIntro Introduction
+@section AnalysisTriggerEventTPCnv_AnalysisTriggerEventTPCnvIntro Introduction
 
 This package contains the persistent data classes of AnalysisTriggerEvent
 and the corresponding T/P converter.
 
-@section AnalysisTriggerEventTPCnvOverview Class Overview
+@section AnalysisTriggerEventTPCnv_AnalysisTriggerEventTPCnvOverview Class Overview
   The AnalysisTriggerEventTPCnv package contains of following persistent classes:
 
   - CTP_Decision_p1: first version of persistent class for CTP_Decision class
@@ -29,7 +29,7 @@ and the corresponding T/P converter.
   - CTP_DecisionCnv_p2: T/P converter between CTP_Decision and CTP_Decision_p2
   - LVL1_ROICnv_p1: T/P converter between LVL1_ROI and LVL1_ROI_p1
 
-@section AnalysisTriggerEventTPCnv Extra Pages
+@section AnalysisTriggerEventTPCnv_AnalysisTriggerEventTPCnv Extra Pages
 
 - @ref used_AnalysisTriggerEventTPCnv
 - @ref requirements_AnalysisTriggerEventTPCnv
@@ -37,10 +37,8 @@ and the corresponding T/P converter.
 
 /**
    @page used_AnalysisTriggerEventTPCnv Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_AnalysisTriggerEventTPCnv Requirements
-   @include requirements
 */
diff --git a/PhysicsAnalysis/AthenaROOTAccess/doc/MainPage.h b/PhysicsAnalysis/AthenaROOTAccess/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 97%
rename from PhysicsAnalysis/AthenaROOTAccess/doc/MainPage.h
rename to PhysicsAnalysis/AthenaROOTAccess/doc/packagedoc.h
index 4763241e95d515390f4c514e233e8f90157dd03d..29f784f85b89d794478ba95ee4a22988c35aff75
--- a/PhysicsAnalysis/AthenaROOTAccess/doc/MainPage.h
+++ b/PhysicsAnalysis/AthenaROOTAccess/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page AthenaROOTAccess_page 
 
-@section Introduction Introduction
+@section AthenaROOTAccess_Introduction Introduction
 
 AthenaROOTAccess allows accessing Athena POOL data directly from Root, without
 using the Athena framework.  Note, however, that it uses the transient
@@ -17,7 +17,7 @@ Athena AOD classes.  Other classes have not been tested.
 There is a <a href="https://twiki.cern.ch/twiki/bin/view/Atlas/AthenaROOTAccess">wiki page</a> for this package.
 See there for details.
 
-@section overview Implementation overview.
+@section AthenaROOTAccess_overview Implementation overview.
 
 The function @c transientTree.makeTree is responsible for setting things
 up. The @c CollectionTree @c TTree from the Pool file is called the
diff --git a/PhysicsAnalysis/BPhys/BPhysTagTools/doc/mainpage.h b/PhysicsAnalysis/BPhys/BPhysTagTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 61%
rename from PhysicsAnalysis/BPhys/BPhysTagTools/doc/mainpage.h
rename to PhysicsAnalysis/BPhys/BPhysTagTools/doc/packagedoc.h
index 464eb82c90c17abf4332427c67bb1939311a5638..f41586e7a3b88d840572a77b4258995a6c30c5d8
--- a/PhysicsAnalysis/BPhys/BPhysTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/BPhys/BPhysTagTools/doc/packagedoc.h
@@ -3,24 +3,22 @@
 */
 
 /**
-\mainpage BPhysTagTools
+@page BPhysTagTools_page BPhysTagTools
 
-\section introductionBPhysTagTools Introduction
+@section BPhysTagTools_introductionBPhysTagTools Introduction
 This package contains the alg tools for building the TAG fragment for B-Physics analysis: the results of various 
 exclusive yes/no hypotheses, for example, can be encode into a TAG word.
 
-\section packagecontentBPhysTagTools Package Contents
+@section BPhysTagTools_packagecontentBPhysTagTools Package Contents
 BPhysTagTools contains the following tools:
 
 - BPhysTagTool ... tool for B-Physics Analysis TAG - for example the results of exclusive hypotheses
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesBPhysTagTools Used packages
-@htmlinclude used_packages.html
+@section BPhysTagTools_used_packagesBPhysTagTools Used packages
 
-\section requirementsBPhysTagTools Requirements
-@include requirements
+@section BPhysTagTools_requirementsBPhysTagTools Requirements
 
 */
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/doc/mainpage.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/doc/packagedoc.h
similarity index 59%
rename from PhysicsAnalysis/D3PDMaker/D3PDMakerReader/doc/mainpage.h
rename to PhysicsAnalysis/D3PDMaker/D3PDMakerReader/doc/packagedoc.h
index 0d62ceae71557f651283c416098a529f42aea07a..cb2889870580d07892aeedc993d4aadecefef75e 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/doc/mainpage.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/doc/packagedoc.h
@@ -3,15 +3,13 @@
 */
 
 /**
-   @mainpage D3PDMakerReader package
+@page D3PDMakerReader_page D3PDMakerReader package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
-   @section D3PDMakerReaderIntro Introduction
+@section D3PDMakerReader_D3PDMakerReaderIntro Introduction
 
    The documentation will have to be written later on...
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/PhysicsAnalysis/DPDUtils/doc/mainpage.h b/PhysicsAnalysis/DPDUtils/doc/packagedoc.h
similarity index 79%
rename from PhysicsAnalysis/DPDUtils/doc/mainpage.h
rename to PhysicsAnalysis/DPDUtils/doc/packagedoc.h
index 2a85af9c9b1262a5e95f2b911691e9693d3d2f71..7d7628abc6fe51ce00a4452721f72f4e7ba18038 100644
--- a/PhysicsAnalysis/DPDUtils/doc/mainpage.h
+++ b/PhysicsAnalysis/DPDUtils/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage DPDUtils Package
+@page DPDUtils_page DPDUtils Package
 
 This package contains utilities (both C++ and python) aiding in creating
 DPDs from AODs/ESDs
 
 @author Sven Menke
 
-@section DPDUtilsIntro Introduction
+@section DPDUtils_DPDUtilsIntro Introduction
 
 C++ code and python fragments needed to produce DPDs from AODs/ESDs 
 (like slimming, thinning) should go in this package.
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/doc/mainpage.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 55%
rename from PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/doc/mainpage.h
rename to PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/doc/packagedoc.h
index e98d490e58fefaeca7c6ec252ec0cc6187ef832e..2b9e2db1a567059ce2815482617a56e50df6ff62
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-\mainpage ElectronPhotonTagTools
+@page ElectronPhotonTagTools_page ElectronPhotonTagTools
 
-\section introductionElectronPhotonTagTools Introduction
+@section ElectronPhotonTagTools_introductionElectronPhotonTagTools Introduction
 This package contains the alg tools for building the tag fragments for Egamma, Electron and Photon identification.
 
-\section packagecontentElectronPhotonTagTools Package Contents
+@section ElectronPhotonTagTools_packagecontentElectronPhotonTagTools Package Contents
 ElectronPhotonTagTools contains the following tools:
 
 - EgammaTagTool ... tool for Electron and photon identification TAG fragment
@@ -17,11 +17,9 @@ ElectronPhotonTagTools contains the following tools:
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesElectronPhotonTagTools Used packages
-@htmlinclude used_packages.html
+@section ElectronPhotonTagTools_used_packagesElectronPhotonTagTools Used packages
 
-\section requirementsElectronPhotonTagTools Requirements
-@include requirements
+@section ElectronPhotonTagTools_requirementsElectronPhotonTagTools Requirements
 
 */
 
diff --git a/PhysicsAnalysis/EventTag/EventSelection/doc/mainpage.h b/PhysicsAnalysis/EventTag/EventSelection/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 50%
rename from PhysicsAnalysis/EventTag/EventSelection/doc/mainpage.h
rename to PhysicsAnalysis/EventTag/EventSelection/doc/packagedoc.h
index ad0dbcb35d9d7745518c32c9fc570cdce7b5e1c5..a0f4641bb885b3b0cd923ecad0fb8f952bf40d6a
--- a/PhysicsAnalysis/EventTag/EventSelection/doc/mainpage.h
+++ b/PhysicsAnalysis/EventTag/EventSelection/doc/packagedoc.h
@@ -3,24 +3,22 @@
 */
 
 /**
-\mainpage EventSelection
+@page EventSelection_page EventSelection
 
-\section introductionEventSelection Introduction
+@section EventSelection_introductionEventSelection Introduction
 This package contains some jobOs for TAG building.
 
-\section packagecontentEventSelection Package Contents
+@section EventSelection_packagecontentEventSelection Package Contents
 EventSelection contains the following jobOs
 
 - AODtoTAG_topOptions.py : produce TAG from AOD
 - EventSplitTest_topOptions.py : produce TAG collections together with AOD streams
 
-\section used_packagesEventSelection Used packages
-@htmlinclude used_packages.html
+@section EventSelection_used_packagesEventSelection Used packages
 
-\section requirementsEventSelection Requirements
-@include requirements
+@section EventSelection_requirementsEventSelection Requirements
 
-\section How to use MakeSimpleCollection.py, MakeEventTagCollection.py and EventTagCollectionDeepCopy.py
+@section EventSelection_How to use MakeSimpleCollection.py, MakeEventTagCollection.py and EventTagCollectionDeepCopy.py
 
 Details are found at the following link:
 
diff --git a/PhysicsAnalysis/EventTag/EventTagAlgs/doc/mainpage.h b/PhysicsAnalysis/EventTag/EventTagAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from PhysicsAnalysis/EventTag/EventTagAlgs/doc/mainpage.h
rename to PhysicsAnalysis/EventTag/EventTagAlgs/doc/packagedoc.h
index ce1eed9e2a18766c949e7e0388f4b71564782639..a0c3c7c9b786ca8a4ef0abec8a6ef4549f69a108
--- a/PhysicsAnalysis/EventTag/EventTagAlgs/doc/mainpage.h
+++ b/PhysicsAnalysis/EventTag/EventTagAlgs/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-\mainpage EventTagAlgs
+@page EventTagAlgs_page EventTagAlgs
 
-\section introductionEventTagAlgs Introduction
+@section EventTagAlgs_introductionEventTagAlgs Introduction
 This package contains the algorithms for aggregating the TAG fragments from the various groups.
 
-\section packagecontentEventTagAlgs Package Contents
+@section EventTagAlgs_packagecontentEventTagAlgs Package Contents
 EventTagAlgs contains the following algs/files:
 
 - TagBuilderBase ... base class for TAG builders
@@ -29,10 +29,8 @@ EventTagAlgs contains the following algs/files:
 
 - for questions and comments: ketevi@bnl.gov or tmaeno@bnl.gov
 
-\section used_packagesEventTagAlgs Used packages
-@htmlinclude used_packages.html
+@section EventTagAlgs_used_packagesEventTagAlgs Used packages
 
-\section requirementsEventTagAlgs Requirements
-@include requirements
+@section EventTagAlgs_requirementsEventTagAlgs Requirements
 
 */
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/doc/mainpage.h b/PhysicsAnalysis/EventTag/EventTagUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 63%
rename from PhysicsAnalysis/EventTag/EventTagUtils/doc/mainpage.h
rename to PhysicsAnalysis/EventTag/EventTagUtils/doc/packagedoc.h
index 82868f61441d998ce832a0074e729fb202474830..62530af9e6aad00b9d608c7cfb4f4c8278437026
--- a/PhysicsAnalysis/EventTag/EventTagUtils/doc/mainpage.h
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-\mainpage EventTagAlgs
+@page EventTagUtils_page EventTagAlgs
 
-\section introductionEventTagUtils Introduction
+@section EventTagUtils_introductionEventTagUtils Introduction
 This package contains the alg tools to build the global trigger and event fragments of TAG, and also the detector 
 quality tag fragments
 
-\section packagecontentEventTagUtils Package Contents
+@section EventTagUtils_packagecontentEventTagUtils Package Contents
 EventTagUtils contains the following algs/files:
 
 - DataQualityTagTool ... tool to build the detector status/data quality TAG and the good for physics TAG 
@@ -17,11 +17,9 @@ EventTagUtils contains the following algs/files:
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesEventTagUtils Used packages
-@htmlinclude used_packages.html
+@section EventTagUtils_used_packagesEventTagUtils Used packages
 
-\section requirementsEventTagUtils Requirements
-@include requirements
+@section EventTagUtils_requirementsEventTagUtils Requirements
 
 */
 
diff --git a/PhysicsAnalysis/EventTag/TagEvent/doc/mainpage.h b/PhysicsAnalysis/EventTag/TagEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from PhysicsAnalysis/EventTag/TagEvent/doc/mainpage.h
rename to PhysicsAnalysis/EventTag/TagEvent/doc/packagedoc.h
index 6194fe2cd7d94d087447e06bc71479342f27631b..9da2f716dc8f4d0292393c67c73c59c1421d82ae
--- a/PhysicsAnalysis/EventTag/TagEvent/doc/mainpage.h
+++ b/PhysicsAnalysis/EventTag/TagEvent/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TagEvent Package
+@page TagEvent_page TagEvent Package
 
 The package which defines the TAG data classes. It the EDM package for the TAG.
 
@@ -34,11 +34,9 @@ b-physics group may encode the results of various hypotheses about exclusive pro
  - For questions or comments: Ketevi A. Assamagan
    ketevi@bnl.gov
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section TagEvent_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section TagEvent_requirements Requirements
 
 */
 
diff --git a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/doc/mainpage.h b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 50%
rename from PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/doc/mainpage.h
rename to PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/doc/packagedoc.h
index 5971ae04758e9b3e828e23ba6d47f1636e3d92ef..9917c0a8dc30b47db5aa0139b4fb2ff233196648
--- a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/doc/packagedoc.h
@@ -3,23 +3,21 @@
 */
 
 /**
-\mainpage ExoticPhysTagTools
+@page ExoticPhysTagTools_page ExoticPhysTagTools
 
-\section introductionExoticPhysTagTools Introduction
+@section ExoticPhysTagTools_introductionExoticPhysTagTools Introduction
 This package contains the alg tools for building the TAG fragment for Exotic Physics Analysis
 
-\section packagecontentExoticPhysTagTools Package Contents
+@section ExoticPhysTagTools_packagecontentExoticPhysTagTools Package Contents
 ExoticPhysTagTools contains the following tools:
 
 - ExoticPhysTagTool ... tool for Exotic-Physics Analysis TAG fragment 
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesExoticPhysTagTools Used packages
-@htmlinclude used_packages.html
+@section ExoticPhysTagTools_used_packagesExoticPhysTagTools Used packages
 
-\section requirementsExoticPhysTagTools Requirements
-@include requirements
+@section ExoticPhysTagTools_requirementsExoticPhysTagTools Requirements
 
 */
 
diff --git a/PhysicsAnalysis/HadronicRecoilData/doc/mainpage.h b/PhysicsAnalysis/HadronicRecoilData/doc/packagedoc.h
similarity index 77%
rename from PhysicsAnalysis/HadronicRecoilData/doc/mainpage.h
rename to PhysicsAnalysis/HadronicRecoilData/doc/packagedoc.h
index 457e88a53aceba39f88f3a073130ccc9ee63a6d2..d28c075f42b182fc8c05438c7e32c0de558c901c 100644
--- a/PhysicsAnalysis/HadronicRecoilData/doc/mainpage.h
+++ b/PhysicsAnalysis/HadronicRecoilData/doc/packagedoc.h
@@ -6,10 +6,8 @@
 
  <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
 
-@mainpage
+@page HadronicRecoilData_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/doc/mainpage.h b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 51%
rename from PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/doc/mainpage.h
rename to PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/doc/packagedoc.h
index a61ccaa1226fab86ae3a2a1797358330ab1311e7..4a6d828f8efe4f2a5f2f9e8c25b31ff57189e406
--- a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/doc/packagedoc.h
@@ -3,23 +3,21 @@
 */
 
 /**
-\mainpage HiggsPhysTagTools
+@page HiggsPhysTagTools_page HiggsPhysTagTools
 
-\section introductionHiggsPhysTagTools Introduction
+@section HiggsPhysTagTools_introductionHiggsPhysTagTools Introduction
 This package contains the alg tools for building the TAG fragment for Higgs Physics Analysis
 
-\section packagecontentHiggsPhysTagTools Package Contents
+@section HiggsPhysTagTools_packagecontentHiggsPhysTagTools Package Contents
 HiggsPhysTagTools contains the following tools:
 
 - HiggsPhysTagTool ... tool for Higgs Physics Analysis TAG fragment 
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesHiggsPhysTagTools Used packages
-@htmlinclude used_packages.html
+@section HiggsPhysTagTools_used_packagesHiggsPhysTagTools Used packages
 
-\section requirementsHiggsPhysTagTools Requirements
-@include requirements
+@section HiggsPhysTagTools_requirementsHiggsPhysTagTools Requirements
 
 */
 
diff --git a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/doc/mainpage.h b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 57%
rename from PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/doc/mainpage.h
rename to PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/doc/packagedoc.h
index 4e7fd33aa46a5fc518fc4bac8d0f4387c939d595..1d0fd6033f8725926bf657fcb19d6c5cadea88f4
--- a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-\mainpage JetMissingEtTagTools
+@page JetMissingEtTagTools_page JetMissingEtTagTools
 
-\section introductionJetMissingEtTagTools Introduction
+@section JetMissingEtTagTools_introductionJetMissingEtTagTools Introduction
 This package contains the alg tools for building the tag fragments for ParticleJet, MissingET and their 
 identification process.
 
-\section packagecontentJetMissingEtTagTools Package Contents
+@section JetMissingEtTagTools_packagecontentJetMissingEtTagTools Package Contents
 JetMissingEtTagTools contains the following tools:
 
 - JetMissingEtIdentificationTagTool ... tool for ParticleJet and MissingET identification TAG fragment
@@ -17,11 +17,9 @@ JetMissingEtTagTools contains the following tools:
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesJetMissingEtTagTools Used packages
-@htmlinclude used_packages.html
+@section JetMissingEtTagTools_used_packagesJetMissingEtTagTools Used packages
 
-\section requirementsJetMissingEtTagTools Requirements
-@include requirements
+@section JetMissingEtTagTools_requirementsJetMissingEtTagTools Requirements
 
 */
 
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/doc/mainpage.h b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/doc/mainpage.h
rename to PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/doc/packagedoc.h
index 08d62a63ec0d23f32d7ab63e4659a70fecbb74ab..e8ca72926bfdedaa662d9b34f5d847a78f758e0e
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/doc/mainpage.h
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-@mainpage BTagging
+@page BTagging_page BTagging
 
 Package for b-tagging.
 
 @author Andreas.Wildauer@cern.ch
 
-@section introductionBTagging Introduction
+@section BTagging_introductionBTagging Introduction
 The BTagging package is an example package of how to use the new JetTagging structure under
 PhysicsAnlaysis/JetTagging for b-tagging. It contains one algorithm - the BJetBuilder - and
 one algtool - the BTagTool.
 
-@section howitworksBTagging How it works
+@section BTagging_howitworksBTagging How it works
 The BJetBuilder is a prototype algorithm on how to use the BTagTool for b-tagging. For more information
 on the BJetBuilder and the BTagTool please refer to the class description. The functionality of the BJetBuilder
 and the BTagTool described below can completely be steered via jobOptions. Prototype jobOption files are
@@ -34,15 +34,15 @@ on the tools please refer to PhysicsAnalysis/JetTagging/JetTagTools. At the end
 has a pointer to a tagged JetTag object. For more details on the JetTag object please refer to
 PhysicsAnalysis/JetTagging/JetTagEvent.
 
-@section jettagInfoFlowBTagging Info flow in the new JetTagging structure
+@section BTagging_jettagInfoFlowBTagging Info flow in the new JetTagging structure
 @image html InfoFlowNew.jpg "JetTagging Information Flow" width=10cm
 
-@section packagecontentBTagging Package Contents
+@section BTagging_packagecontentBTagging Package Contents
 BTagging contains the following files/classes:
 - BJetBuilder ... algorithm to to handle storegate I/O and to call the BTagTool.
 - BTagTool    ... algtool to call the actual tag tools
 
-@section steeringOfBJetBuilderBTagging Steering of the BJetBuilder and BTagTools
+@section BTagging_steeringOfBJetBuilderBTagging Steering of the BJetBuilder and BTagTools
 The BTagging package contains one main jobOptions file called BTagging_jobOptions.py.
 In principal, if someone wants to use standard b-tagging one only has to include this
 file in his/her jobOptions file. For details on what the jobOptions file does please
@@ -93,7 +93,7 @@ The following flags can be used before the include line of the BTagging_jobOptio
   </TR>
 </TABLE> 
     
-@section jobOptionsBTagging The jobOptions files
+@section BTagging_jobOptionsBTagging The jobOptions files
 There are several jobOptions files in this package:
 - BTagging_jobOptions.py      ... the main jobOptions file
 - BTagJetFinder_jobOptions.py ... in case jetfinding wants to be done on TrackParticles
@@ -104,7 +104,7 @@ There are several jobOptions files in this package:
 - BTagging_LifetimeTag3D.py
 - BTagging_LifetimeTag2D.py
 
-@section referenceHistosBTagging Reference histograms
+@section BTagging_referenceHistosBTagging Reference histograms
 A standard set of reference histograms is provided by BTaggingUtils. It
 has reference histos for background events (2056, \f$ WH \rightarrow \mu \nu uu \f$)
 and for signal events (2055, \f$ WH \rightarrow \mu \nu bb \f$).
@@ -113,7 +113,6 @@ reference histograms <i>Bkg_ref.root</i> and <i>Sig_ref.root</i>. The originals
 are located in PhysicsAnalysis/BTagging/BTaggingUtils/share and are copied
 to the release InstallArea on compiling.<br>
 
-@section requirementsBTagging Requirements
-@include requirements
+@section BTagging_requirementsBTagging Requirements
 
 */
diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/mainpage.h b/PhysicsAnalysis/JetTagging/JetTagEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 51%
rename from PhysicsAnalysis/JetTagging/JetTagEvent/doc/mainpage.h
rename to PhysicsAnalysis/JetTagging/JetTagEvent/doc/packagedoc.h
index e757938f8dbadfe16038efcc8a3b4a271a335bcb..c50b247ae079e2ede737857627853dd857956847
--- a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/mainpage.h
+++ b/PhysicsAnalysis/JetTagging/JetTagEvent/doc/packagedoc.h
@@ -3,23 +3,21 @@
 */
 
 /**
-\mainpage JetTagEvent
+@page JetTagEvent_page JetTagEvent
 
-\section introductionJetTagEvent Introduction
+@section JetTagEvent_introductionJetTagEvent Introduction
 JetTagEvent contains classes to store tagging information. The classes are
 used by the b-tagging packages BTagging.
 
-\section howitworksJetTagEvent How it works
+@section JetTagEvent_howitworksJetTagEvent How it works
 
-\section packagecontentJetTagEvent Package Contents
+@section JetTagEvent_packagecontentJetTagEvent Package Contents
 JetTagEvent contains the following files/classes:
 - JetTag ... the basic b jet object.
 - JetTagContainer ... and its container for storegate
 
-\section used_packagesJetTagEvent Used packages
-@htmlinclude used_packages.html
+@section JetTagEvent_used_packagesJetTagEvent Used packages
 
-\section requirementsJetTagEvent Requirements
-@include requirements
+@section JetTagEvent_requirementsJetTagEvent Requirements
 
 */
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/doc/mainpage.h b/PhysicsAnalysis/JetTagging/JetTagInfo/doc/packagedoc.h
similarity index 82%
rename from PhysicsAnalysis/JetTagging/JetTagInfo/doc/mainpage.h
rename to PhysicsAnalysis/JetTagging/JetTagInfo/doc/packagedoc.h
index 022a8f5069eb609a911e0882870e812cda82faad..5d09ee29dafca5170f326484dc5418b62f89a205 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/doc/mainpage.h
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/doc/packagedoc.h
@@ -3,24 +3,24 @@
 */
 
 /**
-\mainpage JetTagInfo
+@page JetTagInfo_page JetTagInfo
 
 Package for info classes to be used in jet tagging.
 
 @author Andreas.Wildauer@cern.ch
 
-\section introductionJetTagInfo Introduction
+@section JetTagInfo_introductionJetTagInfo Introduction
 JetTagInfo contains classes to store tagging information. The classes are
 used by the b-tagging packages BTagging.
 
-\section howitworksJetTagInfo Info objects
+@section JetTagInfo_howitworksJetTagInfo Info objects
 Each tagger has to implement its own info object. In order to be working in a jet tag
 context like btagging the info object has to inherit from ITagInfo or BaseTagInfo (preferably
 from the last one since it implements needed methods like infoType() and tagLikelihood()).
 
 For more information on the different info objects have a look at the class descriptions.
 
-\section packagecontentJetTagInfo Package Contents
+@section JetTagInfo_packagecontentJetTagInfo Package Contents
 JetTagInfo contains the following files/classes:
  - ITagInfo ... abstract base class which defines basic interfaces for all info objects
  - BaseTagInfo .. implements some methods of ITagInfo
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/doc/mainpage.h b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/doc/packagedoc.h
similarity index 55%
rename from PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/doc/mainpage.h
rename to PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/doc/packagedoc.h
index f14bb82a99e3a777906a3c563744766fb4e2bf80..ff206797251332e6999a79b43f0c96642f9a59ec 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/doc/mainpage.h
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage CalibrationDataInterface Package
+@page CalibrationDataInterface_page CalibrationDataInterface Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Frank Filthaut <F.Filthaut@science.ru.nl>
 
-@section CalibrationDataInterfaceIntro Introduction
+@section CalibrationDataInterface_CalibrationDataInterfaceIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section CalibrationDataInterfaceReq Requirements
+@section CalibrationDataInterface_CalibrationDataInterfaceReq Requirements
 
-@include requirements
 
 */
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/doc/mainpage.h b/PhysicsAnalysis/JetTagging/JetTagTools/doc/packagedoc.h
similarity index 91%
rename from PhysicsAnalysis/JetTagging/JetTagTools/doc/mainpage.h
rename to PhysicsAnalysis/JetTagging/JetTagTools/doc/packagedoc.h
index 57ecedfd79c0e727a13359882ec56dc86b88b304..123dcf349e99b0207c13e0f8a9c990b3117280c7 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-\mainpage JetTagTools
+@page JetTagTools_page JetTagTools
 
 Package for tag tool and helper tools for jet tagging.
 
 @author Andreas.Wildauer@cern.ch
 
-\section introductionJetTagTools Introduction:
+@section JetTagTools_introductionJetTagTools Introduction:
 JetTagTools is a package which contains algtool(s) to calculate variables relevant
 for jet-tagging and also helper tools for easier handling of histograms and likelihood calculations. 
 
-\section implementedtoolsJetTagTools Algtools:
+@section JetTagTools_implementedtoolsJetTagTools Algtools:
 @subsection tagToolsJetTagTools Jet Tag Tools
 Different jet tag tools are implemented:<br>
 <ul>
@@ -88,7 +88,7 @@ mode it also calculates the b-jet likelihood and the so called NTrack probabilit
   </li>
 </ul>
 
-\section packagecontentJetTagTools Package Contents:
+@section JetTagTools_packagecontentJetTagTools Package Contents:
 JetTagTools contains the following files/classes:
 - LifetimeTag ... algtool to calculate b-tag lifetime variables 
 - SecVtxTag ... algtool to calculate b-tag secondary vertex variables 
@@ -97,14 +97,12 @@ JetTagTools contains the following files/classes:
 - share/Bkg.ref ... background reference histos for analysis mode (H->uu)
 - share/Sig.ref ... signal reference histos for analysis mode (H->bb)
 
-\section jobOptionsJetTagTools The jobOptions file:
+@section JetTagTools_jobOptionsJetTagTools The jobOptions file:
 There are no jobOptions files for this package. Examples how to use these
 algtools are given in the package BTaggingAlgs.
 
-\section used_packagesJetTagTools used packages
-@htmlinclude used_packages.html
+@section JetTagTools_used_packagesJetTagTools used packages
 
-\section requirementsJetTagTools Requirements
-@include requirements
+@section JetTagTools_requirementsJetTagTools Requirements
 
 */
diff --git a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/doc/mainpage.h b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 50%
rename from PhysicsAnalysis/JetTagging/JetTaggingTagTools/doc/mainpage.h
rename to PhysicsAnalysis/JetTagging/JetTaggingTagTools/doc/packagedoc.h
index 0d4ecc1ee658ce46262964bffe9f1bd17dd627ac..04819cf1e7c703531f23f9c82c26aad46703219e
--- a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/doc/packagedoc.h
@@ -3,23 +3,21 @@
 */
 
 /**
-\mainpage JetTaggingTagTools
+@page JetTaggingTagTools_page JetTaggingTagTools
 
-\section introductionJetTaggingTagTools Introduction
+@section JetTaggingTagTools_introductionJetTaggingTagTools Introduction
 This package contains the alg tools for building the TAG fragment for the flavor tagging process.
 
-\section packagecontentJetTaggingTagTools Package Contents
+@section JetTaggingTagTools_packagecontentJetTaggingTagTools Package Contents
 JetTaggingTagTools contains the following tools:
 
 - JetTaggingTagTool ... tool for flavor tagging TAG fragment
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesJetTaggingTagTools Used packages
-@htmlinclude used_packages.html
+@section JetTaggingTagTools_used_packagesJetTaggingTagTools Used packages
 
-\section requirementsJetTaggingTagTools Requirements
-@include requirements
+@section JetTaggingTagTools_requirementsJetTaggingTagTools Requirements
 
 */
 
diff --git a/PhysicsAnalysis/MuonID/MuonIDEvent/doc/mainpage.h b/PhysicsAnalysis/MuonID/MuonIDEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from PhysicsAnalysis/MuonID/MuonIDEvent/doc/mainpage.h
rename to PhysicsAnalysis/MuonID/MuonIDEvent/doc/packagedoc.h
index bf405c9bb31d42a375a4c544dc51bfaa5c4c1b80..9ad2b459ac8695784bbd8629a8fd9d2d44e8da8b
--- a/PhysicsAnalysis/MuonID/MuonIDEvent/doc/mainpage.h
+++ b/PhysicsAnalysis/MuonID/MuonIDEvent/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MuonIDEvent Package
+@page MuonIDEvent_page MuonIDEvent Package
 
 The package which defines the AOD particle classes.
 
 @authors Ketevi Assamagan, Sebastien Binet, Kyle Cranmer, Tadashi Maeno
 
 
-@section MuonIDEventIntro Introduction
+@section MuonIDEvent_MuonIDEventIntro Introduction
 
 The AOD particle classes are the basic objects to be used in physics
 analysis, and are the bulk of the AOD.  Each particle class has some
@@ -38,14 +38,14 @@ full simulation use the IParticle::dataType() method.
 
 Here only the Muon AOD EDM is described.
 
-@section MuonIDEventOverview Class Overview
+@section MuonIDEvent_MuonIDEventOverview Class Overview
 
   The MuonIDEvent package contains of following classes:
  
   - Analysis::Muon: built from and navigable to a CombinedMuon in the ESD, with a collection of 
 MuonContainer saved in the AOD for MOORE/MuID/MuIDLowPt and a separate one Muonboy/STACO/MuTag
 
-@section MuonIDEventBuilders Muon Builders
+@section MuonIDEvent_MuonIDEventBuilders Muon Builders
 
   Each of the particles is built by an algorithm in the
   PhysicsAnalysis package.  If you want to know what pre-selection is
@@ -57,7 +57,7 @@ MuonContainer saved in the AOD for MOORE/MuID/MuIDLowPt and a separate one Muonb
     converted from their atlfast equivalents by the AtlfastMuonBuilder
     and AtlfastMuonBuilderTool.
 
-@section MuonIDEventStoreGateKeys StoreGate Keys
+@section MuonIDEvent_MuonIDEventStoreGateKeys StoreGate Keys
 
   The storegate keys for the particle containers is defined in the
   jobOptions files of the builder algorithms above.  It is tempting to
@@ -66,7 +66,7 @@ MuonContainer saved in the AOD for MOORE/MuID/MuIDLowPt and a separate one Muonb
   https://uimon.cern.ch/twiki/bin/view/Atlas/StoregateKeysForAOD 
 
 
-@section MuonIDEventSeeAlso See also
+@section MuonIDEvent_MuonIDEventSeeAlso See also
 
 You may also be interested in:
 
@@ -80,9 +80,8 @@ You may also be interested in:
 
    - The rest of the AOD EDM classes
 
-@section MuonIDEventReq Requirements
+@section MuonIDEvent_MuonIDEventReq Requirements
 
-@include requirements
 
 */
 
diff --git a/PhysicsAnalysis/MuonID/MuonTagTools/doc/mainpage.h b/PhysicsAnalysis/MuonID/MuonTagTools/doc/packagedoc.h
similarity index 58%
rename from PhysicsAnalysis/MuonID/MuonTagTools/doc/mainpage.h
rename to PhysicsAnalysis/MuonID/MuonTagTools/doc/packagedoc.h
index 65a6c08f5f4eeec4b4043aa1bdcf22328224ac76..df2c7f23c30a8790f3c5e1b18a1f45ffdaeafa6a 100644
--- a/PhysicsAnalysis/MuonID/MuonTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/MuonID/MuonTagTools/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-\mainpage MuonTagTools
+@page MuonTagTools_page MuonTagTools
 
-\section introductionMuonTagTools Introduction
+@section MuonTagTools_introductionMuonTagTools Introduction
 This package contains the alg tools for building the tag fragments for CombinedMuon and Muon identification.
 
-\section packagecontentMuonTagTools Package Contents
+@section MuonTagTools_packagecontentMuonTagTools Package Contents
 MuonTagTools contains the following tools:
 
 - CombinedMuonTagTool ... tool for Muon identification TAG fragment
@@ -16,11 +16,9 @@ MuonTagTools contains the following tools:
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesMuonTagTools Used packages
-@htmlinclude used_packages.html
+@section MuonTagTools_used_packagesMuonTagTools Used packages
 
-\section requirementsMuonTagTools Requirements
-@include requirements
+@section MuonTagTools_requirementsMuonTagTools Requirements
 
 */
 
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/doc/mainpage.h b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 51%
rename from PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/doc/mainpage.h
rename to PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/doc/packagedoc.h
index 4518d3a76b86f996ab7633953a13662793a92a0e..993b628ea4bad2c0c5219051b1ef90654b67c926
--- a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/doc/packagedoc.h
@@ -3,23 +3,21 @@
 */
 
 /**
-\mainpage SUSYPhysTagTools
+@page SUSYPhysTagTools_page SUSYPhysTagTools
 
-\section introductionSUSYPhysTagTools Introduction
+@section SUSYPhysTagTools_introductionSUSYPhysTagTools Introduction
 This package contains the alg tools for building the TAG fragment for SUSY Physics Analysis
 
-\section packagecontentSUSYPhysTagTools Package Contents
+@section SUSYPhysTagTools_packagecontentSUSYPhysTagTools Package Contents
 SUSYPhysTagTools contains the following tools:
 
 - SUSYPhysTagTool ... tool for SUSY Physics Analysis TAG fragment 
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesSUSYPhysTagTools Used packages
-@htmlinclude used_packages.html
+@section SUSYPhysTagTools_used_packagesSUSYPhysTagTools Used packages
 
-\section requirementsSUSYPhysTagTools Requirements
-@include requirements
+@section SUSYPhysTagTools_requirementsSUSYPhysTagTools Requirements
 
 */
 
diff --git a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/doc/mainpage.h b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/doc/mainpage.h
deleted file mode 100755
index c433409f2906228d21fd7b9f20383e2dff8eaf6b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/doc/mainpage.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-\mainpage StandardModelPhysTagTools
-
-\section introductionStandardModelPhysTagTools Introduction
-This package contains the alg tools for building the TAG fragment for Standard Model Physics Analysis
-
-\section packagecontentStandardModelPhysTagTools Package Contents
-StandardModelPhysTagTools contains the following tools:
-
-- StandardModelPhysTagTool ... tool for Standard Model Physics Analysis TAG fragment 
-
-- for questions and comments: ketevi@bnl.gov
-
-\section used_packagesStandardModelPhysTagTools Used packages
-@htmlinclude used_packages.html
-
-\section requirementsStandardModelPhysTagTools Requirements
-@include requirements
-
-*/
-
-
diff --git a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/doc/packagedoc.h b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..fcce8eee3a126bc558340f74a42ad40257d78978
--- /dev/null
+++ b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/doc/packagedoc.h
@@ -0,0 +1,24 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+@page StandardModelPhysTagTools_page StandardModelPhysTagTools
+
+@section StandardModelPhysTagTools_introductionStandardModelPhysTagTools Introduction
+This package contains the alg tools for building the TAG fragment for Standard Model Physics Analysis
+
+@section StandardModelPhysTagTools_packagecontentStandardModelPhysTagTools Package Contents
+StandardModelPhysTagTools contains the following tools:
+
+- StandardModelPhysTagTool ... tool for Standard Model Physics Analysis TAG fragment 
+
+- for questions and comments: ketevi@bnl.gov
+
+@section StandardModelPhysTagTools_used_packagesStandardModelPhysTagTools Used packages
+
+@section StandardModelPhysTagTools_requirementsStandardModelPhysTagTools Requirements
+
+*/
+
+
diff --git a/PhysicsAnalysis/TauID/TauTagTools/doc/mainpage.h b/PhysicsAnalysis/TauID/TauTagTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 59%
rename from PhysicsAnalysis/TauID/TauTagTools/doc/mainpage.h
rename to PhysicsAnalysis/TauID/TauTagTools/doc/packagedoc.h
index 4d01199d7518043c1cff5d2f164f516794257b7b..fca40bc93756dd8bd91227a327c4fbcc7817e816
--- a/PhysicsAnalysis/TauID/TauTagTools/doc/mainpage.h
+++ b/PhysicsAnalysis/TauID/TauTagTools/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-\mainpage TauTagTools
+@page TauTagTools_page TauTagTools
 
-\section introductionTauTagTools Introduction
+@section TauTagTools_introductionTauTagTools Introduction
 This package contains the alg tools for building the tag fragments for TauJet and Tau identification
 
-\section packagecontentTauTagTools Package Contents
+@section TauTagTools_packagecontentTauTagTools Package Contents
 TauTagTools contains the following tools:
 
 - TauIdenitificationTagTool ... tool for Tau identification TAG fragment
@@ -16,11 +16,9 @@ TauTagTools contains the following tools:
 
 - for questions and comments: ketevi@bnl.gov
 
-\section used_packagesTauTagTools Used packages
-@htmlinclude used_packages.html
+@section TauTagTools_used_packagesTauTagTools Used packages
 
-\section requirementsTauTagTools Requirements
-@include requirements
+@section TauTagTools_requirementsTauTagTools Requirements
 
 */
 
diff --git a/PhysicsAnalysis/TauID/TauTrackEvent/doc/mainpage.h b/PhysicsAnalysis/TauID/TauTrackEvent/doc/packagedoc.h
similarity index 72%
rename from PhysicsAnalysis/TauID/TauTrackEvent/doc/mainpage.h
rename to PhysicsAnalysis/TauID/TauTrackEvent/doc/packagedoc.h
index 06d6187613646619327efd22c623e10d224290f4..a4ee1db1a02741b0aa697d27a6aaa39fac02a49d 100644
--- a/PhysicsAnalysis/TauID/TauTrackEvent/doc/mainpage.h
+++ b/PhysicsAnalysis/TauID/TauTrackEvent/doc/packagedoc.h
@@ -3,22 +3,22 @@
 */
 
 /**
- * @mainpage The TauTrackEvent package
+@page TauTrackEvent_page @mainpage The TauTrackEvent package
  * The EDM class package for TauTrackTools.
  *
  * @author Sebastian.Fleischmann@cern.ch
  *
- * @section introductionTauTrackEvent Introduction
+@section TauTrackEvent_@section introductionTauTrackEvent Introduction
  *
  * This package contains the data classes for TauTrackTools.
  *
- * @section TauTrackEventOverview Class Overview
+@section TauTrackEvent_@section TauTrackEventOverview Class Overview
  *   The TauTrackEvent package contains the following classes:
  *
  *     - TauID::TruthTau : Special class for tau truth data (inherits from TruthParticle)
  *     - TauID::TauJetTruthMap : Map between Analysis::TauJet and TauID::TruthTau
  *
- *     @section ExtrasTauTrackEvent Extra Pages
+@section TauTrackEvent_@section ExtrasTauTrackEvent Extra Pages
  *
  *      - @ref UsedTauTrackEvent
  *      - @ref requirementsTauTrackEvent
@@ -26,10 +26,8 @@
 
 /**
  * @page UsedTauTrackEvent Used Packages
- * @htmlinclude used_packages.html
  * */
 
 /**
  * @page requirementsTauTrackEvent Requirements
- * @include requirements
  * */
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/doc/mainpage.h b/PhysicsAnalysis/TopPhys/QuickAna/doc/packagedoc.h
similarity index 100%
rename from PhysicsAnalysis/TopPhys/QuickAna/doc/mainpage.h
rename to PhysicsAnalysis/TopPhys/QuickAna/doc/packagedoc.h
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/doc/mainpage.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 100%
rename from PhysicsAnalysis/TruthParticleID/McParticleAlgs/doc/mainpage.h
rename to PhysicsAnalysis/TruthParticleID/McParticleAlgs/doc/packagedoc.h
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..8a289358b699ca9e09832af5fab25d1816c2bc68
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+ATLAS Offline software
+========================
+
+Welcome to [ATLAS](https://atlas.ch) offline software.  
+
+Please see the [Twiki](https://twiki.cern.ch/twiki/bin/view/AtlasComputing/AtlasComputing) for more information, or look below for some other links.
+
+If you fork this project, please don't forget to add the ATLAS Robot as a developer (assuming you might want to submit a merge request) as documented [here](https://atlassoftwaredocs.web.cern.ch/gittutorial/gitlab-fork/).
+
+Links
+------------------------
+
+- The [ATLAS webpage](https://atlas.ch) will tell you all about the ATLAS experiment (for ATLAS members, the collaboration webpage is [here](http://atlas.web.cern.ch/Atlas/Collaboration/) 
+- The [Twiki](https://twiki.cern.ch/twiki/bin/view/AtlasComputing/AtlasComputing) is the main source of documentation, and has many links to sub-domains.
+- The [software documentation](https://atlassoftwaredocs.web.cern.ch) page has some tutorials etc.
+- The git repository is [here](https://gitlab.cern.ch/atlas/aogt9)
+- And the Doxygen code documentation can be found [here](https://dfs.cern.ch/dfs/websites/t/test-git-doxygen2/index.html)
\ No newline at end of file
diff --git a/Reconstruction/AODFix/doc/mainpage.h b/Reconstruction/AODFix/doc/packagedoc.h
similarity index 92%
rename from Reconstruction/AODFix/doc/mainpage.h
rename to Reconstruction/AODFix/doc/packagedoc.h
index 6b5ac5ca9d300bfd58c05f9d0bee248dc645c1d0..528cb180a89564d8573fbd6c1d89fa15165842b2 100644
--- a/Reconstruction/AODFix/doc/mainpage.h
+++ b/Reconstruction/AODFix/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage
+@page AODFix_page 
 
-@section AODFixIntro Introduction
+@section AODFix_AODFixIntro Introduction
 
 AODFix is a way to break frozen tier-0 in a controlled way. It does it
 in two ways: 
@@ -36,7 +36,7 @@ schedules the fixes associtated with that release when reading AODs
 and adds the metadata when writing AODs, either fixed or due to full
 reconstruction.
 
-@section AODFixOverview Module and Class Overview
+@section AODFix_AODFixOverview Module and Class Overview
   The AODFix package contains of following modules:
 
   - python.AODFix : The module that contains the interface to AODFix. No other module should be imported externally. 
@@ -48,15 +48,13 @@ reconstruction.
 @author Rolf Seuster
 @author Jovan Mitrevski
 
-@section ExtrasAODFix Extra Pages
+@section AODFix_ExtrasAODFix Extra Pages
  - @ref UsedAODFix
  - @ref RequirementsAODFix
 */
 /**
 @page UsedAODFix Used Packages
-@htmlinclude used_packages.html
 */
 /**
 @page RequirementsAODFix Requirements
-@include requirements
 */
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/doc/mainpage.h b/Reconstruction/HeavyIonRec/HIJetRec/doc/packagedoc.h
similarity index 98%
rename from Reconstruction/HeavyIonRec/HIJetRec/doc/mainpage.h
rename to Reconstruction/HeavyIonRec/HIJetRec/doc/packagedoc.h
index 10e415aa7ccc373ec08c2b9bcbf35b28f58d3901..7780b2c2000edb50674f4568cc69a3d300f7e2ca 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/doc/mainpage.h
+++ b/Reconstruction/HeavyIonRec/HIJetRec/doc/packagedoc.h
@@ -4,12 +4,12 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// \mainpage HIJetRec package
+@page HIJetRec_page \mainpage HIJetRec package
 ///
 /// \author Aaron Angerami <angerami@cern.ch>
 /// \date Jan, 2015
 ///
-/// \section Overview
+@section HIJetRec_\section Overview
 /// HIJetRec provides the necessary extensions of the standard jet software
 /// to perform the UE background subtraction required in HI collisions.
 ///
@@ -40,7 +40,7 @@
 /// and thus encapsulates things like back-navigation to the cells (HIJetCellSubtractorTool)
 /// or simply subtracts at the constituent level (HIJetClusterSubtractorTool).
 ///
-/// \section Design
+@section HIJetRec_\section Design
 /// The algorithm scheduling is performed in  HIJetRec_jobOptions.py. This job options file is
 /// included from <tt>HIRecExample/HeavyIonRec_jobOptions.py</tt>, which is pulled into the combined
 /// reconstruction if the <tt>rec.doHeavyIon</tt> flag is set to <tt>True</tt>. The algorithms proceed as follows:
diff --git a/Reconstruction/Jet/JetCalibTools/doc/mainpage.h b/Reconstruction/Jet/JetCalibTools/doc/packagedoc.h
similarity index 93%
rename from Reconstruction/Jet/JetCalibTools/doc/mainpage.h
rename to Reconstruction/Jet/JetCalibTools/doc/packagedoc.h
index 365eb29757ab319320fb825b4a1976a3b9422fcd..7f252c3d3ad77432fd1c2a6e69e77324b7324372 100644
--- a/Reconstruction/Jet/JetCalibTools/doc/mainpage.h
+++ b/Reconstruction/Jet/JetCalibTools/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage JetCalibTools
+@page JetCalibTools_page JetCalibTools
 
-@section Overview
+@section JetCalibTools_Overview 
 This package contains all the jet calibration methods.
 
 It is intended for physicists use and is also used in standard reconstruction.
@@ -22,7 +22,7 @@ They provide methods to
 The corrections can be a simple scale factor or a set of numbers depending on 
 the calibration tool.
 
-@section Usage
+@section JetCalibTools_Usage 
 All calibration tools are available as Athena tool (AthAlgTool), and some 
 of them are also available in ARA.
 
@@ -36,7 +36,7 @@ myCalibTool->store_calibration_correction(myUncalJet);
 @endcode
 
 
-@section Developers
+@section JetCalibTools_Developers 
 
 Writing a calibration tool is writing a class inheriting  IJetCalibrator.
 Some base implementation have been written, as  JetCalibratorBase.
@@ -59,8 +59,6 @@ All the other functions of the interface will then be provided by the JetCalibra
 See also the wiki for more details :
 https://twiki.cern.ch/twiki/bin/view/AtlasProtected/JetCalibTools
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Reconstruction/Jet/JetEvent/doc/mainpage.h b/Reconstruction/Jet/JetEvent/doc/packagedoc.h
similarity index 91%
rename from Reconstruction/Jet/JetEvent/doc/mainpage.h
rename to Reconstruction/Jet/JetEvent/doc/packagedoc.h
index fecea80c8f712bcc64e60bf0a6e27099173c4d85..b44aaaa90de6a744216d05b0357f09b72a8b8fe0 100644
--- a/Reconstruction/Jet/JetEvent/doc/mainpage.h
+++ b/Reconstruction/Jet/JetEvent/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage JetEvent
+@page JetEvent_page JetEvent
 
 @author P.A. Delsart (delsart at lapp.in2p3 dot fr)
 
-@section Content
+@section JetEvent_Content 
 
 JetEvent defines EDM for Jet software.
 
@@ -31,8 +31,6 @@ Other classes descibe information related to H1-style calibration (JetECS.h, Jet
 
 See also JetRec package
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Reconstruction/Jet/JetInterface/doc/mainpage.h b/Reconstruction/Jet/JetInterface/doc/packagedoc.h
similarity index 87%
rename from Reconstruction/Jet/JetInterface/doc/mainpage.h
rename to Reconstruction/Jet/JetInterface/doc/packagedoc.h
index 164ab71c12646c0e2b93ee1a9fab2e8b1c8c8332..ac128d7e3549f4765c75336100651fa211c6c81b 100644
--- a/Reconstruction/Jet/JetInterface/doc/mainpage.h
+++ b/Reconstruction/Jet/JetInterface/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage JetInterface
+@page JetInterface_page JetInterface
 
 @author D. Adams and P-A. Delsart
 
-@section Content
+@section JetInterface_Content 
 
 Package JetInterface (updated for run 2) contains the interfaces for the tools used in
 jet reconstruction.
 These are dual-use tools so that reconstruction can be run in either Athena or Root.
 
-@section Main classes
+@section JetInterface_Main classes
   - IJetExecuteTool : Interface for an algorithm-like tool.
   - IJetFinder : Interface for finding jets.
   - IJetGroomer : Interface for grooming a jet.
@@ -24,8 +24,6 @@ These are dual-use tools so that reconstruction can be run in either Athena or R
   - IPseudoJetGetter : Interface for retriving a vector of pseudojets.
   - IFastJetInterfaceTool: Interface to fastjet wrapper.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Reconstruction/Jet/JetMonitoring/doc/mainpage.h b/Reconstruction/Jet/JetMonitoring/doc/packagedoc.h
similarity index 74%
rename from Reconstruction/Jet/JetMonitoring/doc/mainpage.h
rename to Reconstruction/Jet/JetMonitoring/doc/packagedoc.h
index 0c8ae97e2353ba947c1170fb4f59c5f97b45d1e6..60c91a30ee021df3c4f862bddb37d1ae1b956ef2 100644
--- a/Reconstruction/Jet/JetMonitoring/doc/mainpage.h
+++ b/Reconstruction/Jet/JetMonitoring/doc/packagedoc.h
@@ -4,18 +4,16 @@
 
 /**
 
-@mainpage JetMonitoring
+@page JetMonitoring_page JetMonitoring
 
 @author P.A. Delsart (delsart at lapp.in2p3 dot fr)
 
-@section Content
+@section JetMonitoring_Content 
 
 JetMonitoring contains jet tools (deriving from JetAlgToolBase) c++ classes dedicated to jet monitoring.
 
 See also JetRec package
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Reconstruction/Jet/JetRec/doc/mainpage.h b/Reconstruction/Jet/JetRec/doc/packagedoc.h
similarity index 88%
rename from Reconstruction/Jet/JetRec/doc/mainpage.h
rename to Reconstruction/Jet/JetRec/doc/packagedoc.h
index 44c70d1921ee21af72d8aea3eb1ceaec4bfab7be..6b81472c86fc0761a3a51780b70a8642ee144c7f 100644
--- a/Reconstruction/Jet/JetRec/doc/mainpage.h
+++ b/Reconstruction/Jet/JetRec/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage JetRec
+@page JetRec_page JetRec
 
 @author D. Adams and P.A. Delsart
 
-@section Content
+@section JetRec_Content 
 
 Package JetRec (updated for run 2) contains the high-level tools used in jet reconstruction.
 These are dual-use tools so that reconstruction can be run in either Athena or Root.
 A top-level Athena algorithm is also provided.
 
-@section Main classes
+@section JetRec_Main classes
   - JetAlgorithm : This Athena algorithm runs a series of JetRec tools.
   - JetRecTool : Each jet collection is produced by a dedicated JetRec tool (i.e. instance of JetRecTool).
   - PseudoJetGetter : Inputs for jet finding, in the form of vectors of fastjet pseudojets, are accessed
@@ -22,8 +22,6 @@ and constructed with tools of this type.
   - JetFromPseudojet: This tool constructs an ATLAS jet collection from a vector of fastjet pseudojets.
   - JetFinder : This tool uses fastjet to find jets using an input list of pseudojets.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Reconstruction/Jet/JetRecTools/doc/mainpage.h b/Reconstruction/Jet/JetRecTools/doc/packagedoc.h
similarity index 75%
rename from Reconstruction/Jet/JetRecTools/doc/mainpage.h
rename to Reconstruction/Jet/JetRecTools/doc/packagedoc.h
index 4bbb51d4383cc9e331864401a929277f46a60823..1f13e7a5453f1baebfa72438f9dcd3bdca8c9def 100644
--- a/Reconstruction/Jet/JetRecTools/doc/mainpage.h
+++ b/Reconstruction/Jet/JetRecTools/doc/packagedoc.h
@@ -4,18 +4,16 @@
 
 /**
 
-@mainpage JetRecTools
+@page JetRecTools_page JetRecTools
 
 
-@section Content
+@section JetRecTools_Content 
 
 JetRecTools contains all JetAlgTool which depend on packages external to the Jet/ realm.
 
 It contains all tools accessing calorimeter information, track information or dealing with truth particles.
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Reconstruction/Jet/JetSimTools/doc/mainpage.h b/Reconstruction/Jet/JetSimTools/doc/packagedoc.h
similarity index 80%
rename from Reconstruction/Jet/JetSimTools/doc/mainpage.h
rename to Reconstruction/Jet/JetSimTools/doc/packagedoc.h
index a058e45812847a0e6f976e784683ef03b80b4a9d..88fcefab95eb79f0404d70e8c724729ed77566ed 100644
--- a/Reconstruction/Jet/JetSimTools/doc/mainpage.h
+++ b/Reconstruction/Jet/JetSimTools/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage JetSimTools
+@page JetSimTools_page JetSimTools
 
 @author P.A. Delsart (delsart at lapp.in2p3 dot fr)
 
-@section Content
+@section JetSimTools_Content 
 
 JetSimTools contains jet tools (deriving from JetAlgToolBase) and jet moment tool (deriving from JetMomentToolBase) 
 which depend on Generator or Simulation packages.
@@ -16,8 +16,6 @@ All MC Truth related jet tools live here.
 
 See also JetRec package.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Reconstruction/Jet/JetUtils/doc/mainpage.h b/Reconstruction/Jet/JetUtils/doc/packagedoc.h
similarity index 75%
rename from Reconstruction/Jet/JetUtils/doc/mainpage.h
rename to Reconstruction/Jet/JetUtils/doc/packagedoc.h
index 59fb83d4254e82f80eaa4ab7ece9a96465b70dbb..ec8abcbe67c45d86bcea382da93f0893b7fd338e 100644
--- a/Reconstruction/Jet/JetUtils/doc/mainpage.h
+++ b/Reconstruction/Jet/JetUtils/doc/packagedoc.h
@@ -4,19 +4,17 @@
 
 /**
 
-@mainpage JetUtils
+@page JetUtils_page JetUtils
 
 @author P.A. Delsart (delsart at lapp.in2p3 dot fr)
 
-@section Content
+@section JetUtils_Content 
 
 JetUtils contain utilities and helper related to jets : managing JetCollections, kinematic functions, etc..
 
 
 See also JetRec package
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Reconstruction/Jet/KtJet/src/mainpage.h b/Reconstruction/Jet/KtJet/src/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from Reconstruction/Jet/KtJet/src/mainpage.h
rename to Reconstruction/Jet/KtJet/src/packagedoc.h
index 1db403e43182787bf11b7dff764ea66a28710670..c935c496ae76f1187e6f46ff427605801ff4313e
--- a/Reconstruction/Jet/KtJet/src/mainpage.h
+++ b/Reconstruction/Jet/KtJet/src/packagedoc.h
@@ -4,14 +4,14 @@
 
 // Mainpage for doxygen documentation
 
-/** @mainpage package KtJet
+@page KtJet_page @mainpage package KtJet
  *
  * @author  <a href="http://www.hep.ucl.ac.uk/~jmb">J.Butterworth</a>,&nbsp;  
  *          <a href="http://www.hep.ucl.ac.uk/~jpc">J.Couchman</a>,&nbsp;
  *          <a href="http://www.apolloschildren.com/brian">B.Cox</a>,&nbsp;  
  *          <a href="http://www.hep.ucl.ac.uk/~waugh">B.Waugh</a> 
  *
- * @section intro Introduction
+@section KtJet_@section intro Introduction
  * This library package Contains the KtJet Clustering Algorithms and associated files. 
  * It has no Athena algorithms of its own and is designed to be used by other packages.
  *  
@@ -21,7 +21,7 @@
  * offline/Simulation/Atlfast/AtlfastAlgs
  *
  *<hr>
- * @section pc Package Contents
+@section KtJet_@section pc Package Contents
  * @subsection mclasses Main Classes
  *   - KtJet::KtEvent 
  *       -# KtJet/KtEvent.h
@@ -75,16 +75,16 @@
  *   - ChangeLog
  *
  * <HR>
- * @section ug Users Guide
+@section KtJet_@section ug Users Guide
  * More information can be found at
  * <a href="http://www.ktjet.org"> 
  * www.ktjet.org</a>
  * <hr>
- * @section jobOptions jobOptions
+@section KtJet_@section jobOptions jobOptions
  * None
  *
  * <hr>
- * @section requirements CMT requirements
+@section KtJet_@section requirements CMT requirements
  * @verbinclude  requirements
  */
 
diff --git a/Reconstruction/MVAUtils/doc/mainpage.h b/Reconstruction/MVAUtils/doc/packagedoc.h
similarity index 83%
rename from Reconstruction/MVAUtils/doc/mainpage.h
rename to Reconstruction/MVAUtils/doc/packagedoc.h
index 328c95b67fa2669f5bcc334d1b8ab3fd1cd99353..d5ad3aa57db12ea10dcd2348456bda5d4d9f3a6a 100644
--- a/Reconstruction/MVAUtils/doc/mainpage.h
+++ b/Reconstruction/MVAUtils/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage
+@page MVAUtils_page 
 
-@section MVAUtilsIntro Introduction
+@section MVAUtils_MVAUtilsIntro Introduction
 
 This package is meant to provide general utilities for using MVAs in
 reconstruction and analyses. The initial version extracts the
@@ -14,7 +14,7 @@ memory-efficient impementation for storing BDT trees from
 compiled with athena. It contains no tools or algorithms. It is also
 dual-use.
 
-@section MVAUtilsOverview Class Overview
+@section MVAUtils_MVAUtilsOverview Class Overview
   The MVAUtils package contains of following classes:
 
   - BDT : A memory-efficient implementation of a BDT for applying the tree (not for training).
@@ -27,15 +27,13 @@ dual-use.
 @author Ruggero Turra
 @author Bruno Lenzi
 
-@section ExtrasMVAUtils Extra Pages
+@section MVAUtils_ExtrasMVAUtils Extra Pages
  - @ref UsedMVAUtils
  - @ref RequirementsMVAUtils
 */
 /**
 @page UsedMVAUtils Used Packages
-@htmlinclude used_packages.html
 */
 /**
 @page RequirementsMVAUtils Requirements
-@include requirements
 */
diff --git a/Reconstruction/MissingETEvent/doc/mainpage.h b/Reconstruction/MissingETEvent/doc/packagedoc.h
similarity index 78%
rename from Reconstruction/MissingETEvent/doc/mainpage.h
rename to Reconstruction/MissingETEvent/doc/packagedoc.h
index 77336024ccd6ee111646222eb1933a88af9762a9..1b0c2efafdec60993017d4f75a5203cbaf6019f0 100644
--- a/Reconstruction/MissingETEvent/doc/mainpage.h
+++ b/Reconstruction/MissingETEvent/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage MissingETEvent Package
+@page MissingETEvent_page MissingETEvent Package
 
 This package contains all ETMiss data classes.  
 
 @author Silvia.Resconi@cern.ch
 
-@section MissingETEventIn Introduction
+@section MissingETEvent_MissingETEventIn Introduction
 
 The EDM is made of few and general classes that use enumerators to specialize 
 data. This is suitable for ETMiss data, permits to minimize the number
@@ -18,9 +18,7 @@ of data classes and gives flexibilty to the architecture.
 
 The basic unit of ETMiss is made of the three vector: ExMiss, EyMiss, SumET. 
 
-@include requirements
 
-@htmlinclude used_packages.html
 
 
 
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/mainpage.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/packagedoc.h
similarity index 70%
rename from Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/mainpage.h
rename to Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/packagedoc.h
index 1415e5b8d08b60c0d3c60fa1907ebd8998cb8c73..f194331cb046e000366909460c95df594bb81f2c 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/mainpage.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 /**
-@mainpage The CaloTrkMuIdTools Package
+@page CaloTrkMuIdTools_page The CaloTrkMuIdTools Package
 
 @author Gustavo Ordonez Sanz <Gustavo.Ordonez.Sanz@cern.ch>
 
-@section CaloTrkMuIdToolsIntroduction Introduction
+@section CaloTrkMuIdTools_CaloTrkMuIdToolsIntroduction Introduction
 	Athena package containing several AlgTools for retrieving tagging muons using energy deposits in the calorimeter.
 
-@section CaloMuonLikeLihoodToolIntroduction CaloMuonLikelihoodTool
+@section CaloTrkMuIdTools_CaloMuonLikeLihoodToolIntroduction CaloMuonLikelihoodTool
 	AlgTool for Muon Identification in the Calorimeter.
 	Builds likelihood ratio discriminant using distribution 
 	of energy ratios for muons and pions.
 
-@section CaloMuonTagIntroduction CaloMuonTag
+@section CaloTrkMuIdTools_CaloMuonTagIntroduction CaloMuonTag
 	Muon tagger using calorimeter deposits.
 	A track is tagged when deposits above the noise treshold are found in the 
 	last three layers of the hadronic calorimeters (TileBar, TileExt and HEC).
@@ -23,15 +23,14 @@
 	Upper cuts in the EM calorimeter are applied to provide a veto against punch-through electrons.
 	All cuts are configurable.
 
-@section TrackDepositInCaloToolIntroduction TrackDepositInCaloTool
+@section CaloTrkMuIdTools_TrackDepositInCaloToolIntroduction TrackDepositInCaloTool
 	Tool for retrieving calorimeter deposits associated to a track (given by Trk::TrackParameters*) 	
 
-@section CaloTrkMuIdToolsShare jobOptions
+@section CaloTrkMuIdTools_CaloTrkMuIdToolsShare jobOptions
   The tools can be steered through jobOptions. The default configuration that is being employed for standard reconstruction is 
   set up by the jobOptions found in share. 
 
-@section requirements Requirements
-@include requirements
+@section CaloTrkMuIdTools_requirements Requirements
 
 */
 
diff --git a/Reconstruction/MuonIdentification/MuGirlGlobalFit/doc/mainpage.h b/Reconstruction/MuonIdentification/MuGirlGlobalFit/doc/packagedoc.h
similarity index 63%
rename from Reconstruction/MuonIdentification/MuGirlGlobalFit/doc/mainpage.h
rename to Reconstruction/MuonIdentification/MuGirlGlobalFit/doc/packagedoc.h
index 4769df86d76f2ee946bd7ae5b91fb5001daa2331..d86aa45c2c7b1807c5c4c187174104d96459a64b 100644
--- a/Reconstruction/MuonIdentification/MuGirlGlobalFit/doc/mainpage.h
+++ b/Reconstruction/MuonIdentification/MuGirlGlobalFit/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage MuGirlGlobalFit Package
+@page MuGirlGlobalFit_page MuGirlGlobalFit Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Silvia Behar Harpaz <silbehar@tx.technion.ac.il>
 
-@section MuGirlGlobalFitIntro Introduction
+@section MuGirlGlobalFit_MuGirlGlobalFitIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section MuGirlGlobalFitReq Requirements
+@section MuGirlGlobalFit_MuGirlGlobalFitReq Requirements
 
-@include requirements
 
 */
diff --git a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/doc/mainpage.h b/Reconstruction/MuonIdentification/MuGirlPerformanceTools/doc/packagedoc.h
similarity index 56%
rename from Reconstruction/MuonIdentification/MuGirlPerformanceTools/doc/mainpage.h
rename to Reconstruction/MuonIdentification/MuGirlPerformanceTools/doc/packagedoc.h
index eb8a2471acf6cb3398ec7eeb1e302cf1a4e5c4a1..3b696a22db4344bd95b9ab613c115df9d3494eeb 100644
--- a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/doc/mainpage.h
+++ b/Reconstruction/MuonIdentification/MuGirlPerformanceTools/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage MuGirlPerformanceTools Package
+@page MuGirlPerformanceTools_page MuGirlPerformanceTools Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Zvi Tarem <Zvi.Tarem@cern.ch>
 
-@section MuGirlPerformanceToolsIntro Introduction
+@section MuGirlPerformanceTools_MuGirlPerformanceToolsIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section MuGirlPerformanceToolsReq Requirements
+@section MuGirlPerformanceTools_MuGirlPerformanceToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/doc/mainpage.h b/Reconstruction/MuonIdentification/MuidCaloEnergyTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from Reconstruction/MuonIdentification/MuidCaloEnergyTools/doc/mainpage.h
rename to Reconstruction/MuonIdentification/MuidCaloEnergyTools/doc/packagedoc.h
index 7841a123c3579c3eb506b0981503af1a039be2b5..7edae0d64f3df079201d5ca100fc0907169004db
--- a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/doc/mainpage.h
+++ b/Reconstruction/MuonIdentification/MuidCaloEnergyTools/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage MuidCaloEnergyTools Package
+@page MuidCaloEnergyTools_page MuidCaloEnergyTools Package
 
 Package providing estimate of the muon energy loss upstream the muon spectrometer. The estimation can be based either on a parametrization, on the calorimeter measurement, or, by default, a combination of the two (known as the "hybrid method"). In the case where the calorimeter measurement is used, muon (calorimeter and track) isolation issues are taken into account. Detailed information has been published: K. Nikolopoulos, D. Fassouliotis, C. Kourkoumelis, and A. Poppleton, "Event-by-Event Estimate of Muon Energy Loss in ATLAS", IEEE Trans. Nucl. Sci., vol. 54, no. 5, pt. 2, pp. 1792-1796, Oct. 2007 [also ATL-MUON-PUB-2007-002].
 
@@ -30,11 +30,9 @@ The package contains three AlgTools:
 
 /**
 @page UsedMuidCaloEnergyTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuidCaloEnergyTools Requirements
-@include requirements
 */
 
diff --git a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/doc/mainpage.h b/Reconstruction/MuonIdentification/MuidCaloIsolationTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Reconstruction/MuonIdentification/MuidCaloIsolationTools/doc/mainpage.h
rename to Reconstruction/MuonIdentification/MuidCaloIsolationTools/doc/packagedoc.h
index 5488ef2fbfa7e70487915785f5457f3c160a368f..3d6f0838bb2e89ebb3e059284937d6e1771260a7
--- a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/doc/mainpage.h
+++ b/Reconstruction/MuonIdentification/MuidCaloIsolationTools/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage MuidCaloIsolationTools Package
+@page MuidCaloIsolationTools_page MuidCaloIsolationTools Package
 
 contains the @ref Rec::MuidTrackIsolation tool for estimating the number and summed momentum of inner detector tracks in a given cone around the muon track i.e. the track isolation of the muon. The isolation can be evaluated either at the production vertex or around the muon intersection with the calorimeter.
 
@@ -22,10 +22,8 @@ Track isolation is used by the @ref MuidCaloEnergyTool (MuidCaloEnergyTools pack
 
 /**
 @page UsedMuidCaloIsolationTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuidCaloIsolationTools Requirements
-@include requirements
 */
diff --git a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/doc/mainpage.h b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from Reconstruction/MuonIdentification/MuidCaloScatteringTools/doc/mainpage.h
rename to Reconstruction/MuonIdentification/MuidCaloScatteringTools/doc/packagedoc.h
index 6e8ffc12f4eaf0f03f2be2929736e298350018e5..9e0e4f339fcc1fc1f74f9a7ca2329fca86e40e1b
--- a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/doc/mainpage.h
+++ b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage MuidCaloScatteringTools Package
+@page MuidCaloScatteringTools_page MuidCaloScatteringTools Package
 
 This package provides the multiple scattering information for muon tracks upstream the muon spectrometer necessary during the muon track extrapolation from the muon spectrometer entrance to the production vertex and during the combined muon fit. The calorimeter material is modeled using two scattering centers along the muon track. If the material distribution was uniform, the two scaterring centers would have been placed symmetrically around the middle plane of the material in a distance (from this plane) of 1./sqrt(12.) of the total thickness (rms of a uniform distribution). Since this is not the case for the material upstream the muon spectrometer, the middle plane is located at middle of total material thickness , while the rms is calcualted by weighting the material thickness by the inverse of its radiation length.
 
 @author Alan.Poppleton@cern.ch
 @author Konstantinos.Nikolopoulos@cern.ch
 
-@section IntroductionMuidCaloScatteringTools Introduction
+@section MuidCaloScatteringTools_IntroductionMuidCaloScatteringTools Introduction
 
 This package contains two AlgTools:
 
@@ -24,11 +24,9 @@ MuidCaloMaterialParam : Contains a model/parametrization of the calorimeter mate
 
 /**
 @page UsedMuidCaloScatteringTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuidCaloScatteringTools Requirements
-@include requirements
 */
 
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/doc/mainpage.h b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/doc/packagedoc.h
similarity index 54%
rename from Reconstruction/MuonIdentification/MuonCombinedTimingTools/doc/mainpage.h
rename to Reconstruction/MuonIdentification/MuonCombinedTimingTools/doc/packagedoc.h
index 8ddd7189fc56281c709748648159d038d4e27fe4..3e75e6ba34239e2d46c76f799656df6b093bcd48 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/doc/mainpage.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage MuonCombinedTimingTools Package
+@page MuonCombinedTimingTools_page MuonCombinedTimingTools Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Wolfgang Liebig <->
 
-@section MuonCombinedTimingToolsIntro Introduction
+@section MuonCombinedTimingTools_MuonCombinedTimingToolsIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section MuonCombinedTimingToolsReq Requirements
+@section MuonCombinedTimingTools_MuonCombinedTimingToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/Reconstruction/MuonIdentification/MuonCombinedToolInterfaces/doc/mainpage.h b/Reconstruction/MuonIdentification/MuonCombinedToolInterfaces/doc/packagedoc.h
similarity index 88%
rename from Reconstruction/MuonIdentification/MuonCombinedToolInterfaces/doc/mainpage.h
rename to Reconstruction/MuonIdentification/MuonCombinedToolInterfaces/doc/packagedoc.h
index 30c07d35753e23e9349a06239d7d2fc04af7d4f4..e25ceeb477b01f2481288719f84fe57ed7b86871 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedToolInterfaces/doc/mainpage.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedToolInterfaces/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage MuonCombinedToolInterfaces Package
+@page MuonCombinedToolInterfaces_page MuonCombinedToolInterfaces Package
 
 This package contains abstract interfaces for two types of common tool
 in combined muon reconstruction: interfaces for modules of the
@@ -13,7 +13,7 @@ Concrete implementations can be found in each leaf package.
 
 @author ATLAS Muon Combined Performance Group
 
-@section MuonCombinedToolInterfacesList List of Defined Interfaces
+@section MuonCombinedToolInterfaces_MuonCombinedToolInterfacesList List of Defined Interfaces
 
 Abstract interfaces for the following combined reconstruction tasks are defined:
 
@@ -34,7 +34,7 @@ Abstract interfaces for the following muon evaluation tasks are defined:
 
 This package is not built as any library, it is a simple include package.   
 
-@section ExtrasMuCombToolInterfaces Extra Pages
+@section MuonCombinedToolInterfaces_ExtrasMuCombToolInterfaces Extra Pages
 
  - @ref UsedMuCombToolInterfaces
  - @ref requirementsMuCombToolInterfaces
@@ -42,12 +42,10 @@ This package is not built as any library, it is a simple include package.
 
 /**
 @page UsedMuCombToolInterfaces Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsMuCombToolInterfaces Requirements
-@include requirements
 */
 
 
diff --git a/Reconstruction/MuonIdentification/muonEvent/doc/mainpage.h b/Reconstruction/MuonIdentification/muonEvent/doc/packagedoc.h
similarity index 93%
rename from Reconstruction/MuonIdentification/muonEvent/doc/mainpage.h
rename to Reconstruction/MuonIdentification/muonEvent/doc/packagedoc.h
index 0ed3c0dd0846ddf0b33734d18f40980b92d2785f..9a67340f7e8fbee5789220b6acb75c42ae77a44c 100644
--- a/Reconstruction/MuonIdentification/muonEvent/doc/mainpage.h
+++ b/Reconstruction/MuonIdentification/muonEvent/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage Package providing the Muon object for combined reconstruction and physics analysis
+@page muonEvent_page Package providing the Muon object for combined reconstruction and physics analysis
 
  - This package contains the ATLAS muon EDM class, Analysis::Muon.
    Using a flexible author/content scheme it describes the identification
@@ -44,7 +44,7 @@
  - Responsible: ATLAS Muon Combined Performance Working Group <br>
    atlas-perf-muons-conveners (at) cern.ch
 
-@section ExtrasMuonEvent CMT and Dependency Description
+@section muonEvent_ExtrasMuonEvent CMT and Dependency Description
 
  - @ref UsedMuonEvent
  - @ref RequirementsMuonEvent
@@ -52,11 +52,9 @@
 
 /**
 @page UsedMuonEvent Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsMuonEvent Requirements
-@include requirements
 */
 
diff --git a/Reconstruction/PanTau/PanTauAlgs/doc/mainpage.h b/Reconstruction/PanTau/PanTauAlgs/doc/packagedoc.h
similarity index 88%
rename from Reconstruction/PanTau/PanTauAlgs/doc/mainpage.h
rename to Reconstruction/PanTau/PanTauAlgs/doc/packagedoc.h
index e4e3725bf4485c16e46b60628b7267ad43582bf8..4990a98c67c9bec1d2ce1cfc1f4d1f7aac470a7b 100644
--- a/Reconstruction/PanTau/PanTauAlgs/doc/mainpage.h
+++ b/Reconstruction/PanTau/PanTauAlgs/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage PanTauAlgs Package
+@page PanTauAlgs_page PanTauAlgs Package
 
 This package contains algorithms for PanTau.
 
 @author Peter Wienemann <peter.wienemann@cern.ch>
 @author Sebastian Fleischmann <Sebastian.Fleischmann@cern.ch>
 
-@section PanTauAlgsIntro Introduction
+@section PanTauAlgs_PanTauAlgsIntro Introduction
 
  The PanTauAlgs package contains the following algorithms:
 
@@ -27,7 +27,7 @@ This package contains algorithms for PanTau.
      - PanTau::TauJetFeatureExtractionTool :  extract TauFeature (jet shapes)
      - PanTau::TauKinematicFitTool  : kinematic fit of eflow momenta to decay modes
 
-     @section ExtrasPanTauA Extra Pages
+@section PanTauAlgs_ExtrasPanTauA Extra Pages
 
       - @ref UsedPanTauAlgs
       - @ref requirementsPanTauAlgs
@@ -35,10 +35,8 @@ This package contains algorithms for PanTau.
 
 /**
  * @page UsedPanTauAlgs Used Packages
- * @htmlinclude used_packages.html
  * */
 
 /**
  * @page requirementsPanTauAlgs Requirements
- * @include requirements
  * */
diff --git a/Reconstruction/PanTau/PanTauEvent/doc/mainpage.h b/Reconstruction/PanTau/PanTauEvent/doc/packagedoc.h
similarity index 80%
rename from Reconstruction/PanTau/PanTauEvent/doc/mainpage.h
rename to Reconstruction/PanTau/PanTauEvent/doc/packagedoc.h
index 491d6b488c80f87ddc9e51e397c2987d1410a157..bd91443bc6b6549472bbb90209e488558b6a7a98 100644
--- a/Reconstruction/PanTau/PanTauEvent/doc/mainpage.h
+++ b/Reconstruction/PanTau/PanTauEvent/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
- * @mainpage The PanTauEvent package
+@page PanTauEvent_page @mainpage The PanTauEvent package
  * The EDM class package for PanTau.
  *
  * @author Sebastian.Fleischmann@cern.ch
  *
- * @section introductionPanTauEvent Introduction
+@section PanTauEvent_@section introductionPanTauEvent Introduction
  *
  * This package contains the data classes for PanTau.
  *
- * @section PanTauOverview Class Overview
+@section PanTauEvent_@section PanTauOverview Class Overview
  *   The PanTauEvent package contains the following classes:
  *
  *     - PanTau::TauSeed : Seed for PanTau
@@ -23,7 +23,7 @@
  *     - PanTau::PanTauDetails : Adds PanTau specific data to a TauJet (inherits from TauDetails)
  *     - PanTau::CandTruthMap : Map from TauJet to TruthTau
  *
- *     @section ExtrasPanTauEvent Extra Pages
+@section PanTauEvent_@section ExtrasPanTauEvent Extra Pages
  *
  *      - @ref UsedPanTauEvent
  *      - @ref requirementsPanTauEvent
@@ -31,10 +31,8 @@
 
 /**
  * @page UsedPanTauEvent Used Packages
- * @htmlinclude used_packages.html
  * */
 
 /**
  * @page requirementsPanTauEvent Requirements
- * @include requirements
  * */
diff --git a/Reconstruction/PanTau/PanTauExample/doc/mainpage.h b/Reconstruction/PanTau/PanTauExample/doc/packagedoc.h
similarity index 65%
rename from Reconstruction/PanTau/PanTauExample/doc/mainpage.h
rename to Reconstruction/PanTau/PanTauExample/doc/packagedoc.h
index 3ff6726554b737d1a4924ee25b9956b17c71664c..46c01e26c2a87990167a050241ce1e4fbe795a29 100644
--- a/Reconstruction/PanTau/PanTauExample/doc/mainpage.h
+++ b/Reconstruction/PanTau/PanTauExample/doc/packagedoc.h
@@ -3,19 +3,18 @@
 */
 
 /**
-@mainpage PanTauExample Package
+@page PanTauExample_page PanTauExample Package
 
 This package contains job option fragments for PanTau.
 
 @author Peter Wienemann <peter.wienemann@cern.ch>
 @author Sebastian Fleischmann <Sebastian.Fleischmann@cern.ch>
 
-@section PanTauExampleIntro Introduction
+@section PanTauExample_PanTauExampleIntro Introduction
 
 Job option fragments for PanTau.
 
-@section PanTauExampleReq Requirements
+@section PanTauExample_PanTauExampleReq Requirements
 
-@include requirements
 
 */
diff --git a/Reconstruction/PanTau/PanTauInterfaces/doc/mainpage.h b/Reconstruction/PanTau/PanTauInterfaces/doc/packagedoc.h
similarity index 66%
rename from Reconstruction/PanTau/PanTauInterfaces/doc/mainpage.h
rename to Reconstruction/PanTau/PanTauInterfaces/doc/packagedoc.h
index 86cad7d0642f5487ba1f85baa57b3ce269092877..b1a5d5eeb82f67d8a3de88c84b77b3c0ee1e4ce1 100644
--- a/Reconstruction/PanTau/PanTauInterfaces/doc/mainpage.h
+++ b/Reconstruction/PanTau/PanTauInterfaces/doc/packagedoc.h
@@ -3,21 +3,21 @@
 */
 
 /**
- * @mainpage The PanTauInterfaces package
+@page PanTauInterfaces_page @mainpage The PanTauInterfaces package
  * The interface package for PanTau.
  *
  * @author Sebastian.Fleischmann@cern.ch
  *
- * @section introductionPanTauInterfaces Introduction
+@section PanTauInterfaces_@section introductionPanTauInterfaces Introduction
  *
  * This package contains the interfaces for PanTau.
  *
- * @section PanTauInterfacesOverview Class Overview
+@section PanTauInterfaces_@section PanTauInterfacesOverview Class Overview
  *   The PanTauInterfaces package contains the following classes:
  *
  *     - PanTau::ITauSeedTruthMatchTool : Match TauSeeds to truth taus.
  *
- *     @section ExtrasPanTauInterfaces Extra Pages
+@section PanTauInterfaces_@section ExtrasPanTauInterfaces Extra Pages
  *
  *      - @ref UsedPanTauInterfaces
  *      - @ref requirementsPanTauInterfaces
@@ -25,10 +25,8 @@
 
 /**
  * @page UsedPanTauInterfaces Used Packages
- * @htmlinclude used_packages.html
  * */
 
 /**
  * @page requirementsPanTauInterfaces Requirements
- * @include requirements
  * */
diff --git a/Reconstruction/PanTau/PanTauUtils/doc/mainpage.h b/Reconstruction/PanTau/PanTauUtils/doc/packagedoc.h
similarity index 69%
rename from Reconstruction/PanTau/PanTauUtils/doc/mainpage.h
rename to Reconstruction/PanTau/PanTauUtils/doc/packagedoc.h
index 6735378a71f5be19100144fb4c9053b7e3dce48c..5f405d869f53513bdf60915fcbef5a85b8ca0499 100644
--- a/Reconstruction/PanTau/PanTauUtils/doc/mainpage.h
+++ b/Reconstruction/PanTau/PanTauUtils/doc/packagedoc.h
@@ -3,21 +3,21 @@
 */
 
 /**
- * @mainpage The PanTauUtils package
+@page PanTauUtils_page @mainpage The PanTauUtils package
  * The utils package for PanTau.
  *
  * @author Sebastian.Fleischmann@cern.ch
  *
- * @section introductionPanTauUtils Introduction
+@section PanTauUtils_@section introductionPanTauUtils Introduction
  *
  * This package contains the utility classes for PanTau.
  *
- * @section PanTauUtilsOverview Class Overview
+@section PanTauUtils_@section PanTauUtilsOverview Class Overview
  *   The PanTauUtils package contains the following classes:
  *
  *     - PanTau::TauClassificationUtility : Classifies TauSeeds and TruthTaus
  *
- *     @section ExtrasPanTauUtils Extra Pages
+@section PanTauUtils_@section ExtrasPanTauUtils Extra Pages
  *
  *      - @ref UsedPanTauUtils
  *      - @ref requirementsPanTauUtils
@@ -25,10 +25,8 @@
 
 /**
  * @page UsedPanTauUtils Used Packages
- * @htmlinclude used_packages.html
  * */
 
 /**
  * @page requirementsPanTauUtils Requirements
- * @include requirements
  * */
diff --git a/Reconstruction/Particle/doc/mainpage.h b/Reconstruction/Particle/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from Reconstruction/Particle/doc/mainpage.h
rename to Reconstruction/Particle/doc/packagedoc.h
index 974b26df39fdc46f46812a80d73888f23a1ff36e..9d9eab85bed1fa624fdd8118b852efffe33ffd67
--- a/Reconstruction/Particle/doc/mainpage.h
+++ b/Reconstruction/Particle/doc/packagedoc.h
@@ -3,25 +3,25 @@
 */
 
 /**
-@mainpage Particle
+@page Particle_page Particle
 
 @author Andreas.Wildauer@cern.ch, Fredrik.Akesson@cern.ch
 
-@section introduction Introduction:
+@section Particle_introduction Introduction:
 Particle is a first version of a "more than a track" object. It provides the user
 with a particle which has (or has not) a track, a vertex, an origin (type of vertex)
 and a charge. It is meant as an interface between the reconstruction
 world an physics. All algorithms after the particle creation (i.e. JetFinder, b-tagging, ...) should
 run on TrackParticle(s) instead of Trk::Track(s) directly.
 
-@section creation TrackParticle Creation
+@section Particle_creation TrackParticle Creation
 To create TrackParticles one should <b>not</b> use the TrackParticle constructors but the TrkParticleCreator tool which
 is located in Tracking/TrkTools/TrkParticleCreator. The reason for that is that the tool always attempts to create
 an as complete TrackParticle as possible. E.g. if your input track does not have a perigee, the tool will notice and will use
 the TrkExtrapolator package to calculate a perigee. For info on how to use the TrkParticleCreator tool have a look
 at one of its clients: InDetParticleCreation.
 
-@section general TrackParticle in general
+@section Particle_general TrackParticle in general
 If TrackParticle is used not only as input but also as output (i.e. objects of TrackParticle
 are created by an algorithm), please consider the following:<br>
 <p>The datamembers m_originalTrack and m_reconstructedVertex are pointer datamembers to
@@ -36,7 +36,7 @@ must not be deleted by the destructor of TrackParticle. This would cause Athena
 <b>Summary:</b> If you construct your own TrackParticle in one of your algorithms and you use
 <b>new</b> statements to pass a vertex or a track, be sure you <b>delete</b> them at the end.
 
-@section innerdetector TrackParticle in InnerDetector
+@section Particle_innerdetector TrackParticle in InnerDetector
 In InnerDetector software the TrackParticle is created by InDetParticleCreation after
 the primary vertex reconstruction. In that case it always has a pointer to a track,
 a pointer to a vertex and the info of the vertex type. The vertex pointer <b>always</b>
@@ -46,12 +46,12 @@ the value Rec::PriVtx. If the track was not used in the primary vertex fit this
 enum has the value Rec::NoVtx. The StoreGate key for the ID TrackParticleContainer is "TrackParticleCandidate".
 
 
-@section packagecontent Package Contents:
+@section Particle_packagecontent Package Contents:
 Particle contains the following files/classes:
  - TrackParticle.cxx ... the TrackParticle itself.
  - TrackParticleContainer.cxx ... container to store TrackParticle(s) in StoreGate.
 
-@section ExtraPages Extra Pages
+@section Particle_ExtraPages Extra Pages
  - @ref UsedParticle
  - @ref RequirementsParticle
 
@@ -59,10 +59,8 @@ Particle contains the following files/classes:
 
 /**
 @page UsedParticle Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsParticle Requirements
-@include requirements
 */
diff --git a/Reconstruction/ParticleTruth/doc/mainpage.h b/Reconstruction/ParticleTruth/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from Reconstruction/ParticleTruth/doc/mainpage.h
rename to Reconstruction/ParticleTruth/doc/packagedoc.h
index b7ece79f5c53263a285578deb65c1fb0804ad9e4..fb2f36f821d3c07c60bd2f7d2fccbaa3c7520a48
--- a/Reconstruction/ParticleTruth/doc/mainpage.h
+++ b/Reconstruction/ParticleTruth/doc/packagedoc.h
@@ -3,26 +3,24 @@
 */
 
 /**
-@mainpage ParticleTruth
+@page ParticleTruth_page ParticleTruth
 
 @author Andreas.Wildauer@cern.ch
 
-@section introduction Introduction:
+@section ParticleTruth_introduction Introduction:
 This package provides truth (association) classes for the TrackParticle in Particle.
 Files were moved from the Particle package to here.
 
-@section packagecontent Package Contents:
+@section ParticleTruth_packagecontent Package Contents:
 ParticleTruth contains the following files/classes:
 - TrackParticleTruth.cxx ... contains a HepMcParticle which provides a link to a GenParticle from MC truth.
 - TrackParticleTruthCollection.cxx ... container for the TrackParticleTruth objects. It does not inherit from DataVector< TrackParticle > but from map. The key of the map is a pointer to a TrackParticle with which you can retrieve the associated TrackParticleTruth object.
 - TrackParticleTruthCollectionContainer ... container of the TrackParticleTruthCollection used in the trigger navigation.
 - TrackParticleTruthVector.cxx ... an object necessary for custom converters (ignore it).
 
-@section used_packagesParticleTruth used packages
-@htmlinclude used_packages.html
+@section ParticleTruth_used_packagesParticleTruth used packages
 
-@section requirements Requirements
-@include requirements
+@section ParticleTruth_requirements Requirements
 
 @namespace Rec Namespace of the ParticleTruth package.
 */
diff --git a/Reconstruction/RecExample/RecExAlgs/doc/mainpage.h b/Reconstruction/RecExample/RecExAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 67%
rename from Reconstruction/RecExample/RecExAlgs/doc/mainpage.h
rename to Reconstruction/RecExample/RecExAlgs/doc/packagedoc.h
index 7dcb2a5da72c9f7fd666b1208ef1b9682279ca01..bfb87a476a73246e1449b6d9b962acc01b92c842
--- a/Reconstruction/RecExample/RecExAlgs/doc/mainpage.h
+++ b/Reconstruction/RecExample/RecExAlgs/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage RecExAlgs Package
+@page RecExAlgs_page RecExAlgs Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author David Rousseau <rousseau@lal.in2p3.fr>
 
-@section RecExAlgsIntro Introduction
+@section RecExAlgs_RecExAlgsIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section RecExAlgsReq Requirements
+@section RecExAlgs_RecExAlgsReq Requirements
 
-@include requirements
 
 */
diff --git a/Reconstruction/RecExample/RecExConfig/doc/mainpage.h b/Reconstruction/RecExample/RecExConfig/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Reconstruction/RecExample/RecExConfig/doc/mainpage.h
rename to Reconstruction/RecExample/RecExConfig/doc/packagedoc.h
index 07c26173ee9a996d6697e42f3f67c2d8928cd688..ffbe85b51c743a7eb2d0c76eb37b691e7f67927c
--- a/Reconstruction/RecExample/RecExConfig/doc/mainpage.h
+++ b/Reconstruction/RecExample/RecExConfig/doc/packagedoc.h
@@ -5,13 +5,13 @@
 /**
 
 
-@mainpage RecExConfig Package
+@page RecExConfig_page RecExConfig Package
 
-@section IntroductionRecExConfig Introduction
+@section RecExConfig_IntroductionRecExConfig Introduction
 
 This package holds a number of simple python modules which are used to configure Reconstruction. 
 
-@section OverviewRecExConfig Class Overview
+@section RecExConfig_OverviewRecExConfig Class Overview
  The RecExConfig package containes the following python modules:
    - python::RecFlags holds reconstruction specific flags (see <a href="https://twiki.cern.ch/twiki/bin/view/Atlas/RecExCommonFlags#RecFlags">the following twiki</a> ). 
    - python::RecAlgsFlags holds reconstruction algorithm switches (see <a href="https://twiki.cern.ch/twiki/bin/view/Atlas/RecExCommonFlags#RecAlgsFlags">the following twiki</a> ).
diff --git a/Reconstruction/RecJiveXML/doc/mainpage.h b/Reconstruction/RecJiveXML/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Reconstruction/RecJiveXML/doc/mainpage.h
rename to Reconstruction/RecJiveXML/doc/packagedoc.h
index 5547ca32c400f2db817a7a52fdb0ec2ba981b304..5667a210faf177b2b95e8566e8842c4be448f79b
--- a/Reconstruction/RecJiveXML/doc/mainpage.h
+++ b/Reconstruction/RecJiveXML/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page RecJiveXML_page 
 @author Nikos.Konstantinidis -at- cern.ch, Eric.Jansen -at- hef.ru.nl, Juergen.Thomas -at- cern.ch
-@section IntroRecoJiveXML Introduction
+@section RecJiveXML_IntroRecoJiveXML Introduction
 
 This package contains the AlgToos that produce the XML fragments of Rconstruction related datatypes for the XML files read by atlantis.
 The AlgTools, which inheriting from JiveXML::DataRetriever, are the following:
@@ -18,8 +18,6 @@ The AlgTools, which inheriting from JiveXML::DataRetriever, are the following:
       - StoreGateKey : ( default "MET_Final" ) the StoreGate key of the missing Et that is displayed by default in atlantis.
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Reconstruction/RecoTools/CaloRingerTools/doc/mainpage.h b/Reconstruction/RecoTools/CaloRingerTools/doc/packagedoc.h
similarity index 74%
rename from Reconstruction/RecoTools/CaloRingerTools/doc/mainpage.h
rename to Reconstruction/RecoTools/CaloRingerTools/doc/packagedoc.h
index c59ebecc0a62a4248a822e592273ebfc643ceeea..03249543b9d76ddc8ee24d4fe2eeec5af72084e5 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/doc/mainpage.h
+++ b/Reconstruction/RecoTools/CaloRingerTools/doc/packagedoc.h
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-@mainpage The Calorimeter Ringer Tools
+@page CaloRingerTools_page The Calorimeter Ringer Tools
 
  - This package contains the Tools used by Reconstruction/RecoAlgs/CaloRingerAlgs to retrieve
  particles and build the CaloRings information for them. The particles it is able to build CaloRings
@@ -11,11 +11,9 @@
 
  - For questions or comments: Werner S. Freund <wsfreund@cern.ch>
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section CaloRingerTools_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section CaloRingerTools_requirements Requirements
 
 */
 
diff --git a/Reconstruction/RecoTools/IEnergyDepositionTool/doc/mainpage.h b/Reconstruction/RecoTools/IEnergyDepositionTool/doc/packagedoc.h
similarity index 74%
rename from Reconstruction/RecoTools/IEnergyDepositionTool/doc/mainpage.h
rename to Reconstruction/RecoTools/IEnergyDepositionTool/doc/packagedoc.h
index 90a9370c88ade644aacec0a723c477be110a60fc..df4a7395e4f0da15c3b059fbd6301061d514b3f7 100644
--- a/Reconstruction/RecoTools/IEnergyDepositionTool/doc/mainpage.h
+++ b/Reconstruction/RecoTools/IEnergyDepositionTool/doc/packagedoc.h
@@ -3,26 +3,26 @@
 */
 
 /**
-@mainpage IEnergyDepositionTool Package
+@page IEnergyDepositionTool_page IEnergyDepositionTool Package
 
 This package contains a simple interface for tools that measure
 energy depositions in the calorimeter around a track.
 
 @author David.Lopez@cern.ch
 
-@section IntroductionIEnergyDepositionTool Introduction
+@section IEnergyDepositionTool_IntroductionIEnergyDepositionTool Introduction
 
 Measuring energy depositions around a track has several applications.
 This package contains an interface to perform this measurement.
 The interface is simplified as much as possible to make it easy for
 different existing tools to adjust to it.
 
-@section OverviewIEnergyDepositionTool Class Overview
+@section IEnergyDepositionTool_OverviewIEnergyDepositionTool Class Overview
 This package contains a single interface IAlgTool:
   - <b> IEnergyDepositionTool<\b>. Simple interface to measure
   energy depositions in the calorimeter around an input track.
 
-@section ExtrasIEnergyDepositionTool Extra Pages
+@section IEnergyDepositionTool_ExtrasIEnergyDepositionTool Extra Pages
 
  - @ref UsedIEnergyDepositionTool
  - @ref RequirementsIEnergyDepositionTool
@@ -30,10 +30,8 @@ This package contains a single interface IAlgTool:
 
 /**
 @page UsedIEnergyDepositionTool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsIEnergyDepositionTool Requirements
-@include requirements
 */
diff --git a/Reconstruction/RecoTools/IsolationTool/doc/mainpage.h b/Reconstruction/RecoTools/IsolationTool/doc/packagedoc.h
similarity index 83%
rename from Reconstruction/RecoTools/IsolationTool/doc/mainpage.h
rename to Reconstruction/RecoTools/IsolationTool/doc/packagedoc.h
index 1fb9f11446b706a64edd6bc3a92157c3d5a6b30c..a58467e7389a78473022f9386e3c6b1c11b9daa8 100644
--- a/Reconstruction/RecoTools/IsolationTool/doc/mainpage.h
+++ b/Reconstruction/RecoTools/IsolationTool/doc/packagedoc.h
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-@mainpage The Track Isolation Tools
+@page IsolationTool_page The Track Isolation Tools
 
  - A package with base implementations to calculate the track isolation et() given a TrackParticle and a 
 delta R, or a Calorimeter isolation et() given an INavigable4Momentum (electron, photon, muon) and a delta R. 
@@ -16,11 +16,9 @@ base implementation is overwritten in derived class in the package Reconstructio
  - For questions or comments: Ketevi A. Assamagan
    ketevi@bnl.gov
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section IsolationTool_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section IsolationTool_requirements Requirements
 
 */
 
diff --git a/Reconstruction/RecoTools/RecoToolInterfaces/doc/mainpage.h b/Reconstruction/RecoTools/RecoToolInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from Reconstruction/RecoTools/RecoToolInterfaces/doc/mainpage.h
rename to Reconstruction/RecoTools/RecoToolInterfaces/doc/packagedoc.h
index 51eb4a9942f0cf0b309d0ea846f4223813fca2eb..51d57d394be07999eb018d37d04a3eb2bc60b49f
--- a/Reconstruction/RecoTools/RecoToolInterfaces/doc/mainpage.h
+++ b/Reconstruction/RecoTools/RecoToolInterfaces/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage RecoToolInterfaces Package
+@page RecoToolInterfaces_page RecoToolInterfaces Package
 
 This package contains abstract interfaces for common reconstruction tools.
 Concrete implementations can be found in each leaf package.
 
 @author Reconstruction Software Group
 
-@section RecoToolInterfacesList List of Defined Interfaces
+@section RecoToolInterfaces_RecoToolInterfacesList List of Defined Interfaces
 
 Abstract interfaces for the following combined reconstruction tasks are defined:
 
@@ -24,7 +24,7 @@ Abstract interfaces for the following combined reconstruction tasks are defined:
 
 This package is not built as any library, it is a simple include package.   
 
-@section ExtrasRecoToolInterfaces Extra Pages
+@section RecoToolInterfaces_ExtrasRecoToolInterfaces Extra Pages
 
  - @ref UsedRecoToolInterfaces
  - @ref requirementsRecoToolInterfaces
@@ -32,11 +32,9 @@ This package is not built as any library, it is a simple include package.
 
 /**
 @page UsedRecoToolInterfaces Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsRecoToolInterfaces Requirements
-@include requirements
 */
 
diff --git a/Reconstruction/RecoTools/TrackToCalo/doc/mainpage.h b/Reconstruction/RecoTools/TrackToCalo/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 73%
rename from Reconstruction/RecoTools/TrackToCalo/doc/mainpage.h
rename to Reconstruction/RecoTools/TrackToCalo/doc/packagedoc.h
index 5f70ef7498b78ee990810c4e074319ff3ace49eb..28db15f2251ac7812a5216c6a34d1c1197b3dc44
--- a/Reconstruction/RecoTools/TrackToCalo/doc/mainpage.h
+++ b/Reconstruction/RecoTools/TrackToCalo/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage TrackToCalo Package
+@page TrackToCalo_page TrackToCalo Package
 
 This package contains tools and algorithms to extrapolate tracks and truth particles into the calorimeter.
 
 @author Reconstruction Software Group
 
-@section TrackToCaloClassList List of classes
+@section TrackToCalo_TrackToCaloClassList List of classes
 
 The following classes are defined in this package:
 
@@ -17,7 +17,7 @@ The following classes are defined in this package:
 
 
 
-@section ExtrasTrackToCalo Extra Pages
+@section TrackToCalo_ExtrasTrackToCalo Extra Pages
 
  - @ref UsedTrackToCalo
  - @ref requirementsTrackToCalo
@@ -25,11 +25,9 @@ The following classes are defined in this package:
 
 /**
 @page UsedTrackToCalo Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrackToCalo Requirements
-@include requirements
 */
 
diff --git a/Reconstruction/egamma/egammaCaloTools/doc/mainpage.h b/Reconstruction/egamma/egammaCaloTools/doc/packagedoc.h
similarity index 94%
rename from Reconstruction/egamma/egammaCaloTools/doc/mainpage.h
rename to Reconstruction/egamma/egammaCaloTools/doc/packagedoc.h
index 15c1f16ab8d5bb8ecc652b665615edf07f453b8b..20bf411e4bad289704ba580aec26c0976ae5c433 100644
--- a/Reconstruction/egamma/egammaCaloTools/doc/mainpage.h
+++ b/Reconstruction/egamma/egammaCaloTools/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage egammaCaloTools Package
+@page egammaCaloTools_page egammaCaloTools Package
 
 This package provides various tools related to calorimeter for egamma use, such as 
 
diff --git a/Reconstruction/egamma/egammaEvent/doc/mainpage.h b/Reconstruction/egamma/egammaEvent/doc/packagedoc.h
similarity index 98%
rename from Reconstruction/egamma/egammaEvent/doc/mainpage.h
rename to Reconstruction/egamma/egammaEvent/doc/packagedoc.h
index b16428bb2b349eb6f6c33d6699ff02c175eecd52..126c21115ce46e3d29f8f025cd3f637d5441f6e6 100644
--- a/Reconstruction/egamma/egammaEvent/doc/mainpage.h
+++ b/Reconstruction/egamma/egammaEvent/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage egammaEvent Package
+@page egammaEvent_page egammaEvent Package
 
 This package provides Event Data Model of egamma objects.
 
diff --git a/Reconstruction/egamma/egammaInterfaces/doc/mainpage.h b/Reconstruction/egamma/egammaInterfaces/doc/packagedoc.h
similarity index 98%
rename from Reconstruction/egamma/egammaInterfaces/doc/mainpage.h
rename to Reconstruction/egamma/egammaInterfaces/doc/packagedoc.h
index 30b43ea959c64e28cf6c51f90fd864d873d1a6b8..ffddb676cd9507c18ce7d01c9e67f61d6578b69c 100644
--- a/Reconstruction/egamma/egammaInterfaces/doc/mainpage.h
+++ b/Reconstruction/egamma/egammaInterfaces/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage egammaInterfaces Package
+@page egammaInterfaces_page egammaInterfaces Package
 
 This package is responsible for electron and photon interface of tools 
 located in egammaTools, egammaUtils and egammaPID packages
diff --git a/Reconstruction/egamma/egammaPerformance/doc/mainpage.h b/Reconstruction/egamma/egammaPerformance/doc/packagedoc.h
similarity index 92%
rename from Reconstruction/egamma/egammaPerformance/doc/mainpage.h
rename to Reconstruction/egamma/egammaPerformance/doc/packagedoc.h
index 071aa775e51def1d839c374ba6790039255786b0..841ba24f9f94a7d036260db2e2b1031742470637 100644
--- a/Reconstruction/egamma/egammaPerformance/doc/mainpage.h
+++ b/Reconstruction/egamma/egammaPerformance/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage egammaPerformance Package
+@page egammaPerformance_page egammaPerformance Package
 
 This package contains the jobOptions and root Macros ran by RTT tests.
 It also contains the monitoring tools of electron and photon reconstruction identification 
@@ -14,7 +14,7 @@ run on Tier 0 for Data Quality
 @author Claire Adam-Bourdarios claire.bourdarios@cern.ch
 @author many many others
 
-@section RTT jobOption and macros
+@section egammaPerformance_RTT jobOption and macros
 
 @author Claire Adam-Bourdarios claire.bourdarios@cern.ch
 
@@ -26,7 +26,7 @@ Another macro then superimposes these histograms to a reference file ( if any )
 The list of input files ( all single particles ) and tests ran can be found in the RTT configuration file :
 test/egammaPerformance_TestConfiguration.xml 
 
-@section egammaMonTool
+@section egammaPerformance_egammaMonTool 
 
 @author Kamal Benslama  kamal.benslama@uregina.ca
 
diff --git a/Reconstruction/egamma/egammaRec/doc/mainpage.h b/Reconstruction/egamma/egammaRec/doc/packagedoc.h
similarity index 99%
rename from Reconstruction/egamma/egammaRec/doc/mainpage.h
rename to Reconstruction/egamma/egammaRec/doc/packagedoc.h
index b2a201ad13706e271221dfb658f4df12e7631814..416779286fd476b9e69bdfd03a14f3436c7aeedf 100644
--- a/Reconstruction/egamma/egammaRec/doc/mainpage.h
+++ b/Reconstruction/egamma/egammaRec/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage egammaRec Package
+@page egammaRec_page egammaRec Package
 
 This package is responsible for electron and photon reconstruction and identification algorithms.
 
diff --git a/Reconstruction/egamma/egammaTools/doc/mainpage.h b/Reconstruction/egamma/egammaTools/doc/packagedoc.h
similarity index 98%
rename from Reconstruction/egamma/egammaTools/doc/mainpage.h
rename to Reconstruction/egamma/egammaTools/doc/packagedoc.h
index a6c9f3f021cde70573aed41eda22012f24428e05..f635df9a25b52942c0f4d75414a0567a2aae770e 100644
--- a/Reconstruction/egamma/egammaTools/doc/mainpage.h
+++ b/Reconstruction/egamma/egammaTools/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage egammaTools Package
+@page egammaTools_page egammaTools Package
 
 This package contains electron and photon reconstruction and identification tools.
 These tools are called by main algorithms located in the egammaRec package.
diff --git a/Reconstruction/egamma/egammaTrackTools/doc/mainpage.h b/Reconstruction/egamma/egammaTrackTools/doc/packagedoc.h
similarity index 94%
rename from Reconstruction/egamma/egammaTrackTools/doc/mainpage.h
rename to Reconstruction/egamma/egammaTrackTools/doc/packagedoc.h
index 5a300b569704b051f6dd09d844b5b7335e745f39..3a9eac181627fab9da7f39e849184deef2451565 100644
--- a/Reconstruction/egamma/egammaTrackTools/doc/mainpage.h
+++ b/Reconstruction/egamma/egammaTrackTools/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage egammaTrackTools Package
+@page egammaTrackTools_page egammaTrackTools Package
 
 This package provides various tools related to track for egamma use.
 
diff --git a/Reconstruction/egamma/egammaUtils/doc/mainpage.h b/Reconstruction/egamma/egammaUtils/doc/packagedoc.h
similarity index 96%
rename from Reconstruction/egamma/egammaUtils/doc/mainpage.h
rename to Reconstruction/egamma/egammaUtils/doc/packagedoc.h
index 491a99496b5afedce15c3a8ffda34d6739ad55b7..815af4c1646ad66e7a6d95dec903d0312342db36 100644
--- a/Reconstruction/egamma/egammaUtils/doc/mainpage.h
+++ b/Reconstruction/egamma/egammaUtils/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage egammaUtils Package
+@page egammaUtils_page egammaUtils Package
 
 This package provides various genaral tools for egamma use, 
 but also called from other packages, such as
diff --git a/Reconstruction/egamma/egammaValidation/doc/mainpage.h b/Reconstruction/egamma/egammaValidation/doc/packagedoc.h
similarity index 93%
rename from Reconstruction/egamma/egammaValidation/doc/mainpage.h
rename to Reconstruction/egamma/egammaValidation/doc/packagedoc.h
index 16f1aa279323fdb7e69d8d4487ad4c2020fb3586..e8da4955e4207ae3b46e42073428fb7338d6608e 100644
--- a/Reconstruction/egamma/egammaValidation/doc/mainpage.h
+++ b/Reconstruction/egamma/egammaValidation/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage egammaValidation Package
+@page egammaValidation_page egammaValidation Package
 
 This package contains the jobOptions and root Macros ran by RTT tests.
 
diff --git a/Reconstruction/tauEvent/doc/mainpage.h b/Reconstruction/tauEvent/doc/packagedoc.h
similarity index 89%
rename from Reconstruction/tauEvent/doc/mainpage.h
rename to Reconstruction/tauEvent/doc/packagedoc.h
index bdd493ff473c8e8abd7a252728683414155f366b..f2c9a1fc9d00eef348466b72d0a4a32c24ab984d 100644
--- a/Reconstruction/tauEvent/doc/mainpage.h
+++ b/Reconstruction/tauEvent/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage tauEvent
+@page tauEvent_page tauEvent
 
 @author Thomas Burgess <thomas.burgess[]cern.ch>
 @author Anna Kaczmarska,
@@ -12,7 +12,7 @@
 @author Nico Meyer
 @author Noel Dawe
 
-@section Introduction
+@section tauEvent_Introduction 
 
 This is the Reconstruction/tauEvent package which purpose is to enable 
 access to quantities for reconstructed tau candidates.
@@ -23,7 +23,7 @@ The common are saved in AODs and ESDs,
 whereas the extra details are only saved in ESDs. 
 TauJet and TauPID are allways saved.
 
-@section Deprecated classes
+@section tauEvent_Deprecated classes
 The following classes have been deprecated and further usage should be avoided
  - Analysis::Tau1P3PDetails
  - Analysis::TauRecDetails 
@@ -34,10 +34,8 @@ The following classes have been deprecated and further usage should be avoided
 
 Packages used by tauEvent are listed here:
 
-@htmlinclude used_packages.html
 
 The requirements file for tauEvent is shown here:
 
-@include requirements
 
 */
diff --git a/Reconstruction/tauRec/doc/mainpage.h b/Reconstruction/tauRec/doc/packagedoc.h
similarity index 86%
rename from Reconstruction/tauRec/doc/mainpage.h
rename to Reconstruction/tauRec/doc/packagedoc.h
index 6191183cd74dcbc445c810ba0f8f170325eb8cb6..03d644e42cfaab8a3a1718732e3040fccc285e64 100644
--- a/Reconstruction/tauRec/doc/mainpage.h
+++ b/Reconstruction/tauRec/doc/packagedoc.h
@@ -4,20 +4,18 @@
 
 /**
 
-@mainpage tauRec
+@page tauRec_page tauRec
 @author Srini Rajagopalan, Michael Heldmann, Elzbieta Richter-Was, Lukasz Janyst, Stan Lai, Nico Meyer, Anna Kaczmarska, Felix Friedrich
 
-@section Introduction
+@section tauRec_Introduction 
 
 This is the tauRec package. It holds algorithms to reconstruct hadronically decaying tau candidates. The tau reconstruction is using a calorimeter seeded approach. Tracks are collected in a cone around the calorimeter seed and associated to the tau candidate. An own tau energy scale is set.
 
 Packages used by tauRec are listed here:
 
-@htmlinclude used_packages.html
 
 The requirements file for tauRec is shown here:
 
-@include requirements
 
 
 */
diff --git a/Simulation/FastSimulation/FastChainPileup/doc/mainpage.h b/Simulation/FastSimulation/FastChainPileup/doc/packagedoc.h
similarity index 91%
rename from Simulation/FastSimulation/FastChainPileup/doc/mainpage.h
rename to Simulation/FastSimulation/FastChainPileup/doc/packagedoc.h
index 3a60b424513f7c2023077413018f844ba05fd7a4..04a9045ba7f25913fde41ee7da7e407a27d3a69e 100644
--- a/Simulation/FastSimulation/FastChainPileup/doc/mainpage.h
+++ b/Simulation/FastSimulation/FastChainPileup/doc/packagedoc.h
@@ -5,14 +5,14 @@
 // Mainpage for doxygen
 
 /**
-@mainpage package FastChainPileup
+@page FastChainPileup_page package FastChainPileup
 
 @author Richard Hawkings, Vladimir Lyubushkin
 
 This package provides code related to pileup emulation in the fast simulation
 chain.
 
-@section MultiPy8Pileup
+@section FastChainPileup_MultiPy8Pileup 
 
 This algorithm runs Pythia8 to generate multiple pileup events into a 
 single McEventCollection with a specified key. It inherits from Pythia8_i
@@ -46,10 +46,8 @@ distribution of number of pileup events - equivalent to the mu profile but
 with the additional Poisson fluctuations, filled for nevt values for each 
 BCID (but before multiplying by the R values).
 
-@section Req The requirements file:
-@include requirements
+@section FastChainPileup_Req The requirements file:
 
-@section Uses The packages used:
-@htmlinclude used_packages.html
+@section FastChainPileup_Uses The packages used:
 
 */
diff --git a/Simulation/G4Atlas/G4AtlasControl/doc/mainpage.h b/Simulation/G4Atlas/G4AtlasControl/doc/packagedoc.h
similarity index 85%
rename from Simulation/G4Atlas/G4AtlasControl/doc/mainpage.h
rename to Simulation/G4Atlas/G4AtlasControl/doc/packagedoc.h
index 8d9bf888b01197d322b7311e968b1e610226e3b3..c1aa0b510b9811a22787a218d3a4ec8dd6f19b22 100644
--- a/Simulation/G4Atlas/G4AtlasControl/doc/mainpage.h
+++ b/Simulation/G4Atlas/G4AtlasControl/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  G4AtlasControl
+@page G4AtlasControl_page G4AtlasControl
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section G4AtlasControl Introduction
+@section G4AtlasControl_G4AtlasControl Introduction
 
 This package includes all the control interfaces from the python layer into the C++ layer of the simulation.  All the menus available to the user trhough the AtlasG4Engine are defined here (and are applied in G4AtlasApps).
 
-@section G4AtlasControl Class Overview
+@section G4AtlasControl_G4AtlasControl Class Overview
 
 The classes in this package are:
 
@@ -27,11 +27,9 @@ The classes in this package are:
 
 /**
 @page used_G4AtlasControl Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4AtlasControl Requirements
-@include requirements
 */
 
diff --git a/Simulation/G4Atlas/G4AtlasTests/doc/mainpage.h b/Simulation/G4Atlas/G4AtlasTests/doc/packagedoc.h
similarity index 90%
rename from Simulation/G4Atlas/G4AtlasTests/doc/mainpage.h
rename to Simulation/G4Atlas/G4AtlasTests/doc/packagedoc.h
index 5350237da18c00f8b2607d628b3a51595a401ac1..8e9bf01c63bc78c4bee618d97fa5d9f5a261df09 100644
--- a/Simulation/G4Atlas/G4AtlasTests/doc/mainpage.h
+++ b/Simulation/G4Atlas/G4AtlasTests/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage  G4AtlasTEsts
+@page G4AtlasTests_page G4AtlasTEsts
 @author Andrea.Dellacqua@cern.ch
 
-@section G4AtlasTests Introduction
+@section G4AtlasTests_G4AtlasTests Introduction
 
 This package provides basic tests of the G4 Atlas simulation,
 including both subdetector specific and general functionality tests.
 
-@section G4AtlasTests Class Overview
+@section G4AtlasTests_G4AtlasTests Class Overview
   The G4AtlasTests package contains of following classes:
 
   - AtlasTestAlg : Provides minimal tests for each subsystem and overview tests
@@ -51,10 +51,8 @@ All histograms are booked in BookHistograms.cxx - this file contains all limits
 
 /**
 @page used_G4AtlasTests Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4AtlasTests Requirements
-@include requirements
 */
diff --git a/Simulation/G4Atlas/G4AtlasUtilities/doc/mainpage.h b/Simulation/G4Atlas/G4AtlasUtilities/doc/packagedoc.h
similarity index 87%
rename from Simulation/G4Atlas/G4AtlasUtilities/doc/mainpage.h
rename to Simulation/G4Atlas/G4AtlasUtilities/doc/packagedoc.h
index f2b5a9ccde560702323fbc9c550d44ace8854218..16d9f42d1909900a5146503e28bbb6d1a82a8e42 100644
--- a/Simulation/G4Atlas/G4AtlasUtilities/doc/mainpage.h
+++ b/Simulation/G4Atlas/G4AtlasUtilities/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  G4AtlasUtilities
+@page G4AtlasUtilities_page G4AtlasUtilities
 @author Manuel Gallas (gallasm@mail.cern.ch)
 
-@section G4AtlasUtilities Introduction
+@section G4AtlasUtilities_G4AtlasUtilities Introduction
 
 The G4AtlasUtilities package includes utilities for the modification of events as they are transferred between the generators and Geant4.  The modifiers are all set up in the G4AtlasApps package.
 
-@section G4AtlasUtilities Class Overview
+@section G4AtlasUtilities_G4AtlasUtilities Class Overview
 
 The following filters are available:
 
@@ -26,11 +26,9 @@ The following filters are available:
 
 /**
 @page used_G4AtlasUtilities Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4AtlasUtilities Requirements
-@include requirements
 */
 
diff --git a/Simulation/G4Extensions/Charginos/doc/mainpage.h b/Simulation/G4Extensions/Charginos/doc/packagedoc.h
similarity index 82%
rename from Simulation/G4Extensions/Charginos/doc/mainpage.h
rename to Simulation/G4Extensions/Charginos/doc/packagedoc.h
index ba958eb0730ca2309cd7e87e8d4512767ac415c7..8c9575f2978790b2d8a1ae9dd23e4b4b7a331264 100644
--- a/Simulation/G4Extensions/Charginos/doc/mainpage.h
+++ b/Simulation/G4Extensions/Charginos/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  Charginos
+@page Charginos_page Charginos
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section Charginos Introduction
+@section Charginos_Charginos Introduction
 
 This package introduces charginos (charged SUSY particles) into the Geant4 simulation.  The properties of the charginos are not set in this package, since they can vary depending on the region of parameter space one wishes to consider.
 
-@section Charginos Class Overview
+@section Charginos_Charginos Class Overview
 
 This package contains only one class:
 
@@ -24,11 +24,9 @@ This package contains only one class:
 
 /**
 @page used_Charginos Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_Charginos Requirements
-@include requirements
 */
 
diff --git a/Simulation/G4Extensions/G4CosmicFilter/doc/mainpage.h b/Simulation/G4Extensions/G4CosmicFilter/doc/packagedoc.h
similarity index 86%
rename from Simulation/G4Extensions/G4CosmicFilter/doc/mainpage.h
rename to Simulation/G4Extensions/G4CosmicFilter/doc/packagedoc.h
index e419f6b481d12239eee5d9872c508026377bd402..37bc27f38b91207f3b5641425aabfd84649a8eeb 100644
--- a/Simulation/G4Extensions/G4CosmicFilter/doc/mainpage.h
+++ b/Simulation/G4Extensions/G4CosmicFilter/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  G4CosmicFitter
+@page G4CosmicFilter_page G4CosmicFitter
 @author Jamie Boyd (jboyd@mail.cern.ch)
 
-@section G4CosmicFitter Introduction
+@section G4CosmicFilter_G4CosmicFitter Introduction
 
 This package applies a filter on volumes and hits within those volumes for use during cosmic ray simulation.  It can be applied through the cosmic simulation job transforms.  It is used, for example, to only save cosmic rays passing through a certain subdetector.
 
-@section G4CosmicFitter Class Overview
+@section G4CosmicFilter_G4CosmicFitter Class Overview
 
 The package has three classes:
 
@@ -25,10 +25,8 @@ The package has three classes:
 
 /**
 @page used_G4CosmicFitter Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4CosmicFitter Requirements
-@include requirements
 */
diff --git a/Simulation/G4Extensions/Gauginos/doc/mainpage.h b/Simulation/G4Extensions/Gauginos/doc/packagedoc.h
similarity index 82%
rename from Simulation/G4Extensions/Gauginos/doc/mainpage.h
rename to Simulation/G4Extensions/Gauginos/doc/packagedoc.h
index f82b5db467b86e62d819897af64ab1f45b36e840..703fbbf0595cea4c317107380b0f4487fe6dab0e 100644
--- a/Simulation/G4Extensions/Gauginos/doc/mainpage.h
+++ b/Simulation/G4Extensions/Gauginos/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  Gauginos
+@page Gauginos_page Gauginos
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section Gauginos Introduction
+@section Gauginos_Gauginos Introduction
 
 This package can be used to add Gauginos to the Geant4 simulation.  
 
-@section Gauginos Class Overview
+@section Gauginos_Gauginos Class Overview
 
 The package includes three classes:
 
@@ -26,10 +26,8 @@ The package includes three classes:
 
 /**
 @page used_Gauginos Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_Gauginos Requirements
-@include requirements
 */
diff --git a/Simulation/G4Extensions/Monopole/doc/mainpage.h b/Simulation/G4Extensions/Monopole/doc/packagedoc.h
similarity index 85%
rename from Simulation/G4Extensions/Monopole/doc/mainpage.h
rename to Simulation/G4Extensions/Monopole/doc/packagedoc.h
index 3c55f032336dac8e36b4166e8245494b9eee4e5b..87aa7d62ee3004a252ad614e77f740d6796a8719 100644
--- a/Simulation/G4Extensions/Monopole/doc/mainpage.h
+++ b/Simulation/G4Extensions/Monopole/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  Monopole
+@page Monopole_page Monopole
 @author Andrea Dell'Acqua andrea.Dellacqua@cern.ch
 
-@section Monopole Introduction
+@section Monopole_Monopole Introduction
 
 This package allows users to introduce magnetic monopoles into the Geant4 simulation.
 
-@section MonopoleOverview Class Overview
+@section Monopole_MonopoleOverview Class Overview
   The Monopole package contains the following classes:
 
   - G4Monopole : Defines the magnetic monopole particle itself
@@ -25,12 +25,10 @@ This package allows users to introduce magnetic monopoles into the Geant4 simula
 
 /**
 @page used_Monopole Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_Monopole Requirements
-@include requirements
 */
 
 doc/mainpage.h
diff --git a/Simulation/G4Extensions/Sleptons/doc/mainpage.h b/Simulation/G4Extensions/Sleptons/doc/packagedoc.h
similarity index 85%
rename from Simulation/G4Extensions/Sleptons/doc/mainpage.h
rename to Simulation/G4Extensions/Sleptons/doc/packagedoc.h
index 463a21e32187f8fa2f67901953580caf5bddeec5..f6cc37c473e64a43d6db27437432cee1f0b7736f 100644
--- a/Simulation/G4Extensions/Sleptons/doc/mainpage.h
+++ b/Simulation/G4Extensions/Sleptons/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  Sleptons
+@page Sleptons_page Sleptons
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section Sleptons Introduction
+@section Sleptons_Sleptons Introduction
 
 This package was created in order to introduce sleptons (supersymmetric partners of leptons which could be stable) into the Geant4 simulation.  The properties of these sleptons are not set by this package, since they may vary considerably depending on the supersymmetric theory being considered.  They should be set up in user job options.
 
-@section Sleptons Class Overview
+@section Sleptons_Sleptons Class Overview
 
 The package contains only one class:
 
@@ -24,11 +24,9 @@ The package contains only one class:
 
 /**
 @page used_Sleptons Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_Sleptons Requirements
-@include requirements
 */
 
diff --git a/Simulation/G4Sim/FADS/FadsControl/doc/mainpage.h b/Simulation/G4Sim/FADS/FadsControl/doc/packagedoc.h
similarity index 93%
rename from Simulation/G4Sim/FADS/FadsControl/doc/mainpage.h
rename to Simulation/G4Sim/FADS/FadsControl/doc/packagedoc.h
index 77b3f12e171e316aaeb07a1175f75e470c0262e1..36ec6d2e2015a07697642a7e3aeeb1a07ee315fd 100644
--- a/Simulation/G4Sim/FADS/FadsControl/doc/mainpage.h
+++ b/Simulation/G4Sim/FADS/FadsControl/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  FadsControl
+@page FadsControl_page FadsControl
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section FadsControl Introduction
+@section FadsControl_FadsControl Introduction
 
 This package includes several useful base classes that are used throughout the simulation.
 
-@section FadsControl Class Overview
+@section FadsControl_FadsControl Class Overview
 
 This package's classes are logically divided in the following way:
 
@@ -35,11 +35,9 @@ Three other classes are included in this package:
 
 /**
 @page used_FadsControl Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_FadsControl Requirements
-@include requirements
 */
 
diff --git a/Simulation/G4Sim/FADS/FadsField/doc/mainpage.h b/Simulation/G4Sim/FADS/FadsField/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from Simulation/G4Sim/FADS/FadsField/doc/mainpage.h
rename to Simulation/G4Sim/FADS/FadsField/doc/packagedoc.h
index 9a84e348e117eacfa9bc1b5c449c16fbe70ff646..e1ce2d39e376a074a6344d9c92ec5d36c640d6c8
--- a/Simulation/G4Sim/FADS/FadsField/doc/mainpage.h
+++ b/Simulation/G4Sim/FADS/FadsField/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page FadsField_page 
 
 @ref used_FadsField
 @ref requirements_FadsField
@@ -13,12 +13,10 @@
 
 /**
 @page used_FadsField Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_FadsField Requirements
-@include requirements
 */
 
 
diff --git a/Simulation/G4Sim/FADS/FadsKinematics/doc/mainpage.h b/Simulation/G4Sim/FADS/FadsKinematics/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Simulation/G4Sim/FADS/FadsKinematics/doc/mainpage.h
rename to Simulation/G4Sim/FADS/FadsKinematics/doc/packagedoc.h
index b2d9a63c4038fe8042f4ffca62fe9b3f986b675a..188416a3eb130a99fd313f0ae1d431eba62eb36c
--- a/Simulation/G4Sim/FADS/FadsKinematics/doc/mainpage.h
+++ b/Simulation/G4Sim/FADS/FadsKinematics/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page FadsKinematics_page 
 
 @ref used_FadsKinematics
 @ref requirements_FadsKinematics
@@ -13,12 +13,10 @@
 
 /**
 @page used_FadsKinematics Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_FadsKinematics Requirements
-@include requirements
 */
 
 
diff --git a/Simulation/G4Sim/FADS/FadsMaterial/doc/mainpage.h b/Simulation/G4Sim/FADS/FadsMaterial/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Simulation/G4Sim/FADS/FadsMaterial/doc/mainpage.h
rename to Simulation/G4Sim/FADS/FadsMaterial/doc/packagedoc.h
index bf853d9f18ad0b08ae5b035d7d8e6664e395b8e1..e58ac24f7b93586315d6d4ff2eefaeb682700d36
--- a/Simulation/G4Sim/FADS/FadsMaterial/doc/mainpage.h
+++ b/Simulation/G4Sim/FADS/FadsMaterial/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page FadsMaterial_page 
 
 @ref used_FadsMaterial
 @ref requirements_FadsMaterial
@@ -13,12 +13,10 @@
 
 /**
 @page used_FadsMaterial Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_FadsMaterial Requirements
-@include requirements
 */
 
 
diff --git a/Simulation/G4Sim/FADS/FadsPackageLoader/doc/mainpage.h b/Simulation/G4Sim/FADS/FadsPackageLoader/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 80%
rename from Simulation/G4Sim/FADS/FadsPackageLoader/doc/mainpage.h
rename to Simulation/G4Sim/FADS/FadsPackageLoader/doc/packagedoc.h
index 79c946d52c3fe3ea321ed16dc1c693bd1096eeda..0e964831322a13a8527404b05d3f1029de177a47
--- a/Simulation/G4Sim/FADS/FadsPackageLoader/doc/mainpage.h
+++ b/Simulation/G4Sim/FADS/FadsPackageLoader/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page FadsPackageLoader_page 
 
 @ref used_FadsPackageLoader
 @ref requirements_FadsPackageLoader
@@ -13,12 +13,10 @@
 
 /**
 @page used_FadsPackageLoader Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_FadsPackageLoader Requirements
-@include requirements
 */
 
 
diff --git a/Simulation/G4Sim/FADS/FadsUtilities/doc/mainpage.h b/Simulation/G4Sim/FADS/FadsUtilities/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Simulation/G4Sim/FADS/FadsUtilities/doc/mainpage.h
rename to Simulation/G4Sim/FADS/FadsUtilities/doc/packagedoc.h
index 27f58603fe29a39e8b88432ba9e5d6ada93969f5..de2c4ccc7311e3bd272083d1767f436c4d2773b4
--- a/Simulation/G4Sim/FADS/FadsUtilities/doc/mainpage.h
+++ b/Simulation/G4Sim/FADS/FadsUtilities/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page FadsUtilities_page 
 
 @ref used_FadsUtilities
 @ref requirements_FadsUtilities
@@ -13,12 +13,10 @@
 
 /**
 @page used_FadsUtilities Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_FadsUtilities Requirements
-@include requirements
 */
 
 
diff --git a/Simulation/G4Sim/FADS/FadsXMLParser/doc/mainpage.h b/Simulation/G4Sim/FADS/FadsXMLParser/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Simulation/G4Sim/FADS/FadsXMLParser/doc/mainpage.h
rename to Simulation/G4Sim/FADS/FadsXMLParser/doc/packagedoc.h
index fa52b1b616d3dd062e666da695f634f9434fac71..9c7c51eea281a3339b3895d1bd16dea3797c2e53
--- a/Simulation/G4Sim/FADS/FadsXMLParser/doc/mainpage.h
+++ b/Simulation/G4Sim/FADS/FadsXMLParser/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page FadsXMLParser_page 
 
 @ref used_FadsXMLParser
 @ref requirements_FadsXMLParser
@@ -13,12 +13,10 @@
 
 /**
 @page used_FadsXMLParser Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_FadsXMLParser Requirements
-@include requirements
 */
 
 
diff --git a/Simulation/G4Sim/MCTruth/doc/mainpage.h b/Simulation/G4Sim/MCTruth/doc/packagedoc.h
similarity index 94%
rename from Simulation/G4Sim/MCTruth/doc/mainpage.h
rename to Simulation/G4Sim/MCTruth/doc/packagedoc.h
index 58be4ee99e9a80da67350ec9e8c149792caddd9b..09c2e7d5259779a3b6d3456456ef8fab0448109d 100644
--- a/Simulation/G4Sim/MCTruth/doc/mainpage.h
+++ b/Simulation/G4Sim/MCTruth/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  MCTruth
+@page MCTruth_page MCTruth
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section MCTruth Introduction
+@section MCTruth_MCTruth Introduction
 
 This package provides many helper classes for dealing with Monte Carlo Truth.  Most of it is "core" simulation code and can be safely ignored by users.  This is where the truth really comes from.
 
-@section MCTruth Class Overview
+@section MCTruth_MCTruth Class Overview
 
 The MCTruth package includes the following classes:
 
@@ -36,11 +36,9 @@ The MCTruth package includes the following classes:
 
 /**
 @page used_MCTruth Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MCTruth Requirements
-@include requirements
 */
 
diff --git a/Simulation/G4Sim/SimHelpers/doc/mainpage.h b/Simulation/G4Sim/SimHelpers/doc/packagedoc.h
similarity index 89%
rename from Simulation/G4Sim/SimHelpers/doc/mainpage.h
rename to Simulation/G4Sim/SimHelpers/doc/packagedoc.h
index 893b6ee8abf14d2978a9c26afec5be441c3a55c0..c9bac775eec5fab6cb2c5ed7f73195912c1d7dd0 100644
--- a/Simulation/G4Sim/SimHelpers/doc/mainpage.h
+++ b/Simulation/G4Sim/SimHelpers/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  SinHelpers
+@page SimHelpers_page SinHelpers
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section SinHelpers Introduction
+@section SimHelpers_SinHelpers Introduction
 
 This package includes several helpers for use during simulation.  Running simulation uses these, whether you realize it or not...
 
-@section SinHelpers Class Overview
+@section SimHelpers_SinHelpers Class Overview
 
 The helpers in this package are:
 
@@ -31,10 +31,8 @@ The helpers in this package are:
 
 /**
 @page used_SinHelpers Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_SinHelpers Requirements
-@include requirements
 */
diff --git a/Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/doc/mainpage.h b/Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/doc/packagedoc.h
similarity index 69%
rename from Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/doc/mainpage.h
rename to Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/doc/packagedoc.h
index e3112c9b35c594d16f56df96d11bb76da3de2fa6..aa9fa331a1730f96c71eae74050e5e5471c16080 100644
--- a/Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/doc/mainpage.h
+++ b/Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  G4AncillaryEventAthenaPool
+@page G4AncillaryEventAthenaPool_page G4AncillaryEventAthenaPool
 @author Thomas Kittelman (tkittel@mail.cern.ch)
 
-@section G4AncillaryEventAthenaPool Introduction
+@section G4AncillaryEventAthenaPool_G4AncillaryEventAthenaPool Introduction
 
 This package creates a Pool converter for scintillator hit collections
 
-@section G4AncillaryEventAthenaPoolOverview Class Overview
+@section G4AncillaryEventAthenaPool_G4AncillaryEventAthenaPoolOverview Class Overview
 
 Pool converters are included for ScintillatorHitCollections and SimpleScintillatorHitCollections.
 
@@ -22,11 +22,9 @@ Pool converters are included for ScintillatorHitCollections and SimpleScintillat
 
 /**
 @page used_G4AncillaryEventAthenaPool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4AncillaryEventAthenaPool Requirements
-@include requirements
 */
 
diff --git a/Simulation/G4Utilities/G4FastSimulation/doc/mainpage.h b/Simulation/G4Utilities/G4FastSimulation/doc/packagedoc.h
similarity index 81%
rename from Simulation/G4Utilities/G4FastSimulation/doc/mainpage.h
rename to Simulation/G4Utilities/G4FastSimulation/doc/packagedoc.h
index ed1bbc0232d1eeee9610e060444d977425bff9f4..3c6caa722b9ee1735fa7a9a325555c555739f82d 100644
--- a/Simulation/G4Utilities/G4FastSimulation/doc/mainpage.h
+++ b/Simulation/G4Utilities/G4FastSimulation/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  G4FastSimulation
+@page G4FastSimulation_page G4FastSimulation
 @author Vakho Tsulaia (tsulaia@mail.cern.ch)
 
-@section G4FastSimulation Introduction
+@section G4FastSimulation_G4FastSimulation Introduction
 
 This package provides some very basic interface to G4FastSimulations
 
-@section G4FastSimulationOverview Class Overview
+@section G4FastSimulation_G4FastSimulationOverview Class Overview
 
 The classes included in this package are:
 
@@ -27,11 +27,9 @@ The classes included in this package are:
 
 /**
 @page used_G4FastSimulation Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4FastSimulation Requirements
-@include requirements
 */
 
diff --git a/Simulation/G4Utilities/G4Field/doc/mainpage.h b/Simulation/G4Utilities/G4Field/doc/packagedoc.h
similarity index 86%
rename from Simulation/G4Utilities/G4Field/doc/mainpage.h
rename to Simulation/G4Utilities/G4Field/doc/packagedoc.h
index c6bf2bd97963f4784e09803a065ad53abc7080d7..3e9c570ac54c7db117422d03325c4bf1c50049f4 100644
--- a/Simulation/G4Utilities/G4Field/doc/mainpage.h
+++ b/Simulation/G4Utilities/G4Field/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  G4Field
+@page G4Field_page G4Field
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section G4Field Introduction
+@section G4Field_G4Field Introduction
 
 This package provides a simple interface to G4 Fields and for modifying the magnetic field to be used during simulation.
 
-@section G4Field Class Overview
+@section G4Field_G4Field Class Overview
 
 The package includes the following classes:
  - AtlasField , H8Field , H8FieldSym , ConstantField : Various base classes for fields which can be used during simulation (including, of course, test beam simulation)
@@ -26,10 +26,8 @@ The package includes the following classes:
 
 /**
 @page used_G4Field Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4Field Requirements
-@include requirements
 */
diff --git a/Simulation/G4Utilities/G4PhysicsLists/doc/mainpage.h b/Simulation/G4Utilities/G4PhysicsLists/doc/packagedoc.h
similarity index 96%
rename from Simulation/G4Utilities/G4PhysicsLists/doc/mainpage.h
rename to Simulation/G4Utilities/G4PhysicsLists/doc/packagedoc.h
index c42a5d12e9964a0ff7713a33c692180334ee51eb..97c40964b9fc3baa1edeed5ffd61439b91aa41f7 100644
--- a/Simulation/G4Utilities/G4PhysicsLists/doc/mainpage.h
+++ b/Simulation/G4Utilities/G4PhysicsLists/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  G4PhysicsLists
+@page G4PhysicsLists_page G4PhysicsLists
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section G4PhysicsLists Introduction
+@section G4PhysicsLists_G4PhysicsLists Introduction
 
 This package provides an interface to all the Geant4 physics lists to be included in the simulation.  The lists currently supported are:
   
@@ -97,7 +97,7 @@ This package provides an interface to all the Geant4 physics lists to be include
          These lists use an alternate string model, the FRITIOF model.  C again is
         for CHIPS, BERT for the Bertini cascade, and BIC for the binary cascade.
 
-@section G4PhysicsLists Class Overview
+@section G4PhysicsLists_G4PhysicsLists Class Overview
 
 This package is only an interface, so it has no classes!
 
@@ -109,10 +109,8 @@ This package is only an interface, so it has no classes!
 
 /**
 @page used_G4PhysicsLists Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4PhysicsLists Requirements
-@include requirements
 */
diff --git a/Simulation/G4Utilities/G4StepLimitation/doc/mainpage.h b/Simulation/G4Utilities/G4StepLimitation/doc/packagedoc.h
similarity index 84%
rename from Simulation/G4Utilities/G4StepLimitation/doc/mainpage.h
rename to Simulation/G4Utilities/G4StepLimitation/doc/packagedoc.h
index bed8f8a3f70cacc3f0edaba1dfb603ce58d422cb..850c607276cd156aa0989cb6b079588d3ed4c563 100644
--- a/Simulation/G4Utilities/G4StepLimitation/doc/mainpage.h
+++ b/Simulation/G4Utilities/G4StepLimitation/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  G4StepLimitation
+@page G4StepLimitation_page G4StepLimitation
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section G4StepLimitation Introduction
+@section G4StepLimitation_G4StepLimitation Introduction
 
 This class provides an interface for the Geant4 physics process called step limitation.  Step limitation limits the maximum length of a step allowed.  It can be applied only in specific volumes in order to further divide the Geant4 step.  It was most recently used in the silicon of the pixel and SCT detectors in order to ensure a more uniform distribution of energy through the silicon as a track traverses the sensitive detector.
 
-@section G4StepLimitation Class Overview
+@section G4StepLimitation_G4StepLimitation Class Overview
 
 The only class included in this package is G4StepLimitProcess , a UserPhysicsProcess.  It defines the step limitation.
 
@@ -22,10 +22,8 @@ The only class included in this package is G4StepLimitProcess , a UserPhysicsPro
 
 /**
 @page used_G4StepLimitation Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4StepLimitation Requirements
-@include requirements
 */
diff --git a/Simulation/G4Utilities/G4TruthStrategies/doc/mainpage.h b/Simulation/G4Utilities/G4TruthStrategies/doc/packagedoc.h
similarity index 88%
rename from Simulation/G4Utilities/G4TruthStrategies/doc/mainpage.h
rename to Simulation/G4Utilities/G4TruthStrategies/doc/packagedoc.h
index 78af5a99aa83b71b36511c1c87911cdd4b9b6000..6cf21362518ea0c0b3b86f540ec9af4fb1accfc2 100644
--- a/Simulation/G4Utilities/G4TruthStrategies/doc/mainpage.h
+++ b/Simulation/G4Utilities/G4TruthStrategies/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  G4TruthStrategies
+@page G4TruthStrategies_page G4TruthStrategies
 @author Andrea Dell'Acqua (dellacqu@mail.cern.ch)
 
-@section G4TruthStrategies Introduction
+@section G4TruthStrategies_G4TruthStrategies Introduction
 
 This class provides all the truth strategies to be used in the simulation.  These strategies decide when a vertex will be saved to the truth tree.  Each is constructed and included in G4AtlasApps, where it is also assigned to the appropriate region of the detector.  Cuts for the strategies are all configurable from job options.
 
-@section G4TruthStrategies Class Overview
+@section G4TruthStrategies_G4TruthStrategies Class Overview
 
 The truth strategies included in this package are:
 
@@ -31,10 +31,8 @@ The truth strategies included in this package are:
 
 /**
 @page used_G4TruthStrategies Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4TruthStrategies Requirements
-@include requirements
 */
diff --git a/Simulation/G4Utilities/G4UserActions/doc/mainpage.h b/Simulation/G4Utilities/G4UserActions/doc/packagedoc.h
similarity index 88%
rename from Simulation/G4Utilities/G4UserActions/doc/mainpage.h
rename to Simulation/G4Utilities/G4UserActions/doc/packagedoc.h
index 2bbf5b887a6d11b88e7832aab25057ada66d9809..1deb6c2c1bb4a8def881f2330d6bf79765bfadec 100644
--- a/Simulation/G4Utilities/G4UserActions/doc/mainpage.h
+++ b/Simulation/G4Utilities/G4UserActions/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage  G4UserActions
+@page G4UserActions_page G4UserActions
 @author Andrea.Di.Simone@cern.ch, Andrea.Dellacqua@cern.ch
 
-@section G4UserActionsIntro Introduction
+@section G4UserActions_G4UserActionsIntro Introduction
 
 This package includes various utility classes for Geant4 simulation.  Some are always activated by 
 default, and some are for very specific cases.
 
-@section G4UserActionsOverview Class Overview
+@section G4UserActions_G4UserActionsOverview Class Overview
   The G4UserActions package contains of following classes:
 
   - FastIDKiller : Removes some particles prior to their entry into the calorimeter
@@ -41,10 +41,8 @@ default, and some are for very specific cases.
 
 /**
 @page used_G4UserActions Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_G4UserActions Requirements
-@include requirements
 */
diff --git a/Simulation/G4Utilities/MCTruthAlgs/doc/mainpage.h b/Simulation/G4Utilities/MCTruthAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Simulation/G4Utilities/MCTruthAlgs/doc/mainpage.h
rename to Simulation/G4Utilities/MCTruthAlgs/doc/packagedoc.h
index 262a24a0b6bb4f29e3214044c6bc799aa39f915a..f56a7a5c572b812ba3903d99498560b4bc99c43c
--- a/Simulation/G4Utilities/MCTruthAlgs/doc/mainpage.h
+++ b/Simulation/G4Utilities/MCTruthAlgs/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage MCTruthAlgs
+@page MCTruthAlgs_page MCTruthAlgs
 
-\section introduction Description:
+@section MCTruthAlgs_introduction Description:
 These are a collection of algorithms which work on the 
 TrackRecordCollection. In the standard G4 simulation, all the particles 
 that pass through a layer in front of the muon spectrometer are 
@@ -18,7 +18,7 @@ is used to reduce the size of the ESD and AOD files
 output when running pileup
 
  
-\section content Content:
+@section MCTruthAlgs_content Content:
 Given below is a list of the parameters and their names (for usage in root, e.g).<br>
 <table>
   <tr>
@@ -79,8 +79,6 @@ Given below is a list of the parameters and their names (for usage in root, e.g)
 </table>
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/doc/mainpage.h b/Simulation/G4Utilities/MCTruthSimAlgs/doc/packagedoc.h
similarity index 81%
rename from Simulation/G4Utilities/MCTruthSimAlgs/doc/mainpage.h
rename to Simulation/G4Utilities/MCTruthSimAlgs/doc/packagedoc.h
index 47689c9a622b6f98922d17e033a388b424fccb30..8d0f843c723d08e230017bd6d1505dbc3d4ea690 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/doc/mainpage.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage  MCTruthSimAlgs
+@page MCTruthSimAlgs_page MCTruthSimAlgs
 @author Guillaume Unal (gunal@mail.cern.ch)
 
-@section MCTruthSimAlgs Introduction
+@section MCTruthSimAlgs_MCTruthSimAlgs Introduction
 
 This package provides a few helper functions for dealing with MC Truth (or in particular for persistent collections saved by truth).  These algorithms are really used for merging two events into one.
 
-@section MCTruthSimAlgs Class Overview
+@section MCTruthSimAlgs_MCTruthSimAlgs Class Overview
 
 There are two classes in this package:
 
@@ -25,10 +25,8 @@ There are two classes in this package:
 
 /**
 @page used_MCTruthSimAlgs Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MCTruthSimAlgs Requirements
-@include requirements
 */
diff --git a/Simulation/Tests/SimExoticsTests/doc/mainpage.h b/Simulation/Tests/SimExoticsTests/doc/packagedoc.h
similarity index 100%
rename from Simulation/Tests/SimExoticsTests/doc/mainpage.h
rename to Simulation/Tests/SimExoticsTests/doc/packagedoc.h
diff --git a/Simulation/TruthJiveXML/doc/mainpage.h b/Simulation/TruthJiveXML/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 82%
rename from Simulation/TruthJiveXML/doc/mainpage.h
rename to Simulation/TruthJiveXML/doc/packagedoc.h
index e76c6a6eafa01511055eee58e5bb6563a0c60fca..5901eead632b966088a335a0a561db8630e59a61
--- a/Simulation/TruthJiveXML/doc/mainpage.h
+++ b/Simulation/TruthJiveXML/doc/packagedoc.h
@@ -4,15 +4,15 @@
 
 /**
 
-@mainpage TruthJiveXML
+@page TruthJiveXML_page TruthJiveXML
 @author Nikos.Konstantinidis -at- cern.ch, Juergen.Thomas -at- cern.ch, Sebastian.Boeser -at- cern.ch
 
-@section TruthJiveXMLIntro Introduction
+@section TruthJiveXML_TruthJiveXMLIntro Introduction
 
 This package contains the @c AthAlgTools that retrieve truth information ( @c McEventCollection and @c TrackRecordCollection ) from @c StoreGate and 
 forward them to the formatting tool. Each tool implements the IDataRetriever interface, through which it is called from the @c AlgoJiveXML.
 
-@section TruthJiveXMLTools Retrievers
+@section TruthJiveXML_TruthJiveXMLTools Retrievers
 
 - JiveXML::TruthTrackRetriever @copydoc JiveXML::TruthTrackRetriever
 
@@ -20,7 +20,7 @@ forward them to the formatting tool. Each tool implements the IDataRetriever int
 
 - JiveXML::TruthCosmicsTrackRetriever @copydoc JiveXML::TruthCosmicsTrackRetriever
 
-@section TruthJiveXMLEnv Environment
+@section TruthJiveXML_TruthJiveXMLEnv Environment
  - @ref used_TruthJiveXML
  - @ref requirements_TruthJiveXML
 
@@ -28,10 +28,8 @@ forward them to the formatting tool. Each tool implements the IDataRetriever int
 
 /**
 @page used_TruthJiveXML Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TruthJiveXML Requirements
-@include requirements
 */
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/doc/mainpage.h b/TileCalorimeter/TileCalib/TileCalibAlgs/doc/packagedoc.h
similarity index 94%
rename from TileCalorimeter/TileCalib/TileCalibAlgs/doc/mainpage.h
rename to TileCalorimeter/TileCalib/TileCalibAlgs/doc/packagedoc.h
index 2c4555c41d2583fa38b7e3d9bdd65dd249c351b3..973879a6a1b1856e18fcacd48825b59f6af82e02 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/doc/mainpage.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileCalibAlgs
+@page TileCalibAlgs_page TileCalibAlgs
 
 This package provides algorithms for calculating calibration constants from calibration runs or from the data extracted from database
 
@@ -14,7 +14,7 @@ This package provides algorithms for calculating calibration constants from cali
 @author Luca Fiorini <Luca.Fiorini@cern.ch>
 @author Andrei Artamonov <andrei.artamonov@cern.ch>
 
-@section Package_Structure Package Structure 
+@section TileCalibAlgs_Package_Structure Package Structure
 
 Different Algorithm Tools are provided for calculating calibration
 constants related to the Charge
@@ -51,7 +51,7 @@ This algorithm runs on special calibration runs taken with L1Calo. The trigger
 tower energy from L1Calo is used to determine if a given PMT or tower in Tile 
 does not have the correct energy. 
 
-@section Package_Configuration Package Configuration
+@section TileCalibAlgs_Package_Configuration Package Configuration
 
 The package configuration is done through old-style job options, need
 to move to configurables.
@@ -73,10 +73,8 @@ package a detailed documentation would not make much sense.
 
 /**
 @page used_TileCalibAlgs Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileCalibAlgs Requirements
-@include requirements
 */
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/doc/mainpage.h b/TileCalorimeter/TileCalib/TileCalibBlobObjs/doc/packagedoc.h
similarity index 89%
rename from TileCalorimeter/TileCalib/TileCalibBlobObjs/doc/mainpage.h
rename to TileCalorimeter/TileCalib/TileCalibBlobObjs/doc/packagedoc.h
index 836a358a69b0bbdad60d45a31bcb654a85fce7c0..4284e5f5f6213c2bbf97153dddc2c70fea474921 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/doc/mainpage.h
+++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage TileCalibBlobObjs
+@page TileCalibBlobObjs_page TileCalibBlobObjs
 
 This package provides classes able to create and interpret TileCalorimeter conditions data stored in COOL BLOBs.
 
 @author Nils Gollub <Nils.Gollub@cern.ch>
 
-@section Package_Structure Package Structure 
+@section TileCalibBlobObjs_Package_Structure Package Structure
 
 Tile conditions data is stored in COOL folders. Within a folder,
 conditions data is stored in units of TileCal drawers. Etc..
@@ -33,10 +33,8 @@ const coral::Blobs.
 
 /**
 @page used_TileCalibBlobObjs Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileCalibBlobObjs Requirements
-@include requirements
 */
diff --git a/TileCalorimeter/TileConditions/doc/mainpage.h b/TileCalorimeter/TileConditions/doc/packagedoc.h
similarity index 96%
rename from TileCalorimeter/TileConditions/doc/mainpage.h
rename to TileCalorimeter/TileConditions/doc/packagedoc.h
index fe298553b1c63e688eca53d94e7d733d95efd278..5543df9833b3d4e935582948ebe78cb81ade4418 100644
--- a/TileCalorimeter/TileConditions/doc/mainpage.h
+++ b/TileCalorimeter/TileConditions/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileConditions
+@page TileConditions_page TileConditions
 
 Calibration constants and cabling description for the TileCalorimeter.
 
@@ -13,14 +13,14 @@ Calibration constants and cabling description for the TileCalorimeter.
 @author Karl Gellerstedt <Karl.Gellerstedt@cern.ch>
 @author Andrei Artamonov <Andrei.Artamonov@cern.ch>
 
-@section Package_Structure Package Structure 
+@section TileConditions_Package_Structure Package Structure
 
 This package consists of a set of tools which provide TileCal
 conditions data to clients running in the Athena framework. In
 addition to AlgTools also two Services are provided: TileCablingSvc
 (see also \ref TileCablingSvcSection below) and TileInfoLoader.
 
-@section TileCondTools TileCondTools
+@section TileConditions_TileCondTools TileCondTools
 
 In the following list the currently available TileCondTools are
 listed, describing briefly their purpose. For more details see the
@@ -54,7 +54,7 @@ user to this step, rather than to provide additional TileCondTool
 functions which accept HWIdentifiers as input.
 
 
-@section Data_Sources Sources of Conditions Data
+@section TileConditions_Data_Sources Sources of Conditions Data
 
 For reconstruction jobs, the conditions data is usually read from the
 COOL conditions database where it is associated to an Interval Of
@@ -118,7 +118,7 @@ OBJVERSION 1
 @endverbatim
 
 
-@section TileInfoDump TileInfoDump Algorithm
+@section TileConditions_TileInfoDump TileInfoDump Algorithm
 
 An Athena Algorithm called TileInfoDump is provided to print TileCal
 conditions data as it is seen by the Athena framework for a given run
@@ -127,7 +127,7 @@ giving also hints about how to configure \ref TileCondTools and the
 access to the COOL database.
 
 
-@section TileInfo TileInfo, TileInfoLoader, etc...
+@section TileConditions_TileInfo TileInfo, TileInfoLoader, etc...
 
 In the past, a single monolithic TileInfo object was created and
 placed into the Detector Store. This instance of the TileInfo class
@@ -146,7 +146,7 @@ possible.
 
 
 
-@section Package_Configuration Package Configuration
+@section TileConditions_Package_Configuration Package Configuration
 
 Python helper classes and functions exist in the python subdirectory,
 helping with the configuration of the \ref TileCondTools and
@@ -247,7 +247,7 @@ this list, it is not added again, preventing multiple requests for the
 same COOL folder.
 
 
-@section TileCablingSvcSection TileCablingSvc
+@section TileConditions_TileCablingSvcSection TileCablingSvc
 
 The class providing actual TileCal cabling information is called
 TileCablingService and is placed in the Detector Store using a
@@ -274,11 +274,9 @@ svcMgr += CfgMgr.TileCablingSvc()
 
 /**
 @page used_TileConditions Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileConditions Requirements
-@include requirements
 */
 
diff --git a/TileCalorimeter/TileCosmicAlgs/doc/mainpage.h b/TileCalorimeter/TileCosmicAlgs/doc/packagedoc.h
similarity index 94%
rename from TileCalorimeter/TileCosmicAlgs/doc/mainpage.h
rename to TileCalorimeter/TileCosmicAlgs/doc/packagedoc.h
index 7deef6861770926dce6bc63e672a45f32f2b733c..2f6c9837f27c3da7eabe4975f4d63916bdb2a40d 100644
--- a/TileCalorimeter/TileCosmicAlgs/doc/mainpage.h
+++ b/TileCalorimeter/TileCosmicAlgs/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage TileCosmicAlgs Package
+@page TileCosmicAlgs_page TileCosmicAlgs Package
 
 This package contains the algorithms used for TileCal cosmic 
 muons reconstruction, analysis, and trigger simulation.
 
 @author Jose Maneira <maneira@lip.pt>
 
-@section Algos Algorithms
+@section TileCosmicAlgs_Algos Algorithms
   
   The following algorithms are present in this package:
 
@@ -33,11 +33,9 @@ muons reconstruction, analysis, and trigger simulation.
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 
 */
diff --git a/TileCalorimeter/TileDetDescr/doc/mainpage.h b/TileCalorimeter/TileDetDescr/doc/packagedoc.h
similarity index 88%
rename from TileCalorimeter/TileDetDescr/doc/mainpage.h
rename to TileCalorimeter/TileDetDescr/doc/packagedoc.h
index 923138734fca895b66298d2f2fdcfb085237c147..50368341dde57f65ba3f595410e78ff27fa87e50 100644
--- a/TileCalorimeter/TileDetDescr/doc/mainpage.h
+++ b/TileCalorimeter/TileDetDescr/doc/packagedoc.h
@@ -7,13 +7,13 @@ This is the draft of TileDetDescr documentation, under construction ... us usual
 
 /**
 
- @mainpage TileDetDescr Package
+@page TileDetDescr_page TileDetDescr Package
 
  This package provides detector constants for geometry description (TileGeoModel) for the TileCalorimeter.
 
  @authors Alexander Solodkov, Pavel Starovoitov
  
- @section TileDetDescr Introduction
+@section TileDetDescr_TileDetDescr Introduction
  
  This package contains the factories for building the TileDetDescr Interface for TileGeoModel description.
 
@@ -22,7 +22,7 @@ This is the draft of TileDetDescr documentation, under construction ... us usual
  calls the top level factory (TileDetectorFactory) which starts the
  building process.
  
- @section TileDetDescrClassOverview Class Overview
+@section TileDetDescr_TileDetDescrClassOverview Class Overview
    
  The package contains several helper factories which build the different components of the Tile.
  Some of the other classes are described here:
@@ -37,18 +37,15 @@ This is the draft of TileDetDescr documentation, under construction ... us usual
   - TileDetDescrRegion: This class provides an interface to detector description
     information for the regions (sub-detectors) of the  Tile calorimeter.
 
- @section Requirements
- @include requirements
+@section TileDetDescr_Requirements 
 
 */
 
 /**
 @page requirements_TileDetDescr Requirements
-@include requirements
 */
 
 /**
 @page used_TileDetDescr Used Packages
-@htmlinclude used_packages.html
 */
 
diff --git a/TileCalorimeter/TileEvent/doc/mainpage.h b/TileCalorimeter/TileEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from TileCalorimeter/TileEvent/doc/mainpage.h
rename to TileCalorimeter/TileEvent/doc/packagedoc.h
index 69be753b5404724d47dcd3ed2cac1f8192f87eca..60b43ed3a20c6b6ffeb956dee1ec9a0bb18a52ca
--- a/TileCalorimeter/TileEvent/doc/mainpage.h
+++ b/TileCalorimeter/TileEvent/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileEvent Package
+@page TileEvent_page TileEvent Package
 
 This package provides event data model classes for TileCal reconstruction
 
@@ -13,7 +13,7 @@ This package provides event data model classes for TileCal reconstruction
 @author Alexander Solodkov <Sanya.Solodkov@cern.ch>
 @author Frank Merritt <Frank.Merritt@cern.ch>
 
-@section TileEventEDM Raw data EDM and reconstruction EDM
+@section TileEvent_TileEventEDM Raw data EDM and reconstruction EDM
 
 All classes in TileEvent package can be split in two parts:
 raw data classes and classes for reconstructed objects.
@@ -25,7 +25,7 @@ laser system: TileLaserObject which holds TileLaserControl,
 TileLaser, vector of TileLaserPmt and TileLaserDiode
 
 
-@section TileEventRawData Raw data EDM
+@section TileEvent_TileEventRawData Raw data EDM
 
 TileDigits, TileRawChannel and TileBeamElem raw data classes inherit from 
 TileRawData class, which contains just one member 'm_adc_hwid' - so-called 
@@ -67,7 +67,7 @@ This type is important, becuase CIS calibration depends on the algorithm
 and conditions database keeps different calibration constants for different 
 methods.
 
-@section TileEventTriggerData Tile Trigger EDM
+@section TileEvent_TileEventTriggerData Tile Trigger EDM
 
 TileTTL1 class is similar to TileDigits, but
 corresponds to the signal which goes to Level 1 trigger and therefore
@@ -93,7 +93,7 @@ TileTTL1, TileL2 TileTrigger are never stored in IdentifiableContainer.
 Simple DataVector<TileTTL1>, DataVector<TileL2> DataVector<TileTrigger> 
 are used instead.
 
-@section TileEventLaserData Tile Laser EDM
+@section TileEvent_TileEventLaserData Tile Laser EDM
 
 TileLaserObject class contains everything which comes from TileCal Laser system
 This information is unpacked from special laser fragment in the ByteStream and then
@@ -102,7 +102,7 @@ TileLaserObject keeps all the objects mentioned above as private members and
 provides access methods to all the elements.
 There is only one TileLaserObject in StoreGate.
 
-@section TileEventRecData Reconstruction EDM
+@section TileEvent_TileEventRecData Reconstruction EDM
 
 TileCell class inherits from CaloCell class (see Calorimeter/CaloEvent package)
 And contains result of reconstruction - total energy deposited in a cell,
@@ -140,7 +140,7 @@ This information is used mainly by L1Calo to compare their trigger tower energy
 readout energy. Also stored is the average time in the tower from all cells and a status word which
 contains information about dead cells and channels. 
 
-@section TileEventRecData Reconstruction EDM
+@section TileEvent_TileEventRecData Reconstruction EDM
 
 */
 
diff --git a/TileCalorimeter/TileExample/TileSimEx/doc/mainpage.h b/TileCalorimeter/TileExample/TileSimEx/doc/packagedoc.h
similarity index 96%
rename from TileCalorimeter/TileExample/TileSimEx/doc/mainpage.h
rename to TileCalorimeter/TileExample/TileSimEx/doc/packagedoc.h
index 56633d55f7e154b7bd66257d67cf7c06dd9ba1b4..38ea7e83c9d0a49dbf900d1785eddd0afa921bee 100644
--- a/TileCalorimeter/TileExample/TileSimEx/doc/mainpage.h
+++ b/TileCalorimeter/TileExample/TileSimEx/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileSimEx Package
+@page TileSimEx_page TileSimEx Package
  
 This package contains examples of jobOptions for TileCal standalone simulation and digitization. Also an example of Tile digitization for the full ATLAS set-up is shown.
 
@@ -14,7 +14,7 @@ After the TB simulation job POOL file with hits is created, after digitization j
 
 @tableofcontents
 
-@section TileSimExJobOptions JobOptions parameters
+@section TileSimEx_TileSimExJobOptions JobOptions parameters
 
 jobOptions_TileTB_Sim.py:
 
@@ -156,7 +156,7 @@ jobOptions_Tile_Dig.py
   - doRawChannelNtuple
 
 
-@section SamplingFraction How to extract the sampling fraction value
+@section TileSimEx_SamplingFraction How to extract the sampling fraction value
 
  -  Running simulation in Athena
 
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/doc/mainpage.h b/TileCalorimeter/TileG4/TileGeoG4Calib/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from TileCalorimeter/TileG4/TileGeoG4Calib/doc/mainpage.h
rename to TileCalorimeter/TileG4/TileGeoG4Calib/doc/packagedoc.h
index ac5be0bef46e0eca674ffa09d6cf139471a02583..6a52c141ade54306d033f4bafd89cfd1ebda2a0f
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/doc/mainpage.h
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileGeoG4Calib Package
+@page TileGeoG4Calib_page TileGeoG4Calib Package
 
 This package is used in Geant4 simulations with calibration hits. Hit energy is collected in both sensitive (scintillators) and non-sensitive (absorber, dead material) material in the package. Escaped energy is also calculated here. Energy in the event is divided in electromagnetic, non-electromagnetic, invisible and escaped components. CaloCalibrationHitContainer object is used to store the calibration hits in StoreGate, also TileHitVector object with 'normal' hits is stored. Birk's saturation law in organic scintillator is applied.
 
@@ -28,11 +28,9 @@ TileEscapedEnergyProcessing  -  manages processing of those particles that were
 
 /**
 @page used_TileGeoG4Calib Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileGeoG4Calib Requirements
-@include requirements
 */
 
diff --git a/TileCalorimeter/TileG4/TileGeoG4SD/doc/mainpage.h b/TileCalorimeter/TileG4/TileGeoG4SD/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from TileCalorimeter/TileG4/TileGeoG4SD/doc/mainpage.h
rename to TileCalorimeter/TileG4/TileGeoG4SD/doc/packagedoc.h
index 0ece92d955e2cd688cffc6c2c8e6a06732f2618d..a1a13a59e8e1a02f3b5db12adb8b78bd40c0884c
--- a/TileCalorimeter/TileG4/TileGeoG4SD/doc/mainpage.h
+++ b/TileCalorimeter/TileG4/TileGeoG4SD/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileGeoG4SD Package
+@page TileGeoG4SD_page TileGeoG4SD Package
 
 This package is used in Geant4 simulation and contains classes to accumulate energy
 deposited in TileCal active material (scintillators) in TileHit objects and store
@@ -30,10 +30,8 @@ resets those tables at the end of every event.
 
 /**
 @page used_TileGeoG4SD Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileGeoG4SD Requirements
-@include requirements
 */
diff --git a/TileCalorimeter/TileGeoModel/doc/mainpage.h b/TileCalorimeter/TileGeoModel/doc/packagedoc.h
similarity index 88%
rename from TileCalorimeter/TileGeoModel/doc/mainpage.h
rename to TileCalorimeter/TileGeoModel/doc/packagedoc.h
index f0c4ffd7e914b1aa0bdf0dc6571abe7d84885bc9..00386357acbd2f1d15ef374620b2cb4335fe824a 100644
--- a/TileCalorimeter/TileGeoModel/doc/mainpage.h
+++ b/TileCalorimeter/TileGeoModel/doc/packagedoc.h
@@ -7,11 +7,11 @@ This is the draft of TileGeoModel documentation, under construction ... us usual
 
 /**
 
- @mainpage TileGeoModel Package
+@page TileGeoModel_page TileGeoModel Package
  
  @authors Sergey Baranov, Vakho Tsulaia.
  
- @section TileGeoModelIntro Introduction
+@section TileGeoModel_TileGeoModelIntro Introduction
  
  This package contains the factories for building the GeoModel Detector
  Description of the Tile detector. It builds the material
@@ -30,7 +30,7 @@ This is the draft of TileGeoModel documentation, under construction ... us usual
  
  See the share/TileGeoModel_jobOptions.py as example of how to load the geometry.
  
- @section TileGeoModelClassOverview Class Overview
+@section TileGeoModel_TileGeoModelClassOverview Class Overview
    
  The package contains several helper factories which build the different components of the Pixel.
  Some of the other classes are described here:
@@ -41,9 +41,8 @@ This is the draft of TileGeoModel documentation, under construction ... us usual
   - TileGeoSectionBuilder: %Base class for section construction.
   - TileTBFactory: %Test Beam factory. 
 
- @section TileGeoModelReq Requirements
+@section TileGeoModel_TileGeoModelReq Requirements
  
- @include requirements
 
 */
 
diff --git a/TileCalorimeter/TileIdentifier/doc/mainpage.h b/TileCalorimeter/TileIdentifier/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from TileCalorimeter/TileIdentifier/doc/mainpage.h
rename to TileCalorimeter/TileIdentifier/doc/packagedoc.h
index d979548d05a08fdd9278bac93fed235540e31ad8..7903e303b198b8f4cb17d6c7c2249b050bcab45b
--- a/TileCalorimeter/TileIdentifier/doc/mainpage.h
+++ b/TileCalorimeter/TileIdentifier/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileIdentifier Package
+@page TileIdentifier_page TileIdentifier Package
 
 This package provides helper classes for TileCal identifiers
 
diff --git a/TileCalorimeter/TileL2Algs/doc/mainpage.h b/TileCalorimeter/TileL2Algs/doc/packagedoc.h
similarity index 97%
rename from TileCalorimeter/TileL2Algs/doc/mainpage.h
rename to TileCalorimeter/TileL2Algs/doc/packagedoc.h
index 55ff9c20555c006edafdcbd171f9627c8e31e5f2..347c30bf693d6a49a12d297ee186fea19e249c1a 100644
--- a/TileCalorimeter/TileL2Algs/doc/mainpage.h
+++ b/TileCalorimeter/TileL2Algs/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page TileL2Algs_page 
 
 This package contains the code related to the two trigger oriented algorithms that are processed at the TileCal ROD DSPs:
 
@@ -17,7 +17,7 @@ These algorithms are implemented in the ROD DSP code and meant to be running onl
 @author Carlos Solans Carlos.Solans@cern.ch
 @author Jose Maneira Jose.Maneira@cern.ch
 
-@section Class Classes
+@section TileL2Algs_Class Classes
 
 The TileL2Algs package contains the following classes:
 
@@ -65,10 +65,8 @@ It takes as input the raw channels from TileRawChannelContainer. The resulting T
 
 /**
 @page used_TileL2Algs Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileL2Algs Requirements
-@include requirements
 */
diff --git a/TileCalorimeter/TileMonitoring/doc/mainpage.h b/TileCalorimeter/TileMonitoring/doc/packagedoc.h
similarity index 91%
rename from TileCalorimeter/TileMonitoring/doc/mainpage.h
rename to TileCalorimeter/TileMonitoring/doc/packagedoc.h
index 675daabb32066d842489f671603743340739e75d..e1e1c8504a1eb17d161adf7d3c8541b69e393e93 100644
--- a/TileCalorimeter/TileMonitoring/doc/mainpage.h
+++ b/TileCalorimeter/TileMonitoring/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileMonitoring Package
+@page TileMonitoring_page TileMonitoring Package
 
 This package provides Monitoring tools and top algorithm for TileCalorimeter, plus some root macro and TileCosmicView
 
@@ -13,7 +13,7 @@ This package provides Monitoring tools and top algorithm for TileCalorimeter, pl
 @author Alexander Solodkov <Sanya.Solodkov@cern.ch>
 @author Luciano Filho <lucianof@lps.ufrj.br>
 
-@section Package_Structure
+@section TileMonitoring_Package_Structure 
 The package contains a top algorithm, @c TileCosmicHisto, that collected and control the algorithm tools.
 Algorithm tools exist for calibration runs reconstruction (for the so called Team5 analysis) and for cosmic runs.
 The monitoring is done in the algorithm tools and they are organised by input container:
@@ -32,7 +32,7 @@ TileDigitsMonTool and TileRawChannelMonTool inherit from a different class  Tile
 old class Control/AthenaMonitoring/MonitorToolBase, because there is no need of the Managed sofistications for calibratrion
 analysis
 
-@section TileCosmicViewer
+@section TileMonitoring_TileCosmicViewer 
 TileCosmicViewer is a root-based tool developed by Luciano Filho to display Tile and LAr cells and TileMuonFitter objects.
 
 @ref used_TileMonitoring
@@ -42,12 +42,10 @@ TileCosmicViewer is a root-based tool developed by Luciano Filho to display Tile
 
 /**
 @page used_TileMonitoring Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileMonitoring Requirements
-@include requirements
 */
 
 
diff --git a/TileCalorimeter/TileMuId/doc/mainpage.h b/TileCalorimeter/TileMuId/doc/packagedoc.h
similarity index 92%
rename from TileCalorimeter/TileMuId/doc/mainpage.h
rename to TileCalorimeter/TileMuId/doc/packagedoc.h
index 5bacf18e795ad00adcbe14042dbc88be64bd45a0..fa480c8242eb0430cfd6f9e031e08fd3a093be75 100644
--- a/TileCalorimeter/TileMuId/doc/mainpage.h
+++ b/TileCalorimeter/TileMuId/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage TileMuId Package
+@page TileMuId_page TileMuId Package
 
 @author Giulio Usai Giulio.Usai@cern.ch
 
-@section TileMuIdIntro Introduction
+@section TileMuId_TileMuIdIntro Introduction
 
 This package provide muon identification exploiting  the
 transverse and radial segmentation of the Tile Calorimeter.
@@ -32,7 +32,7 @@ as the  average coordinates of the crossed cells in the
 three layers. The typical resolutions  are
 \f$ \sigma_{\eta}=0.04 \f$ and \f$ \sigma_{\phi}=0.06 \f$ rad.
 
-@section TileMuIdOverview Class Overview
+@section TileMuId_TileMuIdOverview Class Overview
 
 One simplified version of the algorithm is implemented in the ROD DSP;
 this provides (online) the info described above encoded in the ROD fragment.
@@ -53,10 +53,8 @@ the ntuple for analysis.
 
 /**
 @page used_TileMuId Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileMuId Requirements
-@include requirements
 */ 
diff --git a/TileCalorimeter/TilePulseSimulator/doc/mainpage.h b/TileCalorimeter/TilePulseSimulator/doc/packagedoc.h
similarity index 85%
rename from TileCalorimeter/TilePulseSimulator/doc/mainpage.h
rename to TileCalorimeter/TilePulseSimulator/doc/packagedoc.h
index 44ca1940673d96e8b834cfba721c5715ec435c38..2993c7e1c10bfa3c7f7448387fc671540d1a8690 100644
--- a/TileCalorimeter/TilePulseSimulator/doc/mainpage.h
+++ b/TileCalorimeter/TilePulseSimulator/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage TilePulseSimulator package
+@page TilePulseSimulator_page TilePulseSimulator package
 
 @author Simon Molander <simon.molander@cern.ch>
 
-@section Intro Introduction
+@section TilePulseSimulator_Intro Introduction
 
 This package contains a set of ROOT-based classes which are used by 
 TileSimAlgs package to inject arbitrary pulse into TileCal digitization chain:
diff --git a/TileCalorimeter/TileRawUtils/doc/mainpage.h b/TileCalorimeter/TileRawUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from TileCalorimeter/TileRawUtils/doc/mainpage.h
rename to TileCalorimeter/TileRawUtils/doc/packagedoc.h
index bf9c4fd2997c543b828366c944cc704dcfc5f727..244852d3249ba1f2bb3281a85f7a6e0903cc14c2
--- a/TileCalorimeter/TileRawUtils/doc/mainpage.h
+++ b/TileCalorimeter/TileRawUtils/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileRawUtils Package
+@page TileRawUtils_page TileRawUtils Package
 
 This package provides tables for region HLT region selectors
 
diff --git a/TileCalorimeter/TileRec/doc/mainpage.h b/TileCalorimeter/TileRec/doc/packagedoc.h
similarity index 90%
rename from TileCalorimeter/TileRec/doc/mainpage.h
rename to TileCalorimeter/TileRec/doc/packagedoc.h
index 844fe00d4bd9e588e638a82c76b96594fb6b4407..460efc22ce7b85f2ab51940b9c7e2c52f9073496 100644
--- a/TileCalorimeter/TileRec/doc/mainpage.h
+++ b/TileCalorimeter/TileRec/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileRec Package
+@page TileRec_page TileRec Package
 
 This package provides tools that send containers of different formats into
 a ntuple format.
@@ -13,7 +13,7 @@ a ntuple format.
 @author Jose Maneira <maneira@lip.pt>
 @author Luca Fiorini <Luca.Fiorini@cern.ch>
 
-@section TileCal commissioning ntuple
+@section TileRec_TileCal commissioning ntuple
 
 TileAANtuple class creates so-called h2000 ntuple which 
 contains all ditigts, all rawChannels (both results of 
@@ -21,7 +21,7 @@ optimal filter in Athena and DSP results), DQ status words etc
 most of the arrays have dimensions 4x64x48 which correspond
 to 4 partitions, 64 modules, 48 channels.
 
-@section standalone ntuples
+@section TileRec_standalone ntuples
 
 The remaining classes implement the output into standalone
 ntuples for the following containers:
diff --git a/TileCalorimeter/TileRecAlgs/doc/mainpage.h b/TileCalorimeter/TileRecAlgs/doc/packagedoc.h
similarity index 92%
rename from TileCalorimeter/TileRecAlgs/doc/mainpage.h
rename to TileCalorimeter/TileRecAlgs/doc/packagedoc.h
index ae215db9ecbd29d89644d969b9afd2e1442f4167..dda346b40c4bfe0ce8e606d0a1720ec6c0bfcf01 100644
--- a/TileCalorimeter/TileRecAlgs/doc/mainpage.h
+++ b/TileCalorimeter/TileRecAlgs/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage TileRecAlgs Package
+@page TileRecAlgs_page TileRecAlgs Package
 
 This package provides format conversion methods for reconstructed objects.
 
 @author Alexander Solodkov <Sanya.Solodkov@cern.ch>
 
-@section Format conversion tools
+@section TileRecAlgs_Format conversion tools
 
   - The TileBeamElemToCell algorithm is used for test beam data to convert additional detector information into a convenient TileCell format.
 
@@ -22,7 +22,7 @@ This package provides format conversion methods for reconstructed objects.
 
   - Thie TileCellToTTL1 algorithm is used to build the L1 trigger tower from the Tile Cell energy. This is useful for L1Calo to compare their tower energy to the tower energy from the Tile digitial readout. 
 
-@section Aditional tools
+@section TileRecAlgs_Aditional tools
 
   - The TileCellVerify algorithm is used to compare TileCell objects created with TileCellIDCToCell with those created following the standard way, through TileCellBuilder (see the TileRecUtils package).
   
diff --git a/TileCalorimeter/TileRecUtils/doc/mainpage.h b/TileCalorimeter/TileRecUtils/doc/packagedoc.h
similarity index 96%
rename from TileCalorimeter/TileRecUtils/doc/mainpage.h
rename to TileCalorimeter/TileRecUtils/doc/packagedoc.h
index 7440329d881a22b906832d4b877a281ae884c940..93ebb0a5c37cd88fbeb31a9331dbfefa64325ff0 100644
--- a/TileCalorimeter/TileRecUtils/doc/mainpage.h
+++ b/TileCalorimeter/TileRecUtils/doc/packagedoc.h
@@ -6,13 +6,13 @@
 
 This package contains the algorithms and tools used for TileCal reconstruction
 
-@mainpage
+@page TileRecUtils_page 
 
 @author Alexander Solodkov <Sanya.Solodkov@cern.ch>
 @author Tomas Davidek  <Tomas.Davidek@cern.ch>
 @author Ximo Poveda <Ximo.Poveda@cern.ch>
 
-@section Algos Algorithms
+@section TileRecUtils_Algos Algorithms
   
   The following algorithms are present in this package:
 
@@ -21,7 +21,7 @@ This package contains the algorithms and tools used for TileCal reconstruction
   - TileRawChannelVerify: this algorithm compares two sets of  TileRawChannels (obtained from different data and/or reconstructed by different methods) dumping differences in the console. 
 
 
-@section ATools AlgTools
+@section TileRecUtils_ATools AlgTools
 
   These are the tools in the TileRecutils package:
 
@@ -54,11 +54,9 @@ This package contains the algorithms and tools used for TileCal reconstruction
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 
 */
diff --git a/TileCalorimeter/TileSimAlgs/doc/mainpage.h b/TileCalorimeter/TileSimAlgs/doc/packagedoc.h
similarity index 96%
rename from TileCalorimeter/TileSimAlgs/doc/mainpage.h
rename to TileCalorimeter/TileSimAlgs/doc/packagedoc.h
index b9aa20abd45f1b49e6feff037733fc0919955e53..39874b9689553ceb831d2e804c86820115db2f23 100644
--- a/TileCalorimeter/TileSimAlgs/doc/mainpage.h
+++ b/TileCalorimeter/TileSimAlgs/doc/packagedoc.h
@@ -6,13 +6,13 @@
 
 This package contains the algorithms used for TileCal simulation
 
-@mainpage
+@page TileSimAlgs_page 
 
 @author Alexander Solodkov <Sanya.Solodkov@cern.ch>
 @author Ximo Poveda <Ximo.Poveda@cern.ch>
 @author Simon Molander <Simon.Molander@cern.ch>
 
-@section Algos Algorithms
+@section TileSimAlgs_Algos Algorithms
   
   The following algorithms are present in this package:
   
@@ -38,11 +38,9 @@ is the default mode of running. It is possible to specify the 'cosmic' mode of r
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 
 */
diff --git a/TileCalorimeter/TileSimEvent/doc/mainpage.h b/TileCalorimeter/TileSimEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from TileCalorimeter/TileSimEvent/doc/mainpage.h
rename to TileCalorimeter/TileSimEvent/doc/packagedoc.h
index 03cc94e2b135f07eeab35c7e7b0169a401a26bd0..0b568476cf75cea57f8f88ead609b996e7a37a94
--- a/TileCalorimeter/TileSimEvent/doc/mainpage.h
+++ b/TileCalorimeter/TileSimEvent/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileSimEvent Package
+@page TileSimEvent_page TileSimEvent Package
 
 This package provides event data model classes for TileCal Geant4 simulation 
 
@@ -12,7 +12,7 @@ This package provides event data model classes for TileCal Geant4 simulation
 @author Vakhtang Tsulaia <Vakhtang.Tsulaia@cern.ch>
 @author Alexander Solodkov <Sanya.Solodkov@cern.ch>
 
-@section TileSimEventTileHit TileHit class
+@section TileSimEvent_TileSimEventTileHit TileHit class
 
 TileHit class is used to store visible energy deposited in active part of the 
 Tile calorimeter in Geant4 simulation. Active part of the TileCal is 
@@ -40,7 +40,7 @@ might be rather big (>100ns), but it is corrected by global event time
 in TileHitVecToCnt algorithm from TileSimAlgs package and hits which 
 are used in TileDigitsMaker have time close to zero (within [-100ns,100ns] window)
  
-@section TileSimEventTileHitVector TileHitVector class
+@section TileSimEvent_TileSimEventTileHitVector TileHitVector class
 
 TileHitVector is a typedef of AthenaHitsVector<TileHit>
 and it is used to persistify TileHits
diff --git a/TileCalorimeter/TileSimUtils/doc/mainpage.h b/TileCalorimeter/TileSimUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from TileCalorimeter/TileSimUtils/doc/mainpage.h
rename to TileCalorimeter/TileSimUtils/doc/packagedoc.h
index 23a43e758c9b0c91ae7f018ed84f80eb458f6fef..920efc3ae26ec6baa3b5d1d83bd23c95a8c4a284
--- a/TileCalorimeter/TileSimUtils/doc/mainpage.h
+++ b/TileCalorimeter/TileSimUtils/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileSimUtils Package
+@page TileSimUtils_page TileSimUtils Package
 
 All TileCal-specific parameters for Geant4 simulation are defined in this package
 
diff --git a/TileCalorimeter/TileSvc/TileByteStream/doc/mainpage.h b/TileCalorimeter/TileSvc/TileByteStream/doc/packagedoc.h
similarity index 96%
rename from TileCalorimeter/TileSvc/TileByteStream/doc/mainpage.h
rename to TileCalorimeter/TileSvc/TileByteStream/doc/packagedoc.h
index 17baa4cbe520de2f169e24559ea2b50a59413f9f..a5681148f7b5e2f84ab7a23e0ab42ef4ca3e9225 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/doc/mainpage.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/doc/packagedoc.h
@@ -6,14 +6,14 @@
 
 This package is used to decode and encode TileCal bytestream.
 
-@mainpage
+@page TileByteStream_page 
 
 @author Alexander Solodkov <Sanya.Solodkov@cern.ch>
 @author Denis Oliveira Damazio <Denis.Oliveira.Damazio@cern.ch>
 @author Aranzazu Ruiz Martinez <Aranzazu.Ruiz.Martinez@cern.ch>
 @author Belen Salvachua <Belen.Salvachua@cern.ch>
 
-@section Cnv Converters
+@section TileByteStream_Cnv Converters
   
   The following converters are present in this package:
 
@@ -27,7 +27,7 @@ This package is used to decode and encode TileCal bytestream.
 
   - TileCellIDC_ByteStreamCnv: this class contains methods to do the conversion from bytestream format to TileCells stored in a TileCellIDC container (IdentifiableContainer, used for Level-2 Trigger).
 
-@section Tool AlgTools
+@section TileByteStream_Tool AlgTools
 
   The following AlgTools are present in this package:
 
@@ -50,7 +50,7 @@ This package is used to decode and encode TileCal bytestream.
     - frag type 0x14: MET in staging mode
     - frag type 0x15: MET in full mode
 
-@section Class Classes
+@section TileByteStream_Class Classes
 
   The following additional classes are also present in this package:
 
@@ -75,10 +75,8 @@ This package is used to decode and encode TileCal bytestream.
 
 /**
 @page used_TileByteStream Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileByteStream Requirements
-@include requirements
 */
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/doc/mainpage.h b/TileCalorimeter/TileSvc/TileEventAthenaPool/doc/packagedoc.h
similarity index 90%
rename from TileCalorimeter/TileSvc/TileEventAthenaPool/doc/mainpage.h
rename to TileCalorimeter/TileSvc/TileEventAthenaPool/doc/packagedoc.h
index b5d8c513d85231acd3048dc6e45ee9075f3e67ce..1c5a1b8769747715ca7a4b2576b5905dfb71b260 100644
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/doc/mainpage.h
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TileEventAthenaPool Package
+@page TileEventAthenaPool_page TileEventAthenaPool Package
 
 This package handles the conversion of Tile data classes to Pool format.
 
@@ -19,7 +19,7 @@ type casts have to be used.
 More details about Pool coversion here:
 https://twiki.cern.ch/twiki/bin/view/Atlas/WriteReadDataViaPool
 
-@section Automatic Pool conversion
+@section TileEventAthenaPool_Automatic Pool conversion
 The AthenaPoolCnvSvc package provides generic converters via a CMT poolcnv
 pattern. The Tile classes that use this are:  
 
@@ -29,7 +29,7 @@ TileEvent/TileMuContainer
 		  TileTriggerContainer 
 		  TileCosmicMuon
   
-@section Custom Pool conversion
+@section TileEventAthenaPool_Custom Pool conversion
 
 The other Tile EDM classes have custom converters, defined in this package.
 
@@ -47,11 +47,9 @@ https://twiki.cern.ch/twiki/bin/view/Atlas/TransientPersistentSeparation
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 
 */
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/doc/mainpage.h b/TileCalorimeter/TileSvc/TileIdCnv/doc/packagedoc.h
similarity index 87%
rename from TileCalorimeter/TileSvc/TileIdCnv/doc/mainpage.h
rename to TileCalorimeter/TileSvc/TileIdCnv/doc/packagedoc.h
index 3a915d48499bc8b91bd3f5f6cb7d302579654392..3282ac631ea9650031561321f5372d2d89e66128 100644
--- a/TileCalorimeter/TileSvc/TileIdCnv/doc/mainpage.h
+++ b/TileCalorimeter/TileSvc/TileIdCnv/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page TileIdCnv_page 
 
 The TileIdCnv package contains the converters which are necessary
 to initialize the TileCalorimeter helpers and identifier managers. <br>
@@ -12,8 +12,6 @@ There is only one helper actually -  TileHWID which is the online helper
 for all TileCal channels (256*48 channels, two gains each)
 Full description of helper class can be found in TileIdentifier package.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/TileCalorimeter/TileSvc/TileSimEventAthenaPool/doc/mainpage.h b/TileCalorimeter/TileSvc/TileSimEventAthenaPool/doc/packagedoc.h
similarity index 87%
rename from TileCalorimeter/TileSvc/TileSimEventAthenaPool/doc/mainpage.h
rename to TileCalorimeter/TileSvc/TileSimEventAthenaPool/doc/packagedoc.h
index c04656836b3078d8fe4d41a6e745873c28424683..759301c21b4032645b155de6c5bb1cc4bb1dc966 100644
--- a/TileCalorimeter/TileSvc/TileSimEventAthenaPool/doc/mainpage.h
+++ b/TileCalorimeter/TileSvc/TileSimEventAthenaPool/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TileEventAthenaPool Package
+@page TileSimEventAthenaPool_page TileEventAthenaPool Package
 
 This package handles the conversion of Tile data classes to Pool format.
 
@@ -19,12 +19,12 @@ type casts have to be used.
 More details about Pool coversion here:
 https://twiki.cern.ch/twiki/bin/view/Atlas/WriteReadDataViaPool
 
-@section Automatic Pool conversion
+@section TileSimEventAthenaPool_Automatic Pool conversion
 The AthenaPoolCnvSvc package provides generic converters via a CMT poolcnv
 pattern. The Tile classes that use this are:  
 
   
-@section Custom Pool conversion
+@section TileSimEventAthenaPool_Custom Pool conversion
 
 The other Tile EDM classes have custom converters, defined in this package.
 
@@ -38,11 +38,9 @@ https://twiki.cern.ch/twiki/bin/view/Atlas/TransientPersistentSeparation
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 
 */
diff --git a/TileCalorimeter/TileSvc/TileSimEventTPCnv/doc/mainpage.h b/TileCalorimeter/TileSvc/TileSimEventTPCnv/doc/packagedoc.h
similarity index 87%
rename from TileCalorimeter/TileSvc/TileSimEventTPCnv/doc/mainpage.h
rename to TileCalorimeter/TileSvc/TileSimEventTPCnv/doc/packagedoc.h
index 2b9acc4e75fdcd64db0c023ffef48c28144135bb..4cf7a7258959f78ce6d83e88186b2ed010b435f6 100644
--- a/TileCalorimeter/TileSvc/TileSimEventTPCnv/doc/mainpage.h
+++ b/TileCalorimeter/TileSvc/TileSimEventTPCnv/doc/packagedoc.h
@@ -6,12 +6,12 @@
 
 This package is used to provide the Transient/Persistent separation for TileCal simulation hits classes.
 
-@mainpage
+@page TileSimEventTPCnv_page 
 
 @author Aranzazu Ruiz Martinez <Aranzazu.Ruiz.Martinez@cern.ch>
 @author Alexander Solodkov <Sanya.Solodkov@cern.ch>
 
-@section Intro Introduction
+@section TileSimEventTPCnv_Intro Introduction
 
   - Two separate data models are used:
   - Transient data model: principal, used almost everywhere
@@ -21,7 +21,7 @@ This package is used to provide the Transient/Persistent separation for TileCal
   - It allows more efficient and performant data storage, important to include information in ESD or AOD files
   - Data is being copied between transient and persistent objects before writing and after reading by the T/P converters
 
-@section Info Related Packages
+@section TileSimEventTPCnv_Info Related Packages
 
   The persistent classes and containers in TileTPCnv package have the correspondent transient classes and containers in TileSimEvent packages:
 
@@ -31,7 +31,7 @@ This package is used to provide the Transient/Persistent separation for TileCal
 
   The AthenaPool converters, where these GUIDs are used, are stored in TileSimEventAthenaPool package.
 
-@section Class Persistent Classes
+@section TileSimEventTPCnv_Class Persistent Classes
 
   The following persistent classes are implemented in this package:
 
@@ -39,13 +39,13 @@ This package is used to provide the Transient/Persistent separation for TileCal
 
   This persistent classes are meant to reduce the size of the objects, i.e. converting variables from double to float, for data storage. Note that a GUID is assigned for each persistent class in TileSimEventTPCnv/selection.xml file.
 
-@section Cnt Persistent Containers
+@section TileSimEventTPCnv_Cnt Persistent Containers
 
   The following persistent containers are implemented in this package:
 
   - TileHitVector_p1
 
-@section Cnv T/P Converters
+@section TileSimEventTPCnv_Cnv T/P Converters
   
   The following T/P converters are implemented in this package:
 
@@ -53,7 +53,7 @@ This package is used to provide the Transient/Persistent separation for TileCal
 
   In the T/P converters, the methods transToPers and persToTrans are used for the conversion from transient to persistent or vice versa.
 
-@section CntCnv T/P Container Converters
+@section TileSimEventTPCnv_CntCnv T/P Container Converters
 
   The following T/P container converters are implemented in this package:
 
@@ -66,10 +66,8 @@ This package is used to provide the Transient/Persistent separation for TileCal
 
 /**
 @page used_TileTPCnv Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileTPCnv Requirements
-@include requirements
 */
diff --git a/TileCalorimeter/TileSvc/TileTPCnv/doc/mainpage.h b/TileCalorimeter/TileSvc/TileTPCnv/doc/packagedoc.h
similarity index 91%
rename from TileCalorimeter/TileSvc/TileTPCnv/doc/mainpage.h
rename to TileCalorimeter/TileSvc/TileTPCnv/doc/packagedoc.h
index 41239d34721b23e06eb78f4fad74bef99c8a9370..391519635c8135a9eddb0c392682e0a24d02c3b1 100644
--- a/TileCalorimeter/TileSvc/TileTPCnv/doc/mainpage.h
+++ b/TileCalorimeter/TileSvc/TileTPCnv/doc/packagedoc.h
@@ -6,12 +6,12 @@
 
 This package is used to provide the Transient/Persistent separation for TileCal classes.
 
-@mainpage
+@page TileTPCnv_page 
 
 @author Aranzazu Ruiz Martinez <Aranzazu.Ruiz.Martinez@cern.ch>
 @author Alexander Solodkov <Sanya.Solodkov@cern.ch>
 
-@section Intro Introduction
+@section TileTPCnv_Intro Introduction
 
   - Two separate data models are used:
     - Transient data model: principal, used almost everywhere
@@ -21,7 +21,7 @@ This package is used to provide the Transient/Persistent separation for TileCal
   - It allows more efficient and performant data storage, important to include information in ESD or AOD files
   - Data is being copied between transient and persistent objects before writing and after reading by the T/P converters
 
-@section Info Related Packages
+@section TileTPCnv_Info Related Packages
 
   The persistent classes and containers in TileTPCnv package have the correspondent transient classes and containers in TileSimEvent and TileEvent packages:
 
@@ -35,7 +35,7 @@ This package is used to provide the Transient/Persistent separation for TileCal
 
   The AthenaPool converters, where these GUIDs are used, are stored in TileEventAthenaPool package.
 
-@section Class Persistent Classes
+@section TileTPCnv_Class Persistent Classes
 
   The following persistent classes are implemented in this package:
 
@@ -47,7 +47,7 @@ This package is used to provide the Transient/Persistent separation for TileCal
 
   This persistent classes are meant to reduce the size of the objects, i.e. converting variables from double to float, for data storage. Note that a GUID is assigned for each persistent class in TileTPCnv/selection.xml file.
 
-@section Cnt Persistent Containers
+@section TileTPCnv_Cnt Persistent Containers
 
   The following persistent containers are implemented in this package:
 
@@ -57,7 +57,7 @@ This package is used to provide the Transient/Persistent separation for TileCal
   - TileCosmicMuonContainer_p1
   - TileTTL1CellContainer_p1
 
-@section Cnv T/P Converters
+@section TileTPCnv_Cnv T/P Converters
   
   The following T/P converters are implemented in this package:
 
@@ -69,7 +69,7 @@ This package is used to provide the Transient/Persistent separation for TileCal
 
   In the T/P converters, the methods transToPers and persToTrans are used for the conversion from transient to persistent or vice versa.
 
-@section CntCnv T/P Container Converters
+@section TileTPCnv_CntCnv T/P Container Converters
 
   The following T/P container converters are implemented in this package:
 
@@ -86,10 +86,8 @@ This package is used to provide the Transient/Persistent separation for TileCal
 
 /**
 @page used_TileTPCnv Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileTPCnv Requirements
-@include requirements
 */
diff --git a/TileCalorimeter/TileTBRec/doc/mainpage.h b/TileCalorimeter/TileTBRec/doc/packagedoc.h
similarity index 89%
rename from TileCalorimeter/TileTBRec/doc/mainpage.h
rename to TileCalorimeter/TileTBRec/doc/packagedoc.h
index 27f7fca7272937bd90d7810090aac31c2f68926a..c4b927931dfdd8fd15e502027c89d997f8a9ec4e 100644
--- a/TileCalorimeter/TileTBRec/doc/mainpage.h
+++ b/TileCalorimeter/TileTBRec/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TileTBRec Package
+@page TileTBRec_page TileTBRec Package
 
 This package contains algorithm used for testbeam and calibration runs reconstruction. It contains algorithms to dump ByteStream data, produce run statistics and to create testbeam ntuples used by TileCal offline data quality group (Team5).
 
@@ -13,22 +13,22 @@ This package contains algorithm used for testbeam and calibration runs reconstru
 @author Luca Fiorini <Luca.Fiorini@cern.ch>
 @author Ximo Poveda <Joaquin.Poveda@cern.ch>
 
-@section TileTBNtuple
+@section TileTBRec_TileTBNtuple 
 Obsolete for releases > 13.0.10. Use  TileTBAANtuple, instead.
 
-@section TileTBAANtuple
+@section TileTBRec_TileTBAANtuple 
 TileTBAANtuple algorithm creates ntuples for testbeam and calibration runs. Ntuple variables are allocated dynamically depending on the bytestream data. 
 The typical ntuple would contain Tile Digits informations (samples ADC counts, BCID, CRC), RawChannels informations, Trigger and General informations.
 TileTBAANtuple provides the same informations as the former TileTBNtuple, but it writes to an THistSvc NTuple instead of a NtupleSvc ntuple. It is fully functional. It doesn't inherit from CBNTAA. It uses arrays instead of vectors to be fully compatible with the ROOT macros used in the past for TileTBNtuple and because in ROOT arrays are easier and faster to handle than vectors. 
 
-@section TileTBDump
+@section TileTBRec_TileTBDump 
 TileTBDump produces a formatted dump of Tile ByteStream fragments.
 In particular DSPReco and Digits fragments are dumped.
 
-@section TileTBStat
+@section TileTBRec_TileTBStat 
 TileTBStat produce statistics from the Byte Stream data fragment. This algorithm is used to put run statistics in TileCal commissioning database.
 
-@section TileTBAna
+@section TileTBRec_TileTBAna 
 Obsolete algorithm to produce a testbeam summary ntuple.
 
 @ref used_TileTBRec
@@ -38,12 +38,10 @@ Obsolete algorithm to produce a testbeam summary ntuple.
 
 /**
 @page used_TileTBRec Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TileTBrec Requirements
-@include requirements
 */
 
 
diff --git a/TileCalorimeter/TileTrackingGeometry/doc/mainpage.h b/TileCalorimeter/TileTrackingGeometry/doc/packagedoc.h
similarity index 79%
rename from TileCalorimeter/TileTrackingGeometry/doc/mainpage.h
rename to TileCalorimeter/TileTrackingGeometry/doc/packagedoc.h
index 47a5825864b2000c0c891ae81d1397d6cb370ec5..981eee1380f37aab54a8ce395ce5a3afdfc6af6e 100644
--- a/TileCalorimeter/TileTrackingGeometry/doc/mainpage.h
+++ b/TileCalorimeter/TileTrackingGeometry/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage TileTrackingGeometry package
+@page TileTrackingGeometry_page TileTrackingGeometry package
 
 @author Andreas.Salzburger@cern.ch
 
-@section TileTrackingGeometryIntro Introduction
+@section TileTrackingGeometry_TileTrackingGeometryIntro Introduction
 
 This packge contains a single AthAlgTool, the TileVolumeBuilder that
 translates the TileGeometry description into Trk::TrackingVolume objects.
diff --git a/Tools/LWHists/doc/mainpage.h b/Tools/LWHists/doc/packagedoc.h
similarity index 83%
rename from Tools/LWHists/doc/mainpage.h
rename to Tools/LWHists/doc/packagedoc.h
index d2688e153bb30c62138e0fc77f6258b6ab03e021..1147594036d651add5a7c2ab4caf7694a0379e5a 100644
--- a/Tools/LWHists/doc/mainpage.h
+++ b/Tools/LWHists/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage LWHists: Light-weight versions of ROOT histogram classes.
+@page LWHists_page LWHists: Light-weight versions of ROOT histogram classes.
 
 This package provides lightweight versions of the widely used ROOT
 histogram classes TH1F, TH1D, TH1I, TH2F, TH2D and TH2I: @m TH1F_LW,
@@ -23,11 +23,11 @@ class. The obvious use case for this is that one can use the
 light-weight histogram during a given job, but still be able to write
 out an actual ROOT histogram instance into an output file.
 
-@section optimisationsLWHists Optimisations used internally
+@section LWHists_optimisationsLWHists Optimisations used internally
 
 @Todo: Write this section
 
-@section testingLWHists Testing
+@section LWHists_testingLWHists Testing
 
 In addition to the shared library, the package also provides two
 applications for testing the performance (cpu/mem) and validity
@@ -38,10 +38,8 @@ the provided histogram classes. The applications are <b>lwhists_benchmark.exe</b
 
 @author Thomas.Kittelmann@cern.ch
 
-@section used_packagesLWHists Used Packages
-@htmlinclude used_packages.html
+@section LWHists_used_packagesLWHists Used Packages
 
-@section requirements Requirements
-@include requirements
+@section LWHists_requirements Requirements
 
 */
diff --git a/Tools/PathResolver/doc/mainpage.h b/Tools/PathResolver/doc/packagedoc.h
similarity index 96%
rename from Tools/PathResolver/doc/mainpage.h
rename to Tools/PathResolver/doc/packagedoc.h
index f4a19929430efb1818b96a7632dcdab61ecab5cb..05a25a25aef4209a0a0fd141520f5e23ab158436 100644
--- a/Tools/PathResolver/doc/mainpage.h
+++ b/Tools/PathResolver/doc/packagedoc.h
@@ -4,12 +4,12 @@
 
 /**
 
- @mainpage
+@page PathResolver_page 
 
  <center><b>This utility finds files or directories from a search path list.</b></center>
 
 <hr />
-@section Principle Principle
+@section PathResolver_Principle Principle
 
    Assuming that a path-like environment variable is defined and
    filled in with the possible prioritized locations where a category
@@ -47,7 +47,7 @@
    </p>
 
 <hr />
-@section Using Using the PathResolver
+@section PathResolver_Using Using the PathResolver
 
    @subsection Accessing Accessing the PathResolver package.
 
diff --git a/Tools/PyUtils/doc/mainpage.h b/Tools/PyUtils/doc/packagedoc.h
similarity index 97%
rename from Tools/PyUtils/doc/mainpage.h
rename to Tools/PyUtils/doc/packagedoc.h
index fec2e2cc9a6506e3bcde5dbacda11387b6a48ed3..f07f06cc1827019ce8cb24f79f8b553b5db2d036 100644
--- a/Tools/PyUtils/doc/mainpage.h
+++ b/Tools/PyUtils/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage PyUtils Package
+@page PyUtils_page PyUtils Package
 @author Sebastien Binet
 
-@section PyUtilsIntro Introduction
+@section PyUtils_PyUtilsIntro Introduction
 
 This package holds various python classes and scripts of general use.
 
-@section PyUtilsOverview Class Overview
+@section PyUtils_PyUtilsOverview Class Overview
   The PyUtils package contains the following classes:
 
   - python::PoolFile::PoolFile : a python class to model and extract informations about the content of a POOL file. The informations are stored into a python::PoolFile::PoolRecord (memory and compressed size, name of the container, number of such items into that POOL file). A script (@c checkFile.py) is provided to easily inspect and dump the content of such POOL files:
@@ -43,7 +43,7 @@ were not executed, a message will be printed, and a .cover
 file will be written that calls out the specific lines that
 were not executed.
 
-@section PyUtilsScripts Scripts
+@section PyUtils_PyUtilsScripts Scripts
   The PyUtils package provides some useful scripts:
 
   - @c checkFile.py : as mentionned above this script can inspect a POOL file and dump on screen its 'high level' content. It will tell you what kind of containers have been stored (eg: @c ElectronContainer, @c TruthParticleContainer,...) but it won't tell you more detailed properties (such as pt,eta distributions). That's however already useful and can be used for example to quickly check your algorithm did its job if it was supposed to process 100 events and create 100 @c MyZeeBosonContainer. <b>Ex:</b>
@@ -132,10 +132,8 @@ PyCmt   : INFO     Found [149] clients for [AthenaKernel]
 
 /**
 @page used_PyUtils Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_PyUtils Requirements
-@include requirements
 */
diff --git a/Tools/XMLCoreParser/doc/MainPage.h b/Tools/XMLCoreParser/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 99%
rename from Tools/XMLCoreParser/doc/MainPage.h
rename to Tools/XMLCoreParser/doc/packagedoc.h
index 5eaf505c5af086e6998349fbd36de029ca22105e..82a0b509e3b48d0e3078147ad8e28175b2bd6e95
--- a/Tools/XMLCoreParser/doc/MainPage.h
+++ b/Tools/XMLCoreParser/doc/packagedoc.h
@@ -6,7 +6,7 @@
 
 /**
 
-   @mainpage
+@page XMLCoreParser_page 
 
 This package provides a simplified API towards XML DOM Parsers. 
 It hides most of what is required to setup a proper DOM parser, while keeping free access to the DOM nodes.
diff --git a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/doc/mainpage.h b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 65%
rename from Tracking/TrkAlgorithms/TrkCollectionAliasAlg/doc/mainpage.h
rename to Tracking/TrkAlgorithms/TrkCollectionAliasAlg/doc/packagedoc.h
index 6e3fb217fa3ded7e06ec08bb240c9eeeb8e627ed..3dbe0ff168be42a4ace085bd8e7bd83c61f16a31
--- a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/doc/mainpage.h
+++ b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/doc/packagedoc.h
@@ -3,14 +3,13 @@
 */
 
 /**
-@mainpage TrkCollectionAliasAlg Package
+@page TrkCollectionAliasAlg_page TrkCollectionAliasAlg Package
 
 This package contains the Algorithm TrkCollectionAliasAlg which generates a StoreGate alias for a TrackCollection
 
 @author Martin Siebel <Martin.Siebel@CERN.ch>
 
-@section TrkCollectionAliasAlgReq Requirements
+@section TrkCollectionAliasAlg_TrkCollectionAliasAlgReq Requirements
 
-@include requirements
 
 */
diff --git a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/doc/mainpage.h b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 65%
rename from Tracking/TrkAlgorithms/TrkTrackCollectionMerger/doc/mainpage.h
rename to Tracking/TrkAlgorithms/TrkTrackCollectionMerger/doc/packagedoc.h
index 84ef8c52adddd44b5a7938f2a8644f22ee45b161..ad07e1ef91d4f36c7987073899dd2a29e0a2a810
--- a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/doc/mainpage.h
+++ b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage TrkTrackCollectionMerger
+@page TrkTrackCollectionMerger_page TrkTrackCollectionMerger
 @author Thomas.Koffas@cern.ch
 
-@section TrkTrackCollectionMergerIntro Introduction
+@section TrkTrackCollectionMerger_TrkTrackCollectionMergerIntro Introduction
 
 This is an algorithm that merges all individual track collections,
 SiSeededTracks, back-tracks, standalone TRT tracks etc. It runs at
 the end of the tracking and before the post processing. It ouputs
 a global track collection.
 
-@section TrkTrackCollectionMergerDescription Description
+@section TrkTrackCollectionMerger_TrkTrackCollectionMergerDescription Description
 
 This algorithm performs the following tasks:
 
@@ -28,21 +28,19 @@ This algorithm performs the following tasks:
 
 3.  The new collection is stored.
 
-@section TrkTrackCollectionMergerTools Used Tools
+@section TrkTrackCollectionMerger_TrkTrackCollectionMergerTools Used Tools
 
 This algorithm uses the ITrackSummaryTool, IPRD_AssociationTool tools.
 
-@section TrkTrackCollectionMergerContents Algorithm Contents
+@section TrkTrackCollectionMerger_TrkTrackCollectionMergerContents Algorithm Contents
 
 The TrkTrackCollectionMerger contains the following classes/files:
 
 - TrkTrackCollectionMerger.cxx...Main class calling all the necessary tools and producing the ouput track collection.
 
-@section TrkTrackCollectionMergerPackages Used Packages
+@section TrkTrackCollectionMerger_TrkTrackCollectionMergerPackages Used Packages
 
-@htmlinclude used_packages.html
 
-@section  TrkTrackCollectionMergerReq  Requirements file
-@include requirements
+@section TrkTrackCollectionMerger_TrkTrackCollectionMergerReq Requirements file
 
 */
diff --git a/Tracking/TrkAlignment/TrkAlgebraUtils/doc/mainpage.h b/Tracking/TrkAlignment/TrkAlgebraUtils/doc/packagedoc.h
similarity index 86%
rename from Tracking/TrkAlignment/TrkAlgebraUtils/doc/mainpage.h
rename to Tracking/TrkAlignment/TrkAlgebraUtils/doc/packagedoc.h
index a81b4b44bd573ae686d5133d438bbd998bae4a94..b7764b950aaf70e6d204a2a626ec06d46f416f63 100644
--- a/Tracking/TrkAlignment/TrkAlgebraUtils/doc/mainpage.h
+++ b/Tracking/TrkAlignment/TrkAlgebraUtils/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage TrkAlgebraUtils
+@page TrkAlgebraUtils_page TrkAlgebraUtils
 @author roberth@bu.edu
 @author Daniel Kollar <daniel.kollar@cern.ch>
 
-@section TrkAlgebraUtilsIntro Introduction
+@section TrkAlgebraUtils_TrkAlgebraUtilsIntro Introduction
 
 This package was copied directly from SiGlobalChi2AlgebraUtils.  It contains 
 the classes used to store and manipulate large matrices and vectors used for 
 alignment of detector modules.  
 
-@section TrkAlgebraUtilsOverview Class Overview
+@section TrkAlgebraUtils_TrkAlgebraUtilsOverview Class Overview
   The package contains the following classes:
 
   - AlMat:  handles general NxM matrices
@@ -39,11 +39,9 @@ alignment of detector modules.
 
 /**
 @page used_TrkAlgebraUtils Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrkAlgebraUtils Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkAlignment/TrkAlignEvent/doc/mainpage.h b/Tracking/TrkAlignment/TrkAlignEvent/doc/packagedoc.h
similarity index 84%
rename from Tracking/TrkAlignment/TrkAlignEvent/doc/mainpage.h
rename to Tracking/TrkAlignment/TrkAlignEvent/doc/packagedoc.h
index 46176950ff1a29d0f1570bbca5b644f34e7687b0..07ed13b9232ad24082904e7f57cc3c12b8c2610b 100644
--- a/Tracking/TrkAlignment/TrkAlignEvent/doc/mainpage.h
+++ b/Tracking/TrkAlignment/TrkAlignEvent/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage TrkAlignEvent
+@page TrkAlignEvent_page TrkAlignEvent
 @author roberth@bu.edu
 @author Daniel Kollar <daniel.kollar@cern.ch>
 
-@section TrkAlignEventIntro Introduction
+@section TrkAlignEvent_TrkAlignEventIntro Introduction
 
 This package contains classes to be used for track-based alignment.
 
-@section TrkAlignEventOverview Class Overview
+@section TrkAlignEvent_TrkAlignEventOverview Class Overview
   The package contains the following classes:
 
   - AlignModule: a generalized alignable module, consisting of groups of detectors to be aligned as a single structure
@@ -28,10 +28,8 @@ This package contains classes to be used for track-based alignment.
 
 /**
 @page used_TrkAlignEvent Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrkAlignEvent Requirements
-@include requirements
 */
diff --git a/Tracking/TrkAlignment/TrkAlignGenAlgs/doc/mainpage.h b/Tracking/TrkAlignment/TrkAlignGenAlgs/doc/packagedoc.h
similarity index 82%
rename from Tracking/TrkAlignment/TrkAlignGenAlgs/doc/mainpage.h
rename to Tracking/TrkAlignment/TrkAlignGenAlgs/doc/packagedoc.h
index 611b836e943dae1529c80bdd0f945e10319f1fd0..c09c92b5a45b98ab307f00d14332c72ecb87749b 100644
--- a/Tracking/TrkAlignment/TrkAlignGenAlgs/doc/mainpage.h
+++ b/Tracking/TrkAlignment/TrkAlignGenAlgs/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage The TrkAlignGenAlgs package
+@page TrkAlignGenAlgs_page The TrkAlignGenAlgs package
 
-\section introduction Introduction
+@section TrkAlignGenAlgs_introduction Introduction
 
 This package provides algorithms for alignment of the muon spectrometer or the inner detector not specific to either detector or to any specific alignment method.
 
diff --git a/Tracking/TrkAlignment/TrkAlignGenTools/doc/mainpage.h b/Tracking/TrkAlignment/TrkAlignGenTools/doc/packagedoc.h
similarity index 93%
rename from Tracking/TrkAlignment/TrkAlignGenTools/doc/mainpage.h
rename to Tracking/TrkAlignment/TrkAlignGenTools/doc/packagedoc.h
index a9a087757d67407aa3a99ca87b85f8c2d88bbf65..171ba0c8e4ea0110656606296047e990addccdaf 100644
--- a/Tracking/TrkAlignment/TrkAlignGenTools/doc/mainpage.h
+++ b/Tracking/TrkAlignment/TrkAlignGenTools/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-@mainpage TrkAlignGenTools
+@page TrkAlignGenTools_page TrkAlignGenTools
 @author roberth@bu.edu
 @author Daniel Kollar <daniel.kollar@cern.ch>
 
-@section TrkAlignGenToolsIntro Introduction
+@section TrkAlignGenTools_TrkAlignGenToolsIntro Introduction
 
 This package was copied directly from tools in InDetAlignTools and 
 SiGlobalChi2AlignTools.  It contains some tools used to perform alignment 
 of generic detector modules, and virtual interfaces to be inherited by 
 detector-specific tools.
 
-@section TrkAlignGenToolsOverview Class Overview
+@section TrkAlignGenTools_TrkAlignGenToolsOverview Class Overview
   The package contains the following classes:
   - AlignModuleTool: inherits from IAlignModuleTool, used to handle the
     list of AlignModules (the alignment geometry) and provide functionality
@@ -51,11 +51,9 @@ detector-specific tools.
 
 /**
 @page used_TrkAlignGenTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrkAlignGenTools Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkAlignment/TrkAlignInterfaces/doc/mainpage.h b/Tracking/TrkAlignment/TrkAlignInterfaces/doc/packagedoc.h
similarity index 88%
rename from Tracking/TrkAlignment/TrkAlignInterfaces/doc/mainpage.h
rename to Tracking/TrkAlignment/TrkAlignInterfaces/doc/packagedoc.h
index d8245d4472e003798313f026cbe04fe3dcabcca0..2c11e8c99626f67b1ed3df7755792596b23f2f6d 100644
--- a/Tracking/TrkAlignment/TrkAlignInterfaces/doc/mainpage.h
+++ b/Tracking/TrkAlignment/TrkAlignInterfaces/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage TrkAlignInterfaces
+@page TrkAlignInterfaces_page TrkAlignInterfaces
 @author roberth@bu.edu
 @author Daniel Kollar <daniel.kollar@cern.ch>
 
-@section TrkAlignInterfacesIntro Introduction
+@section TrkAlignInterfaces_TrkAlignInterfacesIntro Introduction
 
 This package contains virtual interfaces for tools to be used for track-based alignment.
 
-@section TrkAlignInterfacesOverview Class Overview
+@section TrkAlignInterfaces_TrkAlignInterfacesOverview Class Overview
   The package contains the following classes:
 
   - IAlignTrackPreProcessor: processes the collection of Tracks and creates a vector of AlignTracks
@@ -34,10 +34,8 @@ This package contains virtual interfaces for tools to be used for track-based al
 
 /**
 @page used_TrkAlignInterfaces Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrkAlignInterfaces Requirements
-@include requirements
 */
diff --git a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/doc/mainpage.h b/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/doc/packagedoc.h
similarity index 73%
rename from Tracking/TrkAlignment/TrkGlobalChi2AlignTools/doc/mainpage.h
rename to Tracking/TrkAlignment/TrkGlobalChi2AlignTools/doc/packagedoc.h
index 70732aec895fd0bb0b446395d950691201d65080..23a60f037b9af293556d55d5432df482016d1a93 100644
--- a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/doc/mainpage.h
+++ b/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage TrkGlobalChi2AlignTools package
+@page TrkGlobalChi2AlignTools_page TrkGlobalChi2AlignTools package
 @author Robert Harrington <roberth@bu.edu>
 @author Daniel Kollar <daniel.kollar@cern.ch>
 
-@section introduction Introduction
+@section TrkGlobalChi2AlignTools_introduction Introduction
 
 This package provides tools to perform alignment of the muon spectrometer or the inner detector not specific to either detector or to any specific alignment method.
 
diff --git a/Tracking/TrkDetDescr/TrkAlignableSurfaces/doc/mainpage.h b/Tracking/TrkDetDescr/TrkAlignableSurfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 77%
rename from Tracking/TrkDetDescr/TrkAlignableSurfaces/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkAlignableSurfaces/doc/packagedoc.h
index 457e88a53aceba39f88f3a073130ccc9ee63a6d2..1632808710243117b69348244d913ca529cc926f
--- a/Tracking/TrkDetDescr/TrkAlignableSurfaces/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkAlignableSurfaces/doc/packagedoc.h
@@ -6,10 +6,8 @@
 
  <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
 
-@mainpage
+@page TrkAlignableSurfaces_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAlgs/doc/mainpage.h b/Tracking/TrkDetDescr/TrkDetDescrAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from Tracking/TrkDetDescr/TrkDetDescrAlgs/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkDetDescrAlgs/doc/packagedoc.h
index 166eb4abadfe5f5af055aaf2e1f450fd194af70b..c839e3c75f78e02b54ff8f21dd2d2bb64c48e767
--- a/Tracking/TrkDetDescr/TrkDetDescrAlgs/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrAlgs/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrkDetDescrAlgs Package
+@page TrkDetDescrAlgs_page TrkDetDescrAlgs Package
 
 This package contains validation and material association algorithms for
 the TrackingGeometry.
@@ -24,11 +24,10 @@ the TrackingGeometry.
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkDetDescrToolsIntro Introduction
+@section TrkDetDescrAlgs_TrkDetDescrToolsIntro Introduction
 
 
-@section TrkDetDescrToolsReq Requirements
+@section TrkDetDescrAlgs_TrkDetDescrToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/Tracking/TrkDetDescr/TrkDetDescrExample/doc/mainpage.h b/Tracking/TrkDetDescr/TrkDetDescrExample/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Tracking/TrkDetDescr/TrkDetDescrExample/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkDetDescrExample/doc/packagedoc.h
index 3477cf339c449ed130a6da06b75b1fa21087e4f2..f61e86230115c10b0b4c59764ef5a3c746e2e492
--- a/Tracking/TrkDetDescr/TrkDetDescrExample/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrExample/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 
 /**
-@mainpage TrkDetDescrExample Package
+@page TrkDetDescrExample_page TrkDetDescrExample Package
 
 This Package contains example jobOptions for several
 TrackingGeometry related test / validation jobs.
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkDetDescrExampleIntro Introduction
+@section TrkDetDescrExample_TrkDetDescrExampleIntro Introduction
 
 The jobOptions correspond to algorithms in the TrkDetDescrAlgs package
 
diff --git a/Tracking/TrkDetDescr/TrkDetDescrInterfaces/doc/mainpage.h b/Tracking/TrkDetDescr/TrkDetDescrInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from Tracking/TrkDetDescr/TrkDetDescrInterfaces/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkDetDescrInterfaces/doc/packagedoc.h
index 6958ed5eeba20dda24f787070106cfceac6f16ff..917f412f1f7eb95324ff8f8c3aba1e766569b028
--- a/Tracking/TrkDetDescr/TrkDetDescrInterfaces/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrInterfaces/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage TrkDetDescrInterfaces Package
+@page TrkDetDescrInterfaces_page TrkDetDescrInterfaces Package
 
 This package contains all interface classes for <nop>AlgTools to be used for the creation,
 validation and displaying of the Trk::TrackingGeomtery.
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkDetDescrInterfacesIntro Introduction
+@section TrkDetDescrInterfaces_TrkDetDescrInterfacesIntro Introduction
 
 The following interface classes are defined
 
@@ -34,8 +34,7 @@ The concrete implementations rely on very precise knowledge of the various sub-d
 to be found in the corresponding software repositories.
 
    
-@section TrkDetDescrInterfacesReq Requirements
+@section TrkDetDescrInterfaces_TrkDetDescrInterfacesReq Requirements
 
-@include requirements
 
 */
\ No newline at end of file
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/doc/mainpage.h b/Tracking/TrkDetDescr/TrkDetDescrSvc/doc/packagedoc.h
similarity index 79%
rename from Tracking/TrkDetDescr/TrkDetDescrSvc/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkDetDescrSvc/doc/packagedoc.h
index aeeb48fa827f732b35b209ef20356041671d6461..658c93a54eec29d2904dacaf82c8b137d972fba9 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrkDetDescrSvc Package
+@page TrkDetDescrSvc_page TrkDetDescrSvc Package
 
 This Package contains the Trk::TrackingGeometrySvc and its calibariton version for the ATLAS Tracking Geometry
 The geometry building is triggered through a callback from the EventInfo to be able to update the geometry
@@ -11,7 +11,7 @@ for misalignment, etc.
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkDetDescrSvcIntro Introduction
+@section TrkDetDescrSvc_TrkDetDescrSvcIntro Introduction
 
 There are two services that can be used :
 
@@ -21,8 +21,7 @@ There are two services that can be used :
      
    - CalibrationTrackingGeometrySvc allows to apply additional distortions, material scaling.
 
-@section TrkDetDescrSvcReq Requirements
+@section TrkDetDescrSvc_TrkDetDescrSvcReq Requirements
 
-@include requirements
 
 */
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/doc/mainpage.h b/Tracking/TrkDetDescr/TrkDetDescrTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from Tracking/TrkDetDescr/TrkDetDescrTools/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkDetDescrTools/doc/packagedoc.h
index b8ee0f88e4cd21e8342d349ff053cd7e41a3df68..0258467ddf98adcc551e47271b179d4a015de9c0
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrkDetDescrTools Package
+@page TrkDetDescrTools_page TrkDetDescrTools Package
 
 This Package contains the Trk::GeometryBuilder for the ATLAS Tracking Geometry
 It also contains many Tools that are given throuth interfaces in the TrkDetDescrInterfaces
@@ -11,7 +11,7 @@ package.
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkDetDescrToolsIntro Introduction
+@section TrkDetDescrTools_TrkDetDescrToolsIntro Introduction
 
    - Geometry Building:
 The actual implementation of the Trk::LayerBuilders and Trk::TrackingVolumeBuilders must be found in the 
@@ -29,8 +29,7 @@ the material information per layer into an nTuple.
    - Displaying
 The Trk::TrackingVolumeDisplayer writes ROOT scripts for a dedicated TrackingGeometry visualization.
 
-@section TrkDetDescrToolsReq Requirements
+@section TrkDetDescrTools_TrkDetDescrToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/Tracking/TrkDetDescr/TrkDetDescrUtils/doc/mainpage.h b/Tracking/TrkDetDescr/TrkDetDescrUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from Tracking/TrkDetDescr/TrkDetDescrUtils/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkDetDescrUtils/doc/packagedoc.h
index c080f727817e8ca57d9d915e0e2cc2c87d3282f2..d7b1d6bd056da5743b10e6cc43b53b6e6cf27dd9
--- a/Tracking/TrkDetDescr/TrkDetDescrUtils/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrUtils/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage TrkDetDescrUtils Package
+@page TrkDetDescrUtils_page TrkDetDescrUtils Package
 
 This Package contains useful utilities for creating the TrackingGeometry.
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkDetDescrIntro Introduction
+@section TrkDetDescrUtils_TrkDetDescrIntro Introduction
 
 The classes in this package are purely inline for speed optimisation or
 for the fact that they are class templates.
@@ -21,9 +21,8 @@ classes of different implementations.
 In addition it contains geometry statics and a reference counting class.
 
 
-@section TrkDetDescrReqReq Requirements
+@section TrkDetDescrUtils_TrkDetDescrReqReq Requirements
 
-@include requirements
 
 */
 
diff --git a/Tracking/TrkDetDescr/TrkDetElementBase/doc/mainpage.h b/Tracking/TrkDetDescr/TrkDetElementBase/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from Tracking/TrkDetDescr/TrkDetElementBase/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkDetElementBase/doc/packagedoc.h
index f979cf6a54bc330895f1273c89ae9ac1b7a24a1c..a5991e411a50d775e986c46ca6c29f2cafaa2a1a
--- a/Tracking/TrkDetDescr/TrkDetElementBase/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkDetElementBase/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage TrkDetElementBase Package
+@page TrkDetElementBase_page TrkDetElementBase Package
 
 @authors Edward Moyse, Grant Gorfine
  
-@section TrkDetElementBaseIntro Introduction
+@section TrkDetElementBase_TrkDetElementBaseIntro Introduction
 
 This package contains the base class Trk::TrkDetElementBase for the tracking detector elements. 
 This allows for common usage of the detector elements for all 
 tracking detectors including both the Inner Detector and the Muon Spectrometer
 
-@section TrkDetElementBaseUsage Usage Notes
+@section TrkDetElementBase_TrkDetElementBaseUsage Usage Notes
 
 Most methods have two forms. One with no parameters and one which take
 an Identifier as an argument.  The first form corresponds to the whole
@@ -23,6 +23,5 @@ detectors or a whole straw layer in the TRT.  The second form is for
 detector elements that contain multiple surfaces (such as the MDT and
 TRT) and allow access to the individual straws or tubes.
 
-@include requirements
 
 */
diff --git a/Tracking/TrkDetDescr/TrkGeometry/doc/mainpage.h b/Tracking/TrkDetDescr/TrkGeometry/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Tracking/TrkDetDescr/TrkGeometry/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkGeometry/doc/packagedoc.h
index e66ca54238a25a9faa6402e1b094eb69210b9b33..34c357f157c1cf5ee14c16a52e0a676574727942
--- a/Tracking/TrkDetDescr/TrkGeometry/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrkGeometry Package
+@page TrkGeometry_page TrkGeometry Package
 
 The TrkGeometry package combines the geometrical classes from the TrkSurfaces and TrkVolumes
 expressed through the Surface and Volume classes with material and magnetic field information 
@@ -11,14 +11,14 @@ to its physical representation Trk::Layer respectively Trk::TrackingVolume.
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkGeometryIntro Introduction
+@section TrkGeometry_TrkGeometryIntro Introduction
 
 The Trk::TrackingGeometry class is holder class of the highest Trk::TrackingVolume declared either 
 through jobOptions or built through the GeometryBuilder from the TrkDetDescrTools package.
 It enables a global search for an associated Trk::TrackingVolume/Trk::Layer such as the continous navigation
 via BoundarySurfaces between the various TrackingVolumes.
 
-@section TrkGeometryClass Class Overview
+@section TrkGeometry_TrkGeometryClass Class Overview
 The TrkGeometry package contains following classes:
   - Trk::Layer: Abstract Base class for a layer description
       - CylinderLayer: cylindrical implementation, extends Layer and CylinderSurface
@@ -30,8 +30,7 @@ The TrkGeometry package contains following classes:
   - Trk::TrackingVolume: extends the Volume class from the TrkVolume package with pysical properties
   - Trk::TrackingGeometry: holder class of the highest TrackingVolume
    
-@section TrkGeometryReq Requirements
+@section TrkGeometry_TrkGeometryReq Requirements
 
-@include requirements
 
 */
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/doc/mainpage.h b/Tracking/TrkDetDescr/TrkSurfaces/doc/packagedoc.h
similarity index 87%
rename from Tracking/TrkDetDescr/TrkSurfaces/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkSurfaces/doc/packagedoc.h
index 60de09f873b817c33e5958aee6ef2bd0228dba62..6ca3f8b295d9d49385ed690e2dafeb607c6c2578 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkSurfaces/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage The TrkSurfaces package
+@page TrkSurfaces_page The TrkSurfaces package
 
 Package for surface descriptions in the Tracking package. 
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkSurfaceIntro Introduction
+@section TrkSurfaces_TrkSurfaceIntro Introduction
 
 The different <b>Trk::Surface</b> types define the track parameterisations available.
 
@@ -42,14 +42,13 @@ The different <b>Trk::Surface</b> types define the track parameterisations avail
 </table>
 
 
-\section TrkSurfaceUsage Usage of 3 and 2-dim objects
+@section TrkSurfaces_TrkSurfaceUsage Usage of 3 and 2-dim objects
 
 In this package the following classes for 3 dimensional and 2 dimensional points of vectors
 are used from the GeoPrimitives package
 - Amg::Vector3D for 3D points and vectors
 - Amg::Vector2D for 2D points on a surface or the special local direction 
 
-\section TrkSurfaceReq Requirements
+@section TrkSurfaces_TrkSurfaceReq Requirements
 
-@include requirements
 */
diff --git a/Tracking/TrkDetDescr/TrkVolumes/doc/mainpage.h b/Tracking/TrkDetDescr/TrkVolumes/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from Tracking/TrkDetDescr/TrkVolumes/doc/mainpage.h
rename to Tracking/TrkDetDescr/TrkVolumes/doc/packagedoc.h
index bdf6a25d006265dbdfd0bac23b0da67d16cc6046..ebb9c8d547ac6eaf96c184b3d9eef04d518c21ea
--- a/Tracking/TrkDetDescr/TrkVolumes/doc/mainpage.h
+++ b/Tracking/TrkDetDescr/TrkVolumes/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage TrkVolumes Package
+@page TrkVolumes_page TrkVolumes Package
 
 The package for a generic Volume description in the Tracking realm,
 Trk::TrackingVolumes and Trk::MagneticFieldVolumes may extend the Trk::Volume class.
 
 @author Andreas.Salzburger@cern.ch
 
-@section IntroductionTrkVolumes Introduction
+@section TrkVolumes_IntroductionTrkVolumes Introduction
 
 To enable sub detector independend tracking algorithms a generic Trk::Volume description
 for Tracking algorithms has been created.
@@ -18,7 +18,7 @@ The Volume class is designed to be mainly used in terms of the TrkExtrapolation
 therefor the Trk::BoundarySurfaces that confine a Volume are extending to Surface class so
 to be used directly by the Extrapolator, resp. Propagators.
 
-@section OverviewTrkVolumes Class Overview
+@section TrkVolumes_OverviewTrkVolumes Class Overview
   The TrkVolumes package contains of following classes:
  
   - Trk::Volume: oriented using a <nop>HepTransform3D, the shape is given by the passed through VolumeBounds.
@@ -32,7 +32,7 @@ to be used directly by the Extrapolator, resp. Propagators.
     - Trk::BoundaryDiscSurface: extends Trk::CylinderSurface and Trk::BoundarySurface (used for cylindrical volume)
     - Trk::BoundaryPlaneSurface: extends Trk::CylinderSurface and Trk::BoundarySurface (used for all volume types)
     
-@section ExtrasTrkVolumes Extra Pages
+@section TrkVolumes_ExtrasTrkVolumes Extra Pages
 
  - @ref UsedTrkVolumes
  - @ref RequirementsTrkVolumes
@@ -40,11 +40,9 @@ to be used directly by the Extrapolator, resp. Propagators.
 
 /**
 @page UsedTrkVolumes Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTrkVolumes Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkEvent/TrkCompetingRIOsOnTrack/doc/mainpage.h b/Tracking/TrkEvent/TrkCompetingRIOsOnTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 77%
rename from Tracking/TrkEvent/TrkCompetingRIOsOnTrack/doc/mainpage.h
rename to Tracking/TrkEvent/TrkCompetingRIOsOnTrack/doc/packagedoc.h
index 00b100576d7f8fd34a461439aea5f052cc57c27b..ea35851d32d8b3caa88efb4de93662d0a85f12d1
--- a/Tracking/TrkEvent/TrkCompetingRIOsOnTrack/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkCompetingRIOsOnTrack/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage The TrkCompetingRIOsOnTrack package
+@page TrkCompetingRIOsOnTrack_page The TrkCompetingRIOsOnTrack package
 The base class package for CompetingRIOsOnTrack.
 
 @author Sebastian.Fleischmann@cern.ch
 
-@section introductionTrkCompetingRIOsOnTrack Introduction
+@section TrkCompetingRIOsOnTrack_introductionTrkCompetingRIOsOnTrack Introduction
 
 This package contains the base class for all CompetingRIOsOnTrack that extends 
 the Trk::MeasurementBase class.
@@ -23,12 +23,12 @@ according to the weights (assignment probabilities).
 CompetingRIOsOnTrack are characterized by a vector of Trk::RIO_OnTrack objects they hold, 
 by a Surface the CompetingRIOsOnTrack is expressed to and a vector of assignment probabilities.
 
-@section TrkCompetingRIOsOnTrackOverview Class Overview
+@section TrkCompetingRIOsOnTrack_TrkCompetingRIOsOnTrackOverview Class Overview
   The TrkCompetingRIOsOnTrack package contains the following classes:
 
   - Trk::CompetingRIOsOnTrack : base class for all CompetingRIOsOnTrack implementations
 
-@section ExtrasTrkCompetingRIOsOnTrack Extra Pages
+@section TrkCompetingRIOsOnTrack_ExtrasTrkCompetingRIOsOnTrack Extra Pages
 
  - @ref UsedTrkCompetingRIOsOnTrack
  - @ref requirementsTrkCompetingRIOsOnTrack
@@ -36,10 +36,8 @@ by a Surface the CompetingRIOsOnTrack is expressed to and a vector of assignment
 
 /**
 @page UsedTrkCompetingRIOsOnTrack Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkCompetingRIOsOnTrack Requirements
-@include requirements
 */
diff --git a/Tracking/TrkEvent/TrkEventPrimitives/doc/mainpage.h b/Tracking/TrkEvent/TrkEventPrimitives/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from Tracking/TrkEvent/TrkEventPrimitives/doc/mainpage.h
rename to Tracking/TrkEvent/TrkEventPrimitives/doc/packagedoc.h
index c40fd2274fdf9e8d97db6cace835479a8fef7f20..3ed9fafb961fb618f371cac01851f6bcb9d41785
--- a/Tracking/TrkEvent/TrkEventPrimitives/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkEventPrimitives/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage The TrkEventPrimitives package
+@page TrkEventPrimitives_page The TrkEventPrimitives package
 
 
-@section TrkEventPrimIntro Introduction
+@section TrkEventPrimitives_TrkEventPrimIntro Introduction
 The TrkEventPrimitives defines event objects used for tracking that are not defined in the Amg packages GeoPrimitivies or EventPrimitives.
 All matrix and vector classes are based on the Amg/Eigen.
 
-@section TrkEventPrimEdmDescr List of Classes - EDM Building Blocks
+@section TrkEventPrimitives_TrkEventPrimEdmDescr List of Classes - EDM Building Blocks
 
 Measurement defintiation
 - Trk::LocalParameters is a dynamically long vector with identification schema
@@ -21,7 +21,7 @@ Classes for track parameter handling
 - Trk::ChargeDefinition base class for the two above.
 - Trk::ProjectionMatricesSet is the set of 32 x 2 projection and reduction matrices to be used together with the Trk::LocalParameters
 
-@section TrkEventPrimOtherDescr List of Classes - Other Purposes
+@section TrkEventPrimitives_TrkEventPrimOtherDescr List of Classes - Other Purposes
 - Trk::DriftCircleSide is an enum which defines on which side of a wire the track passed (e.g. for the TRT or MDT detectors)
 - Trk::DriftCircleStatus is an enum which describes how the signed radius is
    to be interpreted.
@@ -38,7 +38,7 @@ Classes for track parameter handling
    a particle can be associated with.
 - Trk::CurvilinearUVT is a helper utility for spanning a curvilinear 3D frame
 
-@section TrkEventPrimJacoDescr List of Classes - Jacobians
+@section TrkEventPrimitives_TrkEventPrimJacoDescr List of Classes - Jacobians
 - Trk::JacobianCotThetaPtToThetaP his is the 5x5 jacobian for the transformation of track parameters and errors having a momentum representation of @f$ (\phi, cot\theta, q/p_{T}) @f$ to the new standard representation of @f$ (\phi, \theta, q/p) \f$, while the first two variables that express the local position representation keep unchanged.
 - Trk::JacobianThetaPToCotThetaPt This is the 5x5 jacobian for the transformation of track parameters and errors having the new standard momentum representation of @f$ (\phi, \theta, q/p) @f$ to the representation of @f$( \phi, cot\theta, q/p_{T}) \f$, while the first two variables that express the local position representation keep unchanged.
 - Trk::JacobianPolarToCartesian is the 5x5 jacobian to guarantee transformation between polar and cartesian coordinates and errors.
@@ -58,12 +58,12 @@ Classes for track parameter handling
 - Trk::JacobianPhiThetaQoverPToPxyz is the 3x3 jacobian to transform from 
   polar to cartesian momentum coordinates.
 
-@section TrkEventPrimContacts Authors
+@section TrkEventPrimitives_TrkEventPrimContacts Authors
 Please send any comments to 
 @author Andreas.Salzburger@cern.ch
 @author Edward.Moyse@cern.ch
 
-@section TrkEventPrimPages Extra Pages
+@section TrkEventPrimitives_TrkEventPrimPages Extra Pages
 
  - @ref TrkEventPrimUsedPkg
  - @ref TrkEventPrimRequirements
@@ -71,19 +71,15 @@ Please send any comments to
 
 /**
 @page TrkEventPrimUsedPkg Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page TrkEventPrimRequirements Requirements
-@include requirements
 */
 
-@section used_packages Used Packages
-@htmlinclude used_packages.html
+@section TrkEventPrimitives_used_packages Used Packages
 
-@section requirements Requirements
-@include requirements
+@section TrkEventPrimitives_requirements Requirements
 
 
 
diff --git a/Tracking/TrkEvent/TrkEventUtils/doc/mainpage.h b/Tracking/TrkEvent/TrkEventUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 76%
rename from Tracking/TrkEvent/TrkEventUtils/doc/mainpage.h
rename to Tracking/TrkEvent/TrkEventUtils/doc/packagedoc.h
index 455dc74a8ac788dfa96e24f12990e07c317a00d9..74ca7d03ec8e6a8a1f0f52953c2b1134c2e6808d
--- a/Tracking/TrkEvent/TrkEventUtils/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkEventUtils/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage The TrkEventUtils package
+@page TrkEventUtils_page The TrkEventUtils package
 
 
-@section intro Overview
+@section TrkEventUtils_intro Overview
 The TrkEventUtils package holds small utilities for working with Tracking EDM objects.
 Such utilities comprise sorting functions, object transformationa and extraction,
 truth mappers and object manipulators. See under the 'classes' section for details on
@@ -19,10 +19,8 @@ Please send any comments to
 @author Andreas.Salzburger@cern.ch
 @author Edward.Moyse@cern.ch
 
-@section used_packages Used Packages
-@htmlinclude used_packages.html
+@section TrkEventUtils_used_packages Used Packages
 
-@section requirements Requirements
-@include requirements
+@section TrkEventUtils_requirements Requirements
 
 */
diff --git a/Tracking/TrkEvent/TrkMaterialOnTrack/doc/mainpage.h b/Tracking/TrkEvent/TrkMaterialOnTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Tracking/TrkEvent/TrkMaterialOnTrack/doc/mainpage.h
rename to Tracking/TrkEvent/TrkMaterialOnTrack/doc/packagedoc.h
index 630f2402cd322faa82023f4ff7f2ed46a84d02d5..0e44f84d8daafbed24595ccd07824954a4af1e2b
--- a/Tracking/TrkEvent/TrkMaterialOnTrack/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkMaterialOnTrack/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage The TrkMaterialOnTrack package
+@page TrkMaterialOnTrack_page The TrkMaterialOnTrack package
 provides the base class Trk::MaterialEffectsBase and its
 extensions to handle material effects in the ATLAS tracking EDM
 
 @author Common Tracking SW Group<br>
         W. Liebig, E. Moyse, A. Salzburger <http://consult.cern.ch/xwho/>
 
-@section IntroTrkMaterialOnTrack Introduction
+@section TrkMaterialOnTrack_IntroTrkMaterialOnTrack Introduction
 
  The class structure in this package handles information about estimated
  material effects of charged particles in the detector, i.e. energy
@@ -28,7 +28,7 @@ extensions to handle material effects in the ATLAS tracking EDM
  The persistent representation of this package is under
  Tracking/TrkEventCnv/TrkEventTPCnv/.../TrkMaterialOnTrack
 
-@section ExtrasTrkMaterialOnTrack Extra Pages
+@section TrkMaterialOnTrack_ExtrasTrkMaterialOnTrack Extra Pages
 
  - @ref UsedTrkMaterialOnTrack
  - @ref RequirementsTrkMaterialOnTrack
@@ -36,11 +36,9 @@ extensions to handle material effects in the ATLAS tracking EDM
 
 /**
 @page UsedTrkMaterialOnTrack Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTrkMaterialOnTrack Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkEvent/TrkMeasurementBase/doc/mainpage.h b/Tracking/TrkEvent/TrkMeasurementBase/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 80%
rename from Tracking/TrkEvent/TrkMeasurementBase/doc/mainpage.h
rename to Tracking/TrkEvent/TrkMeasurementBase/doc/packagedoc.h
index 64bcc18af91ef0d807399231937f6fd9d67bd870..0b35d87e8d85c6f24da9f1faa9c8fe14d2d93165
--- a/Tracking/TrkEvent/TrkMeasurementBase/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkMeasurementBase/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage The MeasurementBase class 
+@page TrkMeasurementBase_page The MeasurementBase class
 
-@section introductionTrkMeasurementBase Introduction
+@section TrkMeasurementBase_introductionTrkMeasurementBase Introduction
 
 This package includes the pure absract base class Trk::MeasurementBase 
 for all fittable measurements in the Tracking realm. 
@@ -26,8 +26,7 @@ The following child branches are (planned) to inherit from this one (only base c
 Please let me know of any errors, or if anything is unclear.
 @author Andreas.Salzburger@cern.ch
 
-@section requirementsTrkMeasurementBase Requirements
-@include requirements
+@section TrkMeasurementBase_requirementsTrkMeasurementBase Requirements
 
 @namespace Trk
 A namespace to enclose the Tracking classes.
diff --git a/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/doc/mainpage.h b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Tracking/TrkEvent/TrkMultiComponentStateOnSurface/doc/mainpage.h
rename to Tracking/TrkEvent/TrkMultiComponentStateOnSurface/doc/packagedoc.h
index 56a178543734d93e07f33a8f09a4a08ba22f23bc..07b9872127d6568aa4b687814cf15f14d702f35c
--- a/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 /**
 
-@mainpage TrkMultiComponentStateOnSurface Package
+@page TrkMultiComponentStateOnSurface_page TrkMultiComponentStateOnSurface Package
 
 Generalisation of the TrackStateOnSurface to allow for a number of components to describe the state rather than a single set of Trk::TrackParameters. In this case the normal Trk::TrackParameters pointer is replaced with a Trk::MultiComponentState pointer.
 
 @author Tom.Atkinson@cern.ch
 
-@section TrkMultiCoSoSIntro Introduction
+@section TrkMultiComponentStateOnSurface_TrkMultiCoSoSIntro Introduction
 
 The TrkMultiComponentStateOnSurface package is designed for the implementation of the GaussianSumFilter. The Gaussian Sum Filter requires that a number of sets of Trk::TrackParameters objects describe the state at every surface. In this regard the Gaussian Sum Filter behaves like a number of Kalman Filters running in parallel. The TrkMultiComponentStateOnSurface package provides this functionality.
 
-@section TrkMultiCoSoSOverview Class Overview
+@section TrkMultiComponentStateOnSurface_TrkMultiCoSoSOverview Class Overview
 
    There are several classes in this package that not only provide the functionality for the Trk::MultiComponentStateOnSurface but are also responsible for all the memory management of the class. This issue will also be covered in this document.
 
diff --git a/Tracking/TrkEvent/TrkNeutralParameters/doc/mainpage.h b/Tracking/TrkEvent/TrkNeutralParameters/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Tracking/TrkEvent/TrkNeutralParameters/doc/mainpage.h
rename to Tracking/TrkEvent/TrkNeutralParameters/doc/packagedoc.h
index f1978e4864225d950681658095fc55c32e3f7ae9..8fed66c4b788ceee9c4965e8dbcc1f395fbd0382
--- a/Tracking/TrkEvent/TrkNeutralParameters/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkNeutralParameters/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage The TrkNeutralParameters package
+@page TrkNeutralParameters_page The TrkNeutralParameters package
 
 @author Edward.Moyse@cern.ch, Andreas.Salzburger@cern.ch
 
-@section introTkPara Introduction
+@section TrkNeutralParameters_introTkPara Introduction
 
 The TrkParameters package contains classes to represent the Track's parameters at all points on the track, from the Trk::Perigee parameters, to parameters at  various parts of the 
 detector. The parameter classes must also include ErrorMatrices, must reproduce all current functionality, be lightweight and be fast.<p>
@@ -32,7 +32,7 @@ fullfilling that \f$ \theta \in [0,\pi] \f$<br>
 Click on <a href="annotated.html">Composite List</a> to see all the classes available in this package.<br>
 Outstanding issues are shown in the <a href="todo.html">ToDo</a> list.
 
-@section designTkPara Design
+@section TrkNeutralParameters_designTkPara Design
 
 In this section, we explain some of the design decisions we've made (which might help to explain the code a bit)
 - often an object might have the capability to return other objects, but if these objects are time-consuming to create (for example, matrix inversions),
@@ -48,9 +48,7 @@ should return a const pointer, set to NULL (i.e. 0) whenever the object is void.
 - Trk::LocalParameters are defined in TrkEventPrimitives
 
 @author Edward.Moyse@cern.ch, Andreas.Salzburger@cern.ch
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section TrkNeutralParameters_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section TrkNeutralParameters_requirements Requirements
 */
diff --git a/Tracking/TrkEvent/TrkParameters/doc/mainpage.h b/Tracking/TrkEvent/TrkParameters/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Tracking/TrkEvent/TrkParameters/doc/mainpage.h
rename to Tracking/TrkEvent/TrkParameters/doc/packagedoc.h
index 899a00d0992b8c6b2f4147eb2d881a3b82729238..e7bf8211ac58664c3836fad74755dc1a326b73b8
--- a/Tracking/TrkEvent/TrkParameters/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkParameters/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage The TrkParameters package
+@page TrkParameters_page The TrkParameters package
 
 
-@section introTkPara Introduction
+@section TrkParameters_introTkPara Introduction
 
 The TrkParameters package contains classes to represent the Track's parameters at all points on the track, from the Trk::Perigee parameters, to parameters at  various parts of the 
 detector. The parameter classes must also include ErrorMatrices, must reproduce all current functionality, be lightweight and be fast.<p>
@@ -31,7 +31,7 @@ fullfilling that \f$ \theta \in [0,\pi] \f$<br>
 Click on <a href="annotated.html">Composite List</a> to see all the classes available in this package.<br>
 Outstanding issues are shown in the <a href="todo.html">ToDo</a> list.
 
-@section designTkPara Design
+@section TrkParameters_designTkPara Design
 
 In this section, we explain some of the design decisions we've made (which might help to explain the code a bit)
 - often an object might have the capability to return other objects, but if these objects are time-consuming to create (for example, matrix inversions),
@@ -45,15 +45,13 @@ If you click on the link, you will be able to see that the Trk::LocalPosition is
 should return a const pointer, set to NULL (i.e. 0) whenever the object is void.
 - At the moment not much is inlined - this will change when we start work on optimisation
 - Trk::LocalParameters are defined in TrkEventPrimitives
-@section persistTkPara Persistification
+@section TrkParameters_persistTkPara Persistification
 
 @author Edward.Moyse@cern.ch, Andreas.Salzburger@cern.ch
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section TrkParameters_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section TrkParameters_requirements Requirements
 */
 
 /**
diff --git a/Tracking/TrkEvent/TrkParametersBase/doc/mainpage.h b/Tracking/TrkEvent/TrkParametersBase/doc/packagedoc.h
similarity index 81%
rename from Tracking/TrkEvent/TrkParametersBase/doc/mainpage.h
rename to Tracking/TrkEvent/TrkParametersBase/doc/packagedoc.h
index e679c7fe394d64e2ebbc5510e924fbb679fb21b4..1896b9a89c0b0ca48381251259d3593a8e5da478 100644
--- a/Tracking/TrkEvent/TrkParametersBase/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkParametersBase/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage TrkParametersBase Package
+@page TrkParametersBase_page TrkParametersBase Package
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkParametersBaseIntro Introduction
+@section TrkParametersBase_TrkParametersBaseIntro Introduction
 
 This package defines all track parameterisations in ATLAS by a set of 3 classes
 
@@ -25,9 +25,8 @@ All local/global transformations are outsourced to the surfaces.
 
 Note that CurvilinearParameters make best sense on planar surfaces.
 
-@section  TrkParametersBaseReq  Requirements file
+@section TrkParametersBase_TrkParametersBaseReq Requirements file
 
-@include requirements
 
 */
 
diff --git a/Tracking/TrkEvent/TrkParticleBase/doc/mainpage.h b/Tracking/TrkEvent/TrkParticleBase/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Tracking/TrkEvent/TrkParticleBase/doc/mainpage.h
rename to Tracking/TrkEvent/TrkParticleBase/doc/packagedoc.h
index ca658266340edf02581125fa25cbec6b12ac4b85..f01daf877a566e1c9f5642d6965ac21413b2eed1
--- a/Tracking/TrkEvent/TrkParticleBase/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkParticleBase/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage The TrkParticleBase Package 
+@page TrkParticleBase_page The TrkParticleBase Package
 
 @author Andreas.Wildauer@cern.ch
 
-@section introductionTrkParticleBase Introduction
+@section TrkParticleBase_introductionTrkParticleBase Introduction
 This package contains the definition of the TrackParticleBase class which defines the tracking related part of the TrackParticle that
 inherits from the TrackParticleBase class. All tracking oriented reconstruction software should operate on this class rather then
 the TrackParticle because the latter introduces a dependence of the Tracking realm on the Reconstruction realm.
 
-@section designTrkParticleBase Design
+@section TrkParticleBase_designTrkParticleBase Design
 The Trk::TrackParticleBase class holds slimmed down information of the Trk::Track object. It holds a Trk::TrackSummary object with hits on track information and a Trk::FitQuality
 object with chi2 and ndf information of the track fit. In addition it holds a vector of Trk::ParametersBase which is the top level
 object for all charged and neutral representations inherit. One of the entries are the so called definig parameters, i.e. the parameters
@@ -22,8 +22,6 @@ or anything that inherits from Trk::ParametersBase. Hence the Trk::TrackParticle
 (in contrary to the Trk::Track which is always charged). Last but not least it holds an ElementLink to the original Trk::Track
 and to the reconstructed Trk::VxCandidate object.
     
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Tracking/TrkEvent/TrkPatternParameters/doc/mainpage.h b/Tracking/TrkEvent/TrkPatternParameters/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from Tracking/TrkEvent/TrkPatternParameters/doc/mainpage.h
rename to Tracking/TrkEvent/TrkPatternParameters/doc/packagedoc.h
index d22058f598e1afec2bba0e21f6a6e35a15cc8111..9bb31609c9160e62db696afac744fb48071df4f7
--- a/Tracking/TrkEvent/TrkPatternParameters/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkPatternParameters/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage TrkPatternParameters
+@page TrkPatternParameters_page TrkPatternParameters
 @author Igor.Gavrilenko@cern.ch
-@section TrkPatternParametersIntro Introduction
+@section TrkPatternParameters_TrkPatternParametersIntro Introduction
 
 The TrkPatternParameters package contains class to represent the Track parameters at all
 kind surface. This class optimazed for pattern recognition process. The main property
@@ -28,7 +28,6 @@ standard TrackParameters class and contains set converters which provide
 transformation information from TrackParameters to PatternParameteres and
 from PatternParameteres to TrackParameters.
 
-@section  TrkPatternParametersReq  Requirements file
-@include requirements
+@section TrkPatternParameters_TrkPatternParametersReq Requirements file
 
 */
diff --git a/Tracking/TrkEvent/TrkPrepRawData/doc/mainpage.h b/Tracking/TrkEvent/TrkPrepRawData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 74%
rename from Tracking/TrkEvent/TrkPrepRawData/doc/mainpage.h
rename to Tracking/TrkEvent/TrkPrepRawData/doc/packagedoc.h
index 4497c4a7b6f4455cf3fd085e7f6d0dba8012a645..226dd859f70982414c60ea20b202c83cc92ded45
--- a/Tracking/TrkEvent/TrkPrepRawData/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkPrepRawData/doc/packagedoc.h
@@ -6,9 +6,9 @@
 
 /**
 
-\mainpage The TrkPrepRawData package
+@page TrkPrepRawData_page The TrkPrepRawData package
 
-\section introTkPrerpRawData Introduction
+@section TrkPrepRawData_introTkPrerpRawData Introduction
 
 TrkPrepRawData contains the "prepared raw data" (also known as RIOs - Reconstruction Input Objects) for the Tracking EDM. This package contains the base class - there are concrete implementation in InDetPrepRawData and MuonRawData. 
 
@@ -17,17 +17,15 @@ Outstanding issues are shown in the <a href="todo.html">ToDo</a> list.
 
 
 
-\section triggerPRD Trigger
+@section TrkPrepRawData_triggerPRD Trigger
 
 This class is intended for use within the Trigger as well, and will probably undergo further iterations to make it more suitable for that community.
 
 Please let me know of any errors, or if anything is unclear.
 Edward.Moyse@cern.ch
 
-\section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section TrkPrepRawData_used_packagesTkPara Used Packages
 
-\section requirements Requirements
-@include requirements
+@section TrkPrepRawData_requirements Requirements
 */
 
diff --git a/Tracking/TrkEvent/TrkPseudoMeasurementOnTrack/doc/mainpage.h b/Tracking/TrkEvent/TrkPseudoMeasurementOnTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 73%
rename from Tracking/TrkEvent/TrkPseudoMeasurementOnTrack/doc/mainpage.h
rename to Tracking/TrkEvent/TrkPseudoMeasurementOnTrack/doc/packagedoc.h
index 4a5a58b400e3e7cc057002cf73f467b94b68e1a9..2bcb9d4479334b1715e7dfeecfac5d0995b76163
--- a/Tracking/TrkEvent/TrkPseudoMeasurementOnTrack/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkPseudoMeasurementOnTrack/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 /**
-@mainpage The TrkPseudoMeasurementOnTrack package
+@page TrkPseudoMeasurementOnTrack_page The TrkPseudoMeasurementOnTrack package
 provides the class Trk::PseudoMeasurementOnTrack for the ATLAS tracking EDM.
 
 @author Common Tracking SW Group<br>
         Wolfgang Liebig http://consult.cern.ch/xwho/people/54608
 
-@section IntroTrkPseudoMeasurementOnTrack Introduction
+@section TrkPseudoMeasurementOnTrack_IntroTrkPseudoMeasurementOnTrack Introduction
 
  Class to handle pseudo-measurements in fitters and on track objects.
  Such virtual measurements are typically used to feed crude values into
  track fitters for otherwise unconstraint fit parameters.
  
-@section ExtrasTrkPseudoMeasurementOnTrack Extra Pages
+@section TrkPseudoMeasurementOnTrack_ExtrasTrkPseudoMeasurementOnTrack Extra Pages
 
  - @ref UsedTrkPseudoMeasurementOnTrack
  - @ref RequirementsTrkPseudoMeasurementOnTrack
@@ -23,11 +23,9 @@ provides the class Trk::PseudoMeasurementOnTrack for the ATLAS tracking EDM.
 
 /**
 @page UsedTrkPseudoMeasurementOnTrack Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTrkPseudoMeasurementOnTrack Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkEvent/TrkRIO_OnTrack/doc/mainpage.h b/Tracking/TrkEvent/TrkRIO_OnTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from Tracking/TrkEvent/TrkRIO_OnTrack/doc/mainpage.h
rename to Tracking/TrkEvent/TrkRIO_OnTrack/doc/packagedoc.h
index bbbbbba43ba995642e3bbda434534e722ac429e6..69010ef8da6933d1c31c9c44333691f5c15e9d95
--- a/Tracking/TrkEvent/TrkRIO_OnTrack/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkRIO_OnTrack/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage The RIO_OnTrack class 
+@page TrkRIO_OnTrack_page The RIO_OnTrack class
 
-@section introductionTrkRIO_OnTrack Introduction
+@section TrkRIO_OnTrack_introductionTrkRIO_OnTrack Introduction
 
 Other conceptual names for this class is HitOnTrack or ClusterOnTrack. It contains the modified location of the RIOs according to a track. There are no container of RIO_OnTrack objects since the Track is essentially the container. The RIO_OnTrack contains the RIO from which it comes from. For most use cases there will be a single RIO associated with a RIO_OnTrack, while several RIO_OnTrack for each RIO (since there can be different tracks that make use of the same RIOs). However some users (like xKalman) might join clusters together so for this case a vector of RIOs is provided. 
 
@@ -24,11 +24,9 @@ Please let me know of any errors, or if anything is unclear.
 @author Edward.Moyse@cern.ch
 @author Andreas.Salzburger@cern.ch
 
-@section used_packagesTrkRIO_OnTrack Used Packages
-@htmlinclude used_packages.html
+@section TrkRIO_OnTrack_used_packagesTrkRIO_OnTrack Used Packages
 
-@section requirements Requirements
-@include requirements
+@section TrkRIO_OnTrack_requirements Requirements
 
 @namespace Trk
 A namespace to enclose the Tracking classes.
diff --git a/Tracking/TrkEvent/TrkRoad/doc/mainpage.h b/Tracking/TrkEvent/TrkRoad/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from Tracking/TrkEvent/TrkRoad/doc/mainpage.h
rename to Tracking/TrkEvent/TrkRoad/doc/packagedoc.h
index 7ba04174b41c3b8bed80cc1ad693a2045ec56a40..858e9694ddee2178a3c44ce7c559ceb34b533cf3
--- a/Tracking/TrkEvent/TrkRoad/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkRoad/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage TrkRoad Package
+@page TrkRoad_page TrkRoad Package
 @author Zvi.Tarem@cern.ch
 
-@section TrkRoadIntro Introduction
+@section TrkRoad_TrkRoadIntro Introduction
 
 The TrkRoad class encapsulates the information required by the find() method of the muon segment makers.
 It contains a global position, a global direction, and the width of the road in the eta and phi directions.
@@ -16,13 +16,12 @@ Segment makers use this information in different ways:
 - The DHough MDT segment maker uses the road width to limit the set of tubes used in the procedure.
 - The TGC and RPC segment makers use the input direction when the provided hits are too close together and can only give an estimate of the segment position.
 
-@section TrkRoadOverview Class Overview
+@section TrkRoad_TrkRoadOverview Class Overview
 
 The class interface provides a constructor, accesss methods and stream operators for debug printouts.
 
 The companion class TrackRoadCollection provides a persistent DataVector of TrkRoad objects. 
 
-@section TrkRoadReq The requirements file
+@section TrkRoad_TrkRoadReq The requirements file
 
-@include requirements
 */
diff --git a/Tracking/TrkEvent/TrkSegment/doc/mainpage.h b/Tracking/TrkEvent/TrkSegment/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from Tracking/TrkEvent/TrkSegment/doc/mainpage.h
rename to Tracking/TrkEvent/TrkSegment/doc/packagedoc.h
index 745c27590e281a4271f68dda92daddfd2a207d36..490ef4040ec71de00667c310485ad4e220391824
--- a/Tracking/TrkEvent/TrkSegment/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkSegment/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage The Segment class 
+@page TrkSegment_page The Segment class
 
-@section introductionTrkSegment Introduction
+@section TrkSegment_introductionTrkSegment Introduction
 
 The base class package for Track Segments.
 This package contains the base class for all track segments (Trk::Segment) that extens 
@@ -22,8 +22,7 @@ polymorphic Trk::RIO_OnTrack objects stored through base class pointers.
 Please let me know of any errors, or if anything is unclear.
 @author Andreas.Salzburger@cern.ch
 
-@section requirementsTrkSegment Requirements
-@include requirements
+@section TrkSegment_requirementsTrkSegment Requirements
 
 @namespace Trk
 A namespace to enclose the Tracking classes.
diff --git a/Tracking/TrkEvent/TrkSpacePoint/doc/mainpage.h b/Tracking/TrkEvent/TrkSpacePoint/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from Tracking/TrkEvent/TrkSpacePoint/doc/mainpage.h
rename to Tracking/TrkEvent/TrkSpacePoint/doc/packagedoc.h
index 09de9b60d49243037fd2a3db0275c40d5894cebe..1cc04f22cd9c8876ddbbe71b5d1bc10e4ba8db3a
--- a/Tracking/TrkEvent/TrkSpacePoint/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkSpacePoint/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage TrkSpacePoint Package
+@page TrkSpacePoint_page TrkSpacePoint Package
 @author Veronique Boisvert, Maria.Jose.Costa@cern.ch, Martin.Siebel@cern.ch
 
-@section TrkSpacePointIntro Introduction
+@section TrkSpacePoint_TrkSpacePointIntro Introduction
 
 This package contains the definition of the abstract base class 
 SpacePoint and its collections and containers. The SpacePoint class
 is derived from MeasurementBase. GlobalErrors are derived from LocalErrors
 which have to be provided by the derived classes.
 
-@section TrkSpacePointOverview Class Overview
+@section TrkSpacePoint_TrkSpacePointOverview Class Overview
   The TrkSpacePoint package contains the following classes:
 
    - SpacePoint: SpacePoint Class definition. The following methods are purely
@@ -33,7 +33,6 @@ which have to be provided by the derived classes.
    - SpacePointOverlapCollection: Class to contain all the SCT overlap 
    SpacePoints, the other ones are in the SpacePointCollection.
  
-@section TrkSpacePointReq Requirements
+@section TrkSpacePoint_TrkSpacePointReq Requirements
 
-@include requirements
 */
diff --git a/Tracking/TrkEvent/TrkTrack/doc/mainpage.h b/Tracking/TrkEvent/TrkTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Tracking/TrkEvent/TrkTrack/doc/mainpage.h
rename to Tracking/TrkEvent/TrkTrack/doc/packagedoc.h
index 81a3f65fc1861ccd491d931ac7060e4094e7f66e..1222707e20c774af689959182d032f00a4df4bfe
--- a/Tracking/TrkEvent/TrkTrack/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkTrack/doc/packagedoc.h
@@ -3,16 +3,16 @@
 */
 
 /**
-@mainpage The Track class 
+@page TrkTrack_page The Track class
 
 @author Edward.Moyse@cern.ch
 
-@section introductionTrkTrack Introduction
+@section TrkTrack_introductionTrkTrack Introduction
 This package contains the common Track class for ATLAS.
 This Track class is also not intended for use in physics analysis (see xAOD::TrackParticle),
 and is instead optimised for reconstruction. 
 
-@section designTrkTrack Design
+@section TrkTrack_designTrkTrack Design
 The two main aims are as follows:
 - provide all necessary functionality (for reconstruction)
 - provide a class that is efficient and fast
@@ -34,7 +34,7 @@ This approach is also continued with the concept of a Trk::FitQualityOnSurface (
 Click on <a href="annotated.html">Class List</a> to see all the classes available in this package.<br>
 Outstanding issues are shown in the <a href="todo.html">ToDo</a> list.
 
-@section guidelinesTrkTrack Guidelines for use
+@section TrkTrack_guidelinesTrkTrack Guidelines for use
 One important point (mentioned above in the design section) is that, in order to provide a flexible class, it is not safe to assume that just because the Track *can* contain e.g. ScatteringAngles, that it does so. In general it won't - a good rule of thumb is that you must test all objects returned by pointer ... they may well not exist (i.e the pointer may = 0)
 
 The TrackStateOnSurface *should* be ordered geometrically (i.e. the first TrackStateOnSurface is the one closest to the IP, and the last TrackStateOnSurface is the furthest from it etc) but this is not checked in the constructors : creators of tracks must be careful! For further details of requirements coming from TrackStateOnSurface please see the documentation for that class.
@@ -42,7 +42,7 @@ The TrackStateOnSurface *should* be ordered geometrically (i.e. the first TrackS
 For examples of how to form and use tracks see e.g. TrackParticleCreator and InDetLegacyCnvTools. Additionially there is a wiki page under development (feel free to add to it!)
 <a href="https://uimon.cern.ch/twiki/bin/view/Atlas/UsingTrkTracks">here</a>
 
-@section literatureTrkTrack Full Written Documentation
+@section TrkTrack_literatureTrkTrack Full Written Documentation
 Documents describing various aspects on Trk::Track and its related Tracking
 EDM objects are available in CDS:
 <br><b>ATL-SOFT-PUB-2006-004</b> CERN, 20 Jul 2006 - 31 p
diff --git a/Tracking/TrkEvent/TrkTrackLink/doc/mainpage.h b/Tracking/TrkEvent/TrkTrackLink/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from Tracking/TrkEvent/TrkTrackLink/doc/mainpage.h
rename to Tracking/TrkEvent/TrkTrackLink/doc/packagedoc.h
index 3e7005791c8730495ecebfffa3b78ce9f30d0d4f..e2e498733558ad0d47ea129340be1ff0efe50cfc
--- a/Tracking/TrkEvent/TrkTrackLink/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkTrackLink/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage  TrkTrackLink
+@page TrkTrackLink_page TrkTrackLink
 
 @author Kirill.Prokofiev@cern.ch
 @author Andreas.Wildauer@cern.ch
 
-@section PackageDescription Package Description
+@section TrkTrackLink_PackageDescription Package Description
 
 This package was created to resolve the circular dependency between the VxVertex and the TrkParticleBase package. The circular dependency
 happened because the Trk::VxTrackAtVertex object needs to have an ElementLink to a Trk::TrackParticleBase object and the latter has an
@@ -18,9 +18,7 @@ in the Trk::VxTrackAtVertex class and resolves this circular depenency therefore
 The actual links which are used now are the classes Trk::LinkToTrack and Trk::LinkToTrackParticle which both inherit from Trk::ITrackLink
 and ElementLink< TrackCollection > or ElementLink< TrackParticleBaseContainer >, respectively.
 
-@section UsedPackages Used Packages
-@htmlinclude used_packages.html
-@section MyPackageReq Requirements
-@include requirements
+@section TrkTrackLink_UsedPackages Used Packages
+@section TrkTrackLink_MyPackageReq Requirements
 
 */
diff --git a/Tracking/TrkEvent/TrkTrackSummary/doc/mainpage.h b/Tracking/TrkEvent/TrkTrackSummary/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 66%
rename from Tracking/TrkEvent/TrkTrackSummary/doc/mainpage.h
rename to Tracking/TrkEvent/TrkTrackSummary/doc/packagedoc.h
index 66dacd035bf1587cdac8b215cb6c2a9b3bacfea2..52c6fbe170c63d476bb0359268038d840d2b3147
--- a/Tracking/TrkEvent/TrkTrackSummary/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkTrackSummary/doc/packagedoc.h
@@ -4,17 +4,15 @@
 
 /**
 
-@mainpage TrkTrackSummary Package
+@page TrkTrackSummary_page TrkTrackSummary Package
 
 @author Edward.Moyse@cern.ch
 
 The TrkTrackSummary package contains the Trk::TrackSummary class, designed to provide summary information about a Trk::Track. It is generated using 
 the Trk::TrackSummaryTool of the package TrkTrackSummaryTool.
 
-@section used_packagesTkPara Used Packages
-@htmlinclude used_packages.html
+@section TrkTrackSummary_used_packagesTkPara Used Packages
 
-@section requirements Requirements
-@include requirements
+@section TrkTrackSummary_requirements Requirements
 
 */
diff --git a/Tracking/TrkEvent/TrkTruthData/doc/mainpage.h b/Tracking/TrkEvent/TrkTruthData/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 82%
rename from Tracking/TrkEvent/TrkTruthData/doc/mainpage.h
rename to Tracking/TrkEvent/TrkTruthData/doc/packagedoc.h
index 9df0a61caeb9cacb5d93b23a09595299450195f3..9a703d6eba284fe4ddaea1765c4fdad0aa2c3b92
--- a/Tracking/TrkEvent/TrkTruthData/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkTruthData/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage TrkTruthData Package
+@page TrkTruthData_page TrkTruthData Package
 @author Maria.Jose.Costa@cern.ch
 
-@section TrkTruthDataIntro Introduction
+@section TrkTruthData_TrkTruthDataIntro Introduction
 
 This package provides the implementation of the truth classes for the different
 objects of the Tracking EDM.
@@ -19,14 +19,13 @@ It contains then a HepMcParticleLink object (dominant source) and a
 probability to indicate what was the contribution of this source to the
 creation of the reconstructed object.  
 
-@section TrkTruthDataOverview Class Overview
+@section TrkTruthData_TrkTruthDataOverview Class Overview
   The MyPackage package contains of following classes:
 
   - PrepRawDataTruth: class to describe the truth of a given PrepRawData object
   - SpacePointTruth: class to describe the truth of a given SpacePoint object
   - TrackTruth: class to describe the truth of a given Track object
 
-@section TrkTruthDataReq Requirements
+@section TrkTruthData_TrkTruthDataReq Requirements
 
-@include requirements
 */
diff --git a/Tracking/TrkEvent/TrkV0Vertex/doc/mainpage.h b/Tracking/TrkEvent/TrkV0Vertex/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 85%
rename from Tracking/TrkEvent/TrkV0Vertex/doc/mainpage.h
rename to Tracking/TrkEvent/TrkV0Vertex/doc/packagedoc.h
index 420e55d0dae7ca39c5970035e15e0ca7a733a7d6..99dff061e6b24d4c03ca5ea3d47b1dc06163eb0f
--- a/Tracking/TrkEvent/TrkV0Vertex/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkV0Vertex/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage TrkV0Vertex Package
+@page TrkV0Vertex_page TrkV0Vertex Package
 
 @author Evelina.Bouhova@cern.ch
 @author Kirill.Prokofiev@cern.ch
 
-\section IntroductionTrkV0Vertex Introduction
+@section TrkV0Vertex_IntroductionTrkV0Vertex Introduction
 This is and Event Data Model package, designed to 
 store the information about reconstructed V0 candidates, 
 such as photon conversions, kaons, lambdas and so.
 
-\section designTrkV0Vertex Design
+@section TrkV0Vertex_designTrkV0Vertex Design
 <b><i>Trk::V0Hypothesis</i></b> Inherits from <i>Trk::ExtendedVxCandidate</i>. 
 In addition it contains the assumed PDG ID 
 of the positive and negative tracks, making the V0 and the assumed PDG ID of the V0. 
@@ -28,9 +28,7 @@ plus one or more mass constrained hypotheses (reconstructed from the same pair o
 It represents a collection of <i>Trk::V0Candidate<i>'s reconstructed by a V0 finding
 algorithm and written to the StoreGate for further use.
 
-\section requirementsTrkV0Vertex Requirements
-@htmlinclude used_packages.html
-@include requirements
+@section TrkV0Vertex_requirementsTrkV0Vertex Requirements
 
 */
 
diff --git a/Tracking/TrkEvent/TrkVertexOnTrack/doc/mainpage.h b/Tracking/TrkEvent/TrkVertexOnTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 75%
rename from Tracking/TrkEvent/TrkVertexOnTrack/doc/mainpage.h
rename to Tracking/TrkEvent/TrkVertexOnTrack/doc/packagedoc.h
index 6be657971416e4e77e29666b890aefd1679b9cf7..8316284def0eace4447f12cf3b7974664d784a8e
--- a/Tracking/TrkEvent/TrkVertexOnTrack/doc/mainpage.h
+++ b/Tracking/TrkEvent/TrkVertexOnTrack/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage The VertexOnTrack class 
+@page TrkVertexOnTrack_page The VertexOnTrack class
 @author haertel@mppmu.mpg.de
 
-@section introductionTrkVertexOnTrack Introduction
+@section TrkVertexOnTrack_introductionTrkVertexOnTrack Introduction
 
 Class to handle vertices as measurements in fitters and on track objects, it inherits from the common MeasurementBase.
 Typically a VertexFinder is run to get the best possible VertexCandidates. A VertexOnTrack instance then needs to be
@@ -18,11 +18,9 @@ the alignment procedures.
 
 
 
-@section used_packagesTrkVertexOnTrack Used Packages
-@htmlinclude used_packages.html
+@section TrkVertexOnTrack_used_packagesTrkVertexOnTrack Used Packages
 
-@section requirements Requirements
-@include requirements
+@section TrkVertexOnTrack_requirements Requirements
 
 @namespace Trk
 A namespace to enclose the Tracking classes.
diff --git a/Tracking/TrkEvent/VxMultiVertex/doc/mainpage.h b/Tracking/TrkEvent/VxMultiVertex/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from Tracking/TrkEvent/VxMultiVertex/doc/mainpage.h
rename to Tracking/TrkEvent/VxMultiVertex/doc/packagedoc.h
index d43a9c2b523c70abeb109042571576491543a8bb..90e6a20dbde90aedf46b33a68ba4aaa897210d1a
--- a/Tracking/TrkEvent/VxMultiVertex/doc/mainpage.h
+++ b/Tracking/TrkEvent/VxMultiVertex/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage VxMultiVertex Package
+@page VxMultiVertex_page VxMultiVertex Package
 
 @author Kirill.Prokofiev@cern.ch
 
-\section introVxMultiVertex Introduction
+@section VxMultiVertex_introVxMultiVertex Introduction
 This package is designed to provide an 
 Event Data Model for a vertex reconstruction performed with
 multi vertex adaptive technique.
@@ -17,7 +17,7 @@ Presently, all the additional data members are made transient.
 In the case the storage of these members will be required in 
 future, a special MVFVxContainer is provided.
 
-\section designVxMultiVertex Design
+@section VxMultiVertex_designVxMultiVertex Design
 <b><i>Trk::MVFVxCandidate </i></b>  An extention of 
 <i>Trk::VxCandidate</i>. This class uses <i>Trk::MVFVxTrackAtVertex</i>
 to store the information about tracks participating in the 
@@ -37,8 +37,6 @@ an adaptive multi vertex fit.
 of <i>Trk::MVFVxCandidate </i>. It is not used so far, but might become 
 quite important if any of presently transient MVF-related stuff becomes
 persistent.
-\section requirementsVxMultiVertex Requirements
-@htmlinclude used_packages.html
-@include requirements
+@section VxMultiVertex_requirementsVxMultiVertex Requirements
 
 */
diff --git a/Tracking/TrkEvent/VxVertex/doc/mainpage.h b/Tracking/TrkEvent/VxVertex/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from Tracking/TrkEvent/VxVertex/doc/mainpage.h
rename to Tracking/TrkEvent/VxVertex/doc/packagedoc.h
index b8b64db827016216739ea70bf9dc43208cf88362..7ea617ed1deaa4bf391a4fc5e107772b40d23c67
--- a/Tracking/TrkEvent/VxVertex/doc/mainpage.h
+++ b/Tracking/TrkEvent/VxVertex/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage  VxVertex
+@page VxVertex_page VxVertex
 
 
 @author Andreas.Wildauer@cern.ch
 @author Kirill.Prokofiev@cern.ch
 
-\section introVxVertex Introduction
+@section VxVertex_introVxVertex Introduction
 The <i>VxVertex</i> package provides the Event Data Model for
 reconstruction of primary and secondary vertexes. 
 The extensions of VxVertex are also suitable  to 
@@ -24,7 +24,7 @@ its track contents. In some case (e.g. constraint fitting) the
 full covariance matrix of the fit is also stored (see <i>
 Trk::ExtendedVxCandidate</i>).
 
-\section designVxVertex Design
+@section VxVertex_designVxVertex Design
 <b><i>Trk::Vertex</i></b>: A simplest vertex representation. Stores a 
 3d position only.
 <br><br>
@@ -56,8 +56,6 @@ vertex fit.
 <b><i>VxContainer</i></b>: A top level object of this package. This is
 a container of vertexes to be written to the StoreGate as a result of
 a vertex reconstruction.
-\section MyPackageReq Requirements
-@htmlinclude used_packages.html
-@include requirements
+@section VxVertex_MyPackageReq Requirements
 
 */
diff --git a/Tracking/TrkEventCnv/TrkJiveXML/doc/mainpage.h b/Tracking/TrkEventCnv/TrkJiveXML/doc/packagedoc.h
similarity index 81%
rename from Tracking/TrkEventCnv/TrkJiveXML/doc/mainpage.h
rename to Tracking/TrkEventCnv/TrkJiveXML/doc/packagedoc.h
index 38e69a2c91d9bff37e84df580e2cad5bb971f74f..5e7e3fc1744897cdf39ff002d4fb08dc11835e00 100644
--- a/Tracking/TrkEventCnv/TrkJiveXML/doc/mainpage.h
+++ b/Tracking/TrkEventCnv/TrkJiveXML/doc/packagedoc.h
@@ -4,15 +4,15 @@
 
 /**
 
-@mainpage TrkJiveXML
+@page TrkJiveXML_page TrkJiveXML
 @author Nikos.Konstantinidis -at- cern.ch, Eric.Jansen -at- cern.ch, Juergen.Thomas -at- cern.ch, Sebastian.Boeser -at- cern.ch
 
-@section TrkJiveXMLIntro Introduction
+@section TrkJiveXML_TrkJiveXMLIntro Introduction
 
 This package contains the @c AthAlgTools that retrieve tracking data (tracks, track segments and vertices) from @c StoreGate and 
 forward them to the formatting tool. Each tool implements the IDataRetriever interface, through which it is called from the @c AlgoJiveXML.
 
-@section TrkJiveXMLTools Retrievers
+@section TrkJiveXML_TrkJiveXMLTools Retrievers
 
 - JiveXML::SegmentRetriever @copydoc JiveXML::SegmentRetriever
 
@@ -20,7 +20,7 @@ forward them to the formatting tool. Each tool implements the IDataRetriever int
 
 - JiveXML::VertexRetriever : @copydoc JiveXML::VertexRetriever
 
-@section TrkJiveXMLEnv Environment
+@section TrkJiveXML_TrkJiveXMLEnv Environment
  - @ref used_TrkJiveXML
  - @ref requirements_TrkJiveXML
 
@@ -28,11 +28,9 @@ forward them to the formatting tool. Each tool implements the IDataRetriever int
 
 /**
 @page used_TrkJiveXML Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrkJiveXML Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/doc/mainpage.h b/Tracking/TrkExtrapolation/TrkExAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from Tracking/TrkExtrapolation/TrkExAlgs/doc/mainpage.h
rename to Tracking/TrkExtrapolation/TrkExAlgs/doc/packagedoc.h
index 08840cb125cd2ee6d16cb300b86bbf9c8306095a..eeb0e35459004fe690b2f11bcb5b9f93459cab4a
--- a/Tracking/TrkExtrapolation/TrkExAlgs/doc/mainpage.h
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage TrkExAlgs Package
+@page TrkExAlgs_page TrkExAlgs Package
 
 The TrkExAlgs package is designed for hosting test and validation algorithms
 that are matter of the track extrapolation.
 
 @author Andreas Salzburger <Andreas.Salzburger@cern.ch>
 
-@section TrkExAlgsIntro Introduction
+@section TrkExAlgs_TrkExAlgsIntro Introduction
 
 The validaiton algorithms that can be found in this package are:
 
@@ -22,8 +22,7 @@ The validaiton algorithms that can be found in this package are:
 The algorithms can be steered through jobOptions files that are located in the
 TrkExExample package.
 
-@section TrkExAlgsReq Requirements
+@section TrkExAlgs_TrkExAlgsReq Requirements
 
-@include requirements
 
 */
diff --git a/Tracking/TrkExtrapolation/TrkExEngine/doc/mainpage.h b/Tracking/TrkExtrapolation/TrkExEngine/doc/packagedoc.h
similarity index 97%
rename from Tracking/TrkExtrapolation/TrkExEngine/doc/mainpage.h
rename to Tracking/TrkExtrapolation/TrkExEngine/doc/packagedoc.h
index d58f97cb9f88e3f6f50f0ee3c891958db425cfc2..6cb20c2fccad24cef9b3c38572ccbf55277c482a 100644
--- a/Tracking/TrkExtrapolation/TrkExEngine/doc/mainpage.h
+++ b/Tracking/TrkExtrapolation/TrkExEngine/doc/packagedoc.h
@@ -6,7 +6,7 @@
 
  <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
 
-@mainpage
+@page TrkExEngine_page 
 
 New Extrapolation package
 =========================
@@ -50,8 +50,6 @@ During the extrapolation process, the code forwarded between the different compo
 while success and failure codes are used to indicate different destination parameters or eventual failures during the extrapolation progress.
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Tracking/TrkExtrapolation/TrkExExample/doc/mainpage.h b/Tracking/TrkExtrapolation/TrkExExample/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 80%
rename from Tracking/TrkExtrapolation/TrkExExample/doc/mainpage.h
rename to Tracking/TrkExtrapolation/TrkExExample/doc/packagedoc.h
index ce1f7fc2ca709476c6efb1a46c6e48c0b0d6abee..446a9793ff593e0ef2ef5be4f90c89cbfc1a0024
--- a/Tracking/TrkExtrapolation/TrkExExample/doc/mainpage.h
+++ b/Tracking/TrkExtrapolation/TrkExExample/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage The TrkExExample package
+@page TrkExExample_page The TrkExExample package
 
 This is a run package that provides jobOption files for the execution of Algorithms that are
 located in the TrkExAlgs package.
 
-@section TrkExExampleIntroduction Introduction
+@section TrkExExample_TrkExExampleIntroduction Introduction
 
 This package is mainly ment for validaiton purposes, it contains a simple self-consistency
 extrapolation test (ExtrapolationValidation) and a numerical check of the calculated jacobian
@@ -17,9 +17,8 @@ matrices used in the various propagation tools (RiddersAlgorithm).
 @author Andreas.Salzburger@cern.ch
 
 
-@section requirements Requirements
+@section TrkExExample_requirements Requirements
 The libaray type is a pure component library.
-@include requirements
 */
 
 /**
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/doc/mainpage.h b/Tracking/TrkExtrapolation/TrkExInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 90%
rename from Tracking/TrkExtrapolation/TrkExInterfaces/doc/mainpage.h
rename to Tracking/TrkExtrapolation/TrkExInterfaces/doc/packagedoc.h
index e5960d8b504912cd14c53442b2a4fa74226a5c56..5f93800e299ae1f7f1fc46c652d6ee4f0f9447f5
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/doc/mainpage.h
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrkExInterfaces Package
+@page TrkExInterfaces_page TrkExInterfaces Package
 
 This package contains all interface classes
 to be used in the TrkExtrapolation container package.
@@ -12,7 +12,7 @@ TrkExTools package.
 
 @author Andreas.Salzburger@cern.ch
 
-@section TrkExInterfacesIntro List of interfaces
+@section TrkExInterfaces_TrkExInterfacesIntro List of interfaces
 
 
 The following interface classes are defined
@@ -33,7 +33,7 @@ The following interface classes are defined
 This package is not built as a library, it is a simple include package.   
 \endhtmlonly
       
-@section ExtrasTrkExInterfaces Extra Pages
+@section TrkExInterfaces_ExtrasTrkExInterfaces Extra Pages
 
  - @ref UsedTrkExInterfaces
  - @ref reqsTrkExInterfaces
@@ -41,10 +41,8 @@ This package is not built as a library, it is a simple include package.
 
 /**
 @page UsedTrkExInterfaces Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page reqsTrkExInterfaces Requirements
-@include requirements
 */
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/doc/mainpage.h b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/doc/mainpage.h
rename to Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/doc/packagedoc.h
index e5bcf45bbfe79fd0763eeb1a427ff8b9a9ee7a5c..92d4b837fa1f8fca7ef2f251e60c8cfb4c22ef0a
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/doc/mainpage.h
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage The TrkExRungeKutta package
+@page TrkExRungeKuttaPropagator_page The TrkExRungeKutta package
 
 Propagation of TrackParameters and their associated covariance matrices in a Runge-Kutta integrated method
 
-@section TrkExRkIntroduction Introduction
+@section TrkExRungeKuttaPropagator_TrkExRkIntroduction Introduction
 
 The RungeKuttaPropagator implements the IPropagator interface with a Runge-Kutta 
 integrated method to be used in a non-homogenous magnetic field.
@@ -20,7 +20,7 @@ The tool implements two abstract interfaces:
 - under Trk::IPropagator it provides propagation of EDM Trk::TrackParameters
 - under Trk::IPatternParametersPropagator it provides propagation of parameters for internal use, the Trk::PatternTrackParameters
 
-@section TrkExRkComments Comments
+@section TrkExRungeKuttaPropagator_TrkExRkComments Comments
 
 Please let me know of any errors, or if anything is unclear.
 @author Igor.Gavrilenko@cern.ch
diff --git a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/doc/mainpage.h b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from Tracking/TrkExtrapolation/TrkExSTEP_Propagator/doc/mainpage.h
rename to Tracking/TrkExtrapolation/TrkExSTEP_Propagator/doc/packagedoc.h
index 28daa611d45a0b20f1a80ddc45d26286ecc805b5..864abbe67fddb0efb41605a8f3d9244f6dc7341f
--- a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/doc/mainpage.h
+++ b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage TrkExSTEP_Propagator package
+@page TrkExSTEP_Propagator_page TrkExSTEP_Propagator package
 
-@section TrkExSTEPIntroduction Introduction
+@section TrkExSTEP_Propagator_TrkExSTEPIntroduction Introduction
 
 The STEP_Propagator implements the IPropagator interface with a Runge-Kutta-Nystrom integration method to be used in an inhomogenous magnetic field with material effects included. The covariance matrix is also tranported.
 
@@ -21,10 +21,9 @@ Material interactions: http://cdsweb.cern.ch/record/1114577
 
 Units are mm, MeV and kiloGauss.
 
-@section TrkExSTEPComments Comments
+@section TrkExSTEP_Propagator_TrkExSTEPComments Comments
 Please let me know of any errors, or if anything is unclear.
 
 @author esben.lund@fys.uio.no
 
-@include requirements
 */
diff --git a/Tracking/TrkExtrapolation/TrkExTools/doc/mainpage.h b/Tracking/TrkExtrapolation/TrkExTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from Tracking/TrkExtrapolation/TrkExTools/doc/mainpage.h
rename to Tracking/TrkExtrapolation/TrkExTools/doc/packagedoc.h
index 505d47e8ab01af5c400ada7c2e06743cd70d1da6..06225cf0ec60712ef0373bbb646883aa0b0dca6c
--- a/Tracking/TrkExtrapolation/TrkExTools/doc/mainpage.h
+++ b/Tracking/TrkExtrapolation/TrkExTools/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 /**
-@mainpage The TrkExTools package
+@page TrkExTools_page The TrkExTools package
 
 This is the core package for track extrapolation tools in the new RTF reconstruction scheme.
 
 
-@section TrkExToolsIntroduction Introduction
+@section TrkExTools_TrkExToolsIntroduction Introduction
 The extrapolation process is organised by two different layers:
   - propagation of parameters and covariances: This is done by the Trk::IPropagator AlgTools,
     different types of propagators are available for different magnetic field resp. material setups
   - extrapolation: this includes navigation, material update and makes use of the propagation. The 
     main tool combining this is the Trk::IExtrapolator.
   
-@section TrkExToolsToolDescr Description of AlgTools
+@section TrkExTools_TrkExToolsToolDescr Description of AlgTools
 
 Following interface classes for AlgTools have are defined in this package:
 
@@ -90,15 +90,14 @@ In addition, following concrete implementations can be found in this scope:
 </table>
 
 
-@section TrkExToolsComments Comments
+@section TrkExTools_TrkExToolsComments Comments
 
 Please let me know of any errors, or if anything is unclear.
 @author Andreas.Salzburger@cern.ch
 
 
-@section requirements Requirements
+@section TrkExTools_requirements Requirements
 The libaray type is a pure component library.
-@include requirements
 */
 
 /**
diff --git a/Tracking/TrkExtrapolation/TrkExUtils/doc/mainpage.h b/Tracking/TrkExtrapolation/TrkExUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 76%
rename from Tracking/TrkExtrapolation/TrkExUtils/doc/mainpage.h
rename to Tracking/TrkExtrapolation/TrkExUtils/doc/packagedoc.h
index 7bec629e53f63f5050e74a94c5d7a4ae007ec374..97e742a7edee4adda4b9a3aedf0cddc0efa87e28
--- a/Tracking/TrkExtrapolation/TrkExUtils/doc/mainpage.h
+++ b/Tracking/TrkExtrapolation/TrkExUtils/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage The TrkExUtils package
+@page TrkExUtils_page The TrkExUtils package
 
 This Package contains useful utilities in the TrkExtrapolation container package.
 
-@section TrkExUtilsIntroduction Introduction
+@section TrkExUtils_TrkExUtilsIntroduction Introduction
 
 The TrkExUtils is a purely installed library that contains common utilities used within
 the extrapolation/propagation process.
@@ -16,8 +16,7 @@ the extrapolation/propagation process.
 @author Andreas.Salzburger@cern.ch, Igor.Gavrilenko@cern.ch, Esben.Lund@cern.ch
 
 
-@section requirements Requirements
-@include requirements
+@section TrkExUtils_requirements Requirements
 */
 
 /**
diff --git a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/doc/mainpage.h b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 76%
rename from Tracking/TrkFitter/TrkDeterministicAnnealingFilter/doc/mainpage.h
rename to Tracking/TrkFitter/TrkDeterministicAnnealingFilter/doc/packagedoc.h
index 48f99fbbd3c26bdc0d8501622227b0413dcea4e8..fd1cdc438536292515d320d0688dc71fa6ff5193
--- a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/doc/mainpage.h
+++ b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage The TrkDeterministicAnnealingFilter package
+@page TrkDeterministicAnnealingFilter_page The TrkDeterministicAnnealingFilter package
 The Deterministic Annealing Filter (DAF) implementation.
 
 @author Sebastian.Fleischmann@cern.ch
 
-@section introductionTrkDeterministicAnnealingFilter Introduction
+@section TrkDeterministicAnnealingFilter_introductionTrkDeterministicAnnealingFilter Introduction
 
 The TrkDeterministicAnnealingFilter package implements the deterministic annealing filtering
 technique for track fitting, as proposed by Fr&uuml;hwirth and Strandlie in 1999 [1].
@@ -17,18 +17,18 @@ This package contains the high-level steering algorithms of the DAF. The actual
 are performed by several other packages which depend in many cases on detector-dependend knowledge.
 @image html CantGetEnough.jpg
 
-@section TrkDeterministicAnnealingFilterOverview Class Overview
+@section TrkDeterministicAnnealingFilter_TrkDeterministicAnnealingFilterOverview Class Overview
   The TrkDeterministicAnnealingFilter package contains the following classes:
 
   - Trk::DeterministicAnnealingFilter : DAF steering algorithm, prepares the fit and performs the annealing iterations
   - Trk::DAF_WeightCalculator : Tool for calculating the assignment probabilities according to the DAF formulae
   - Trk::DAF_SimpleWeightCalculator : Tool for calculating the assignment probabilities according to the DAF formulae with simplified normalization (modification to formulas in [1])
   
-@section TrkDeterministicAnnealingFilterDocReferences References
+@section TrkDeterministicAnnealingFilter_TrkDeterministicAnnealingFilterDocReferences References
 [1] R. Fr&uuml;hwirth, A. Strandlie, <i>Track fitting with ambiguities and noise:
 a study of elastic tracking and non-linear filters</i>,  Computer Physics Communications (1999) vol. 120, no. 2-3, pp. 197-214.
     
-@section ExtrasTrkDeterministicAnnealingFilter Extra Pages
+@section TrkDeterministicAnnealingFilter_ExtrasTrkDeterministicAnnealingFilter Extra Pages
 
  - @ref UsedTrkDeterministicAnnealingFilter
  - @ref requirementsTrkDeterministicAnnealingFilter
@@ -36,11 +36,9 @@ a study of elastic tracking and non-linear filters</i>,  Computer Physics Commun
 
 /**
 @page UsedTrkDeterministicAnnealingFilter Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkDeterministicAnnealingFilter Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/doc/mainpage.h b/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 64%
rename from Tracking/TrkFitter/TrkDynamicNoiseAdjustor/doc/mainpage.h
rename to Tracking/TrkFitter/TrkDynamicNoiseAdjustor/doc/packagedoc.h
index da99e9f7777cf83fedc38209853fb995670a7ff2..d7c246c91c1df2b916425a6e4bd5259cc10f2d9d
--- a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/doc/mainpage.h
+++ b/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/doc/packagedoc.h
@@ -3,24 +3,22 @@
 */
 
 /**
-\mainpage The TrkDynamicNoiseAdjustorInterfaces package
+@page TrkDynamicNoiseAdjustor_page The TrkDynamicNoiseAdjustorInterfaces package
 
 @author vakhtang.kartvelishvili@cern.ch
 
-\section introductionTrkDynamicNoiseAdjustor Introduction
+@section TrkDynamicNoiseAdjustor_introductionTrkDynamicNoiseAdjustor Introduction
 TrkDynamicNoiseAdjustor is a tool used by the TrkKalmanFitter, which can be used
 to improve momentum reconstrcution for bremming electron tracks.
 
-\section howitworksTrkDynamicNoiseAdjustor How it works:
+@section TrkDynamicNoiseAdjustor_howitworksTrkDynamicNoiseAdjustor How it works:
 TrkDynamicNoiseAdjustor works by adding appropriately calculated noise term to the
 Trk::qOverP element
 of the covariance matrix during filtering. This noise term is calculated
 dynamically, whenever a local single-parameter fit suggests that a
 significant momentum loss has taken place at a given silicon layer.
 
-\section requirementsTrkDynamicNoiseAdjustor  Requirements
+@section TrkDynamicNoiseAdjustor_requirementsTrkDynamicNoiseAdjustor Requirements
 
-@htmlinclude used_packages.html
-@include requirements
 
 */
diff --git a/Tracking/TrkFitter/TrkFitterInterfaces/doc/mainpage.h b/Tracking/TrkFitter/TrkFitterInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from Tracking/TrkFitter/TrkFitterInterfaces/doc/mainpage.h
rename to Tracking/TrkFitter/TrkFitterInterfaces/doc/packagedoc.h
index 3e9c600053fd5087ba420916370a50605fa3b096..b969e003380989e13d3025e71d6cb53c17feb21d
--- a/Tracking/TrkFitter/TrkFitterInterfaces/doc/mainpage.h
+++ b/Tracking/TrkFitter/TrkFitterInterfaces/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrkFitterInterfaces Package
+@page TrkFitterInterfaces_page TrkFitterInterfaces Package
 
 This package contains all interface classes which are used in the TrkFitter
 container package.
@@ -11,7 +11,7 @@ Concrete implementations can be found in each leaf package.
 
 @author Wolfgang.Liebig <http://consult.cern.ch/xwho/people/485812>
 
-@section TrkFitterInterfacesIntro Introduction
+@section TrkFitterInterfaces_TrkFitterInterfacesIntro Introduction
 
 The following interface classes are defined
 
@@ -27,8 +27,7 @@ The following interface classes are defined
 
 This package is not built as any library, it is a simple include package.   
 
-@section TrkFitterInterfacesReq Requirements
+@section TrkFitterInterfaces_TrkFitterInterfacesReq Requirements
 
-@include requirements
 
 */
diff --git a/Tracking/TrkFitter/TrkFitterUtils/doc/mainpage.h b/Tracking/TrkFitter/TrkFitterUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from Tracking/TrkFitter/TrkFitterUtils/doc/mainpage.h
rename to Tracking/TrkFitter/TrkFitterUtils/doc/packagedoc.h
index 7f63c2e754ae3a860defa0080799a3c54bb9a855..dc97380a2e44c4536dac2d5fee498a404d92f16d
--- a/Tracking/TrkFitter/TrkFitterUtils/doc/mainpage.h
+++ b/Tracking/TrkFitter/TrkFitterUtils/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page TrkFitterUtils_page 
 
-@section TrkFitterUtilsDocIntro Overview
+@section TrkFitterUtils_TrkFitterUtilsDocIntro Overview
 
 The package TrkFitterUtils provides two types of classes: definitions
 which are in use by the interfaces for track fits and internal data
@@ -54,7 +54,7 @@ package, has been moved to a separate package: TrkFitterInterfaces.
 
 @author Wolfgang Liebig <http://consult.cern.ch/xwho/people/54608>
 
-@section ExtrasTrkFitterUtils Extra Pages
+@section TrkFitterUtils_ExtrasTrkFitterUtils Extra Pages
 
  - @ref UsedTrkFitterUtils
  - @ref requirementsTrkFitterUtils
@@ -62,10 +62,8 @@ package, has been moved to a separate package: TrkFitterInterfaces.
 
 /**
 @page UsedTrkFitterUtils Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkFitterUtils Requirements
-@include requirements
 */
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/doc/mainpage.h b/Tracking/TrkFitter/TrkGaussianSumFilter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from Tracking/TrkFitter/TrkGaussianSumFilter/doc/mainpage.h
rename to Tracking/TrkFitter/TrkGaussianSumFilter/doc/packagedoc.h
index eb7cc20330d42234c146d255c498a1774835dbce..1e057d79db5d9afccdb26bb9114542978c2afe9e
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/doc/mainpage.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/doc/packagedoc.h
@@ -4,19 +4,19 @@
 
 /**
 
-@mainpage TrkGaussianSumFilter Package
+@page TrkGaussianSumFilter_page TrkGaussianSumFilter Package
 
 Fitting of tracks using the Gaussian Sum Filter Algorithm
 
 @author Anthony.Morley@cern.ch, Tom.Atkinson@cern.ch
 
-@section TrkGsfIntro Introduction
+@section TrkGaussianSumFilter_TrkGsfIntro Introduction
 
 Package allows for fitting using the Gaussian Sum Filter Algorithm. This algorithm finds particular application in the case where material effects or measurement errors are non-gaussian. The current implementation is limited to modelling the energy loss of relativistic electrons through the Bethe-Heitler distribution. Non-gaussian measurement errors are not yet included but will be in the future.
 
 The Gaussian Sum Filter can be thought of as a number of Kalman Filters running in parallel. As such it uses a number of classes developed for the Kalman Filter. The main extension is to allow a track state to be described by a gaussian sum of track parameters objects, rather than the usual single component. The class TrkMultiComponentStateOnSurface handles this at present.
 
-@section TrkGsfOverview Class Overview
+@section TrkGaussianSumFilter_TrkGsfOverview Class Overview
 
    There Gaussian sum filter makes use of the following existing interfaces
    - Trk::ITrackFitter
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/doc/mainpage.h b/Tracking/TrkFitter/TrkGlobalChi2Fitter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 70%
rename from Tracking/TrkFitter/TrkGlobalChi2Fitter/doc/mainpage.h
rename to Tracking/TrkFitter/TrkGlobalChi2Fitter/doc/packagedoc.h
index 4dafefd06ec4547c0e547afd854277b9002a2c65..dcffbbc466c4221073b8c7ff21dc481db4d49261
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/doc/mainpage.h
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/doc/packagedoc.h
@@ -4,25 +4,25 @@
 
 /**
 
-@mainpage
+@page TrkGlobalChi2Fitter_page 
 
 <!-- =============================================================== -->
-@section TrkGlobalChi2FitterDocIntroduction Introduction
+@section TrkGlobalChi2Fitter_TrkGlobalChi2FitterDocIntroduction Introduction
 <!-- =============================================================== -->
 
 The TrkGlobalChi2Fitter package implements the global chi2 technique for track fitting, as proposed by Lutz in 1988 [1].
 
-@section TrkGlobalChi2FitterDocContacts Contacts
+@section TrkGlobalChi2Fitter_TrkGlobalChi2FitterDocContacts Contacts
   @author T. Cornelissen <http://consult.cern.ch/xwho>
   Please reports bugs via Savannah, project "Atlas Tracking".<br>
   
 
-@section TrkGlobalChi2FitterDocReferences References
+@section TrkGlobalChi2Fitter_TrkGlobalChi2FitterDocReferences References
 
 [1] G. Lutz, <i>Optimum track fitting in the presence of multiple scattering</i>, NIM A 273 (1988) 349.
 
 
-@section ExtrasTrkGlobalChi2Fitter Extra Pages
+@section TrkGlobalChi2Fitter_ExtrasTrkGlobalChi2Fitter Extra Pages
 
  - @ref UsedTrkGlobalChi2Fitter
  - @ref RequirementsTrkGlobalChi2Fitter
@@ -30,11 +30,9 @@ The TrkGlobalChi2Fitter package implements the global chi2 technique for track f
 
 /**
 @page UsedTrkKalmanFitter Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTrkGlobalChi2Fitter Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/doc/mainpage.h b/Tracking/TrkFitter/TrkKalmanFitter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 97%
rename from Tracking/TrkFitter/TrkKalmanFitter/doc/mainpage.h
rename to Tracking/TrkFitter/TrkKalmanFitter/doc/packagedoc.h
index e15554af309e65e97cd10919b48c0efb4509287c..1029898180f469a95a433ade8701fcac680fa6b9
--- a/Tracking/TrkFitter/TrkKalmanFitter/doc/mainpage.h
+++ b/Tracking/TrkFitter/TrkKalmanFitter/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage
+@page TrkKalmanFitter_page 
 
 <!-- =============================================================== -->
-@section TrkKalmanFitterDocIntroduction Introduction
+@section TrkKalmanFitter_TrkKalmanFitterDocIntroduction Introduction
 <!-- =============================================================== -->
 
 The TrkKalmanFitter package implements in ATLAS the Kalman filtering
@@ -34,7 +34,7 @@ loss and access to alignable surfaces during use as alignment Kalman
 Filter.
 
 <!-- =============================================================== -->
-@section TrkKalmanFitterDocPrinciple The Kalman Filter Track Fitting Technique
+@section TrkKalmanFitter_TrkKalmanFitterDocPrinciple The Kalman Filter Track Fitting Technique
 <!-- =============================================================== -->
 
 As opposed to global chi2 fits, the Kalman Filtering technique uses
@@ -87,7 +87,7 @@ remove a hit from a track parameterisation, which in turn is a quick
 way of knowing the unbiased residual of a fitted state.
 
 <!-- =============================================================== -->
-@section TrkKalmanFitterDocImplement Implementation as an ATLAS Tracking Tool
+@section TrkKalmanFitter_TrkKalmanFitterDocImplement Implementation as an ATLAS Tracking Tool
 <!-- =============================================================== -->
 
 @subsection TrkKalmanFitterDocImple Interface
@@ -175,7 +175,7 @@ massively. The criterium is the filtered chi2 and the cut value
 steered by job option. 
 
 <!-- =============================================================== -->
-@section TrkKalmanFitterDocUsage Using TrkKalmanFitter in your code
+@section TrkKalmanFitter_TrkKalmanFitterDocUsage Using TrkKalmanFitter in your code
 <!-- =============================================================== -->
 To get the ITrackFitter interface, add to the requirements file
 @htmlonly
@@ -253,7 +253,7 @@ up as python classes in the prior parts of the reconstruction set-up.<br>
 
 
 <!-- =============================================================== -->
-@section TrkKalmanFitterDocSteering KalmanFitter Job Options
+@section TrkKalmanFitter_TrkKalmanFitterDocSteering KalmanFitter Job Options
 <!-- =============================================================== -->
 @subsection TrkKalmanFitterDocSteer1 Tool Handles
 The KalmanFitter and its extensions are configured and put together
@@ -545,7 +545,7 @@ can always set their specific values through the python configurables classes.
 
 @endhtmlonly
 
-@section TrkKalmanFitterDocStability Maintaining Fit Stability
+@section TrkKalmanFitter_TrkKalmanFitterDocStability Maintaining Fit Stability
 
 @subsection TrkKalmanFitterDocStab1 Fitting at Trk::PrepRawData level
   The KalmanFitter is designed to be a mathematical fitting tool
@@ -589,7 +589,7 @@ functioning, a few points need to be taken into account.
    (e.g. same drift tube with different helper frame) may be shuffled
    by accident, causing hits to be removed.
 
-@section TrkKalmanFitterDocContacts Contacts
+@section TrkKalmanFitter_TrkKalmanFitterDocContacts Contacts
   @author M. Elsing, W. Liebig <http://consult.cern.ch/xwho>
   Please reports bugs via Savannah, project "Atlas Tracking".<br>
   Also bear in mind that the KalmanFitter uses several other EDM classes
@@ -597,12 +597,12 @@ functioning, a few points need to be taken into account.
   be caused by methods from this package.
   
 
-@section TrkKalmanFitterDocReferences References
+@section TrkKalmanFitter_TrkKalmanFitterDocReferences References
 [1] R. Fr&uuml;hwirth et al, <i>Application of Kalman Filtering
     to Track and Vertex Fitting</i>, NIM A 262 (1987) 444.
 
 
-@section ExtrasTrkKalmanFitter Extra Pages
+@section TrkKalmanFitter_ExtrasTrkKalmanFitter Extra Pages
 
  - @ref UsedTrkKalmanFitter
  - @ref RequirementsTrkKalmanFitter
@@ -610,11 +610,9 @@ functioning, a few points need to be taken into account.
 
 /**
 @page UsedTrkKalmanFitter Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTrkKalmanFitter Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkFitter/TrkRefitAlg/doc/mainpage.h b/Tracking/TrkFitter/TrkRefitAlg/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 86%
rename from Tracking/TrkFitter/TrkRefitAlg/doc/mainpage.h
rename to Tracking/TrkFitter/TrkRefitAlg/doc/packagedoc.h
index 4e381f5d38eecfe334db91fd332190d2f2018cfb..83f8226a543e4b4a4fbdb7650ed3ec26c76c2341
--- a/Tracking/TrkFitter/TrkRefitAlg/doc/mainpage.h
+++ b/Tracking/TrkFitter/TrkRefitAlg/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage TrkRefitAlg Package
+@page TrkRefitAlg_page TrkRefitAlg Package
 @author T. Cornelissen, M.J. Costa, W. Liebig
 
-@section TrkRefitAlgIntro Introduction
+@section TrkRefitAlg_TrkRefitAlgIntro Introduction
 
 This package provides a configurable Algorithm, Trk::ReFitTrack,
 to refit tracks.
@@ -21,7 +21,7 @@ strategy. For example combined track fits or improved fit strategies
 after particle identification should be implemented inside the
 offline Reconstruction CVS realm.
 
-@section TrkRefitAlgSteering Steering the Trk::ReFitTrack
+@section TrkRefitAlg_TrkRefitAlgSteering Steering the Trk::ReFitTrack
 Trk::ReFitTrack is set up using standard Gaudi/Athena configurables
 @htmlonly
 <table cellspacing=10px><tr>
@@ -37,7 +37,7 @@ topSequence += MyReFitTrack
 </tr></table>
 @endhtmlonly
  
-@section ExtrasTrkRefitAlg Extra Pages
+@section TrkRefitAlg_ExtrasTrkRefitAlg Extra Pages
 
  - @ref UsedTrkRefitAlg
  - @ref RequirementsTrkRefitAlg
@@ -45,12 +45,10 @@ topSequence += MyReFitTrack
 
 /**
 @page UsedTrkRefitAlg Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTrkRefitAlg Requirements
-@include requirements
 */
 
 
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/doc/mainpage.h b/Tracking/TrkTools/TrkAmbiguityProcessor/doc/packagedoc.h
similarity index 94%
rename from Tracking/TrkTools/TrkAmbiguityProcessor/doc/mainpage.h
rename to Tracking/TrkTools/TrkAmbiguityProcessor/doc/packagedoc.h
index bc62b0aaae18d55f0b538cba8760dbaf74981f8e..8bba256dce4fdd9a16c101be6db85ebb61cafd3c 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page TrkAmbiguityProcessor_page 
 
 The TrkAmbiguityProcessor is responsible for resolving ambiguities in the passed TrackCollection. To do this, it attempts to improve the 'score' of an event, where the score of an event is the summed scores of all the tracks it contains. To this end, there is a (currently simplistic) Trk::TrackScoringTool, as well as a Trk::ITrackScoringHelperTool interface (to allow for ID and muon-specific implementation, without introducing a dependency). Additionally, the TrkAmbiguityProcessor makes use of a Trk::PRD_AssociationTool which keeps track of all the Trk::PrepRawData on the tracks, and knows which are shared with which Trk::Track etc.
 
@@ -22,10 +22,8 @@ For more details see "A New Algorithm For Solving Tracking Ambiguities, Daniel W
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 */
diff --git a/Tracking/TrkTools/TrkAssociationTools/doc/mainpage.h b/Tracking/TrkTools/TrkAssociationTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from Tracking/TrkTools/TrkAssociationTools/doc/mainpage.h
rename to Tracking/TrkTools/TrkAssociationTools/doc/packagedoc.h
index 0ff6fb1ecc9bb1e0f9c7d26271ef4dcb16e3d6cf..61105302c2734661569a83453c49c5abae540807
--- a/Tracking/TrkTools/TrkAssociationTools/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkAssociationTools/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page TrkAssociationTools_page 
 
 @author Edward.Moyse@cern.ch
 
@@ -12,6 +12,5 @@ This package provides tools to handle the associations between the various Track
 
 For example, the TrkAmbiguityProcessor makes use of the Trk::PRD_AssociationTool from this package, which keeps track of all the Trk::PrepRawData on the tracks, and knows which are shared with which Trk::Track etc.
 
-@include requirements
 
 */
diff --git a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/doc/mainpage.h b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 77%
rename from Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/doc/mainpage.h
rename to Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/doc/packagedoc.h
index 5333f888fed33ace7360d6fca1d1878b1b37be8c..59a2a97d26bc748aa8f0c6350d31ad7f29c93f8d
--- a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 /**
-@mainpage The TrkCompetingRIOsOnTrackTool package
+@page TrkCompetingRIOsOnTrackTool_page The TrkCompetingRIOsOnTrackTool package
 The package for CompetingRIOsOnTrack creation.
 
 @author Sebastian.Fleischmann@cern.ch
 
-@section introductionTrkCompetingRIOsOnTrackTool Introduction
+@section TrkCompetingRIOsOnTrackTool_introductionTrkCompetingRIOsOnTrackTool Introduction
 
 This package contains the tools to create Trk::CompetingRIOsOnTrack. This includes
     creation of the RIO_OnTrack objects with the corresponding tools.
     The actual calculations are not done in this package, but are
     delegated to the detector-specific packages.
 
-@section TrkCompetingRIOsOnTrackToolOverview Class Overview
+@section TrkCompetingRIOsOnTrackTool_TrkCompetingRIOsOnTrackToolOverview Class Overview
   The TrkCompetingRIOsOnTrackTool package contains the following classes:
 
   - Trk::ICompetingRIOsOnTrackTool : Interface class for CompetingRIOsOnTrackTools.
@@ -23,7 +23,7 @@ This package contains the tools to create Trk::CompetingRIOsOnTrack. This includ
     track hypothesis and a list of Trk::PrepRawData using the detector specific sub-tool.
   - Trk::IWeightCalculator : Interface class for WeightCalculators, which compute the assignment probabilities of competing measurements to a track
   
-@section ExtrasTrkCompetingRIOsOnTrackTool Extra Pages
+@section TrkCompetingRIOsOnTrackTool_ExtrasTrkCompetingRIOsOnTrackTool Extra Pages
 
  - @ref UsedTrkCompetingRIOsOnTrackTool
  - @ref requirementsTrkCompetingRIOsOnTrackTool
@@ -31,10 +31,8 @@ This package contains the tools to create Trk::CompetingRIOsOnTrack. This includ
 
 /**
 @page UsedTrkCompetingRIOsOnTrackTool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkCompetingRIOsOnTrackTool Requirements
-@include requirements
 */
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/doc/mainpage.h b/Tracking/TrkTools/TrkMeasurementUpdator/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from Tracking/TrkTools/TrkMeasurementUpdator/doc/mainpage.h
rename to Tracking/TrkTools/TrkMeasurementUpdator/doc/packagedoc.h
index 463bb05d56475c6e96ea23949ac1c60464d3dd2e..94e4f2aef235c00d7f4f0d457f65dac0f45e6b9e
--- a/Tracking/TrkTools/TrkMeasurementUpdator/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage The TrkMeasurementUpdator package
+@page TrkMeasurementUpdator_page The TrkMeasurementUpdator package
 
-@section introductionTrkMeasurementUpdator Introduction
+@section TrkMeasurementUpdator_introductionTrkMeasurementUpdator Introduction
 
 The TrkMeasurementUpdator package implements the core mathematics
 for Kalman filter-based track fitters. It provides the calculations
@@ -18,7 +18,7 @@ operations are implemented:
    - operates on Trk::LocalParameters of any dimension (1-5) and definition
    - operates also on Trk::LocalPosition
 
-@section TrkMeasurementUpdatorOverview Class Overview
+@section TrkMeasurementUpdator_TrkMeasurementUpdatorOverview Class Overview
   The TrkMeasurementUpdator package contains the following classes:
 
   - Trk::KalmanUpdator : measurement updator in gain matrix formalism (internally using SMatrix)
@@ -28,11 +28,11 @@ operations are implemented:
 @author Sebastian Fleischmann <http://consult.cern.ch/xwho/people/630599><br>
         Wolfgang Liebig <http://consult.cern.ch/xwho/people/485812>
 
-@section TrkMeasurementUpdatorDocReferences References
+@section TrkMeasurementUpdator_TrkMeasurementUpdatorDocReferences References
 R. Fruehwirth, <i>Application of Kalman filtering</i>, NIM A262, 446<br>
 R. Fruehwirth, et al., <i>Data Analysis Techniques for High-Energy Physics</i>, 2nd ed.
 
-@section ExtrasTrkMeasurementUpdator Extra Pages
+@section TrkMeasurementUpdator_ExtrasTrkMeasurementUpdator Extra Pages
 
  - @ref UsedTrkMeasurementUpdator
  - @ref requirementsTrkMeasurementUpdator
@@ -40,11 +40,9 @@ R. Fruehwirth, et al., <i>Data Analysis Techniques for High-Energy Physics</i>,
 
 /**
 @page UsedTrkMeasurementUpdator Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkMeasurementUpdator Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator_xk/doc/mainpage.h b/Tracking/TrkTools/TrkMeasurementUpdator_xk/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from Tracking/TrkTools/TrkMeasurementUpdator_xk/doc/mainpage.h
rename to Tracking/TrkTools/TrkMeasurementUpdator_xk/doc/packagedoc.h
index 085af2d4c89cec6f70b8569b3057b3b6f8df7b05..6e3097b5fa46ca60d627abdf1582165c99452063
--- a/Tracking/TrkTools/TrkMeasurementUpdator_xk/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkMeasurementUpdator_xk/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 i/**
-@mainpage The TrkMeasurementUpdator_xk package
+@page TrkMeasurementUpdator_xk_page The TrkMeasurementUpdator_xk package
 
-@section introTrkMeasurementUpdatorXK Overview
+@section TrkMeasurementUpdator_xk_introTrkMeasurementUpdatorXK Overview
 
 The TrkMeasurementUpdator_xk package implements the core mathematics
 for Kalman filter-based track fitters. It provides the calculations
@@ -28,11 +28,11 @@ The code has been migrated from the xKalman package to this module.
 
 @author Igor Gavrilenko
 
-@section RefsTrkMeasurementUpdatorXK References
+@section TrkMeasurementUpdator_xk_RefsTrkMeasurementUpdatorXK References
 R. Fruehwirth, <i>Application of Kalman filtering</i>, NIM A262, 446<br>
 R. Fruehwirth, et al., <i>Data Analysis Techniques for High-Energy Physics</i>, 2nd ed.
 
-@section ExtrasTrkMeasurementUpdatorXK Extra Pages
+@section TrkMeasurementUpdator_xk_ExtrasTrkMeasurementUpdatorXK Extra Pages
 
  - @ref UsedTrkMeasurementUpdatorXK
  - @ref requirementsTrkMeasurementUpdatorXK
@@ -40,11 +40,9 @@ R. Fruehwirth, et al., <i>Data Analysis Techniques for High-Energy Physics</i>,
 
 /**
 @page UsedTrkMeasurementUpdatorXK Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkMeasurementUpdatorXK Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkTools/TrkParticleCreator/doc/mainpage.h b/Tracking/TrkTools/TrkParticleCreator/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 63%
rename from Tracking/TrkTools/TrkParticleCreator/doc/mainpage.h
rename to Tracking/TrkTools/TrkParticleCreator/doc/packagedoc.h
index fb67e1ffc4cf153eacf55357ab8961f5947b3f17..e6a78b622f3b00016de0a0388925f0e42495d1a0
--- a/Tracking/TrkTools/TrkParticleCreator/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkParticleCreator/doc/packagedoc.h
@@ -3,18 +3,16 @@
 */
 
 /**
-@mainpage TrkParticleCreator
+@page TrkParticleCreator_page TrkParticleCreator
 
 @author Andreas.Wildauer@cern.ch
 
-@section Introduction
+@section TrkParticleCreator_Introduction 
 This package contains the Trk::ParticleCreatorTool which is used (mainly) by the InDet::ParticleCreator of the
 package InDetParticleCreation to construct Rec::TrackParticle objects.
 
-@section UsedPackages
-@htmlinclude used_packages.html
+@section TrkParticleCreator_UsedPackages 
 
-@section Requirements
-@include requirements
+@section TrkParticleCreator_Requirements 
 
 */
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/doc/mainpage.h b/Tracking/TrkTools/TrkRIO_OnTrackCreator/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from Tracking/TrkTools/TrkRIO_OnTrackCreator/doc/mainpage.h
rename to Tracking/TrkTools/TrkRIO_OnTrackCreator/doc/packagedoc.h
index 8c1345b1d8628db8b9011dd7df632f8673e03c58..02d089e8e3cf3b0493cd96eaec9ea2b6c4a57387
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage
+@page TrkRIO_OnTrackCreator_page 
 
 @image html RIOonTrackCreatorLogo.png
 
-@section TrkRotCreatorDocIntro Introduction 
+@section TrkRIO_OnTrackCreator_TrkRotCreatorDocIntro Introduction
 
 The RIO_OnTrack Creator encapsulates detector specific calibrations done
 at the time of the track reconstruction. For precision detectors, calibrations
@@ -23,7 +23,7 @@ by offering a configurable way of including the differen calibrations,
 and modularity given by removing any dependence on subdetector code
 from the fitting methods. 
 
-@section TrkRotCreatorDocFromPrdToRot From <nop>PrepRawData to <nop>RIO_OnTrack 
+@section TrkRIO_OnTrackCreator_TrkRotCreatorDocFromPrdToRot From <nop>PrepRawData to <nop>RIO_OnTrack
 
 The ATLAS EDM distinguishes two types of objects describing measurement hits:
 Trk::PrepRawData and, further downstream in the reconstruction chain,
@@ -103,7 +103,7 @@ in  MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators
  
 
 
-@section TrkRotCreatorDocUsage Usage and jobOptions
+@section TrkRIO_OnTrackCreator_TrkRotCreatorDocUsage Usage and jobOptions
 Since this generic tool and the detector-specific dependants derive
 from the same interface, the steps to integrate ROT creators are common for
 both.<br>
@@ -157,7 +157,7 @@ to the central conditions DB.
 This tool is operation since ATLAS offline release 8.3.0.
  
 
-@section TrkRotCreatorDocDesign Design Issues
+@section TrkRIO_OnTrackCreator_TrkRotCreatorDocDesign Design Issues
     The technical idea behind the <nop>RIO_OnTrack creator tool is to have
     a central, configurable and modular tool to transform Trk::PrepRawData
     objects into Trk::RIO_OnTrack objects. The tool should be fully usable
@@ -191,7 +191,7 @@ This tool is operation since ATLAS offline release 8.3.0.
 @author
     Wolfgang Liebig http://consult.cern.ch/xwho/people/54608
 
-@section ExtrasTrkRotCreator Extra Pages
+@section TrkRIO_OnTrackCreator_ExtrasTrkRotCreator Extra Pages
 
  - @ref UsedTrkRotCreator
  - @ref RequirementsTrkRotCreator
@@ -199,10 +199,8 @@ This tool is operation since ATLAS offline release 8.3.0.
 
 /**
 @page UsedTrkRotCreator Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTrkRotCreator Requirements
-@include requirements
 */
diff --git a/Tracking/TrkTools/TrkResidualPullCalculator/doc/mainpage.h b/Tracking/TrkTools/TrkResidualPullCalculator/doc/packagedoc.h
similarity index 72%
rename from Tracking/TrkTools/TrkResidualPullCalculator/doc/mainpage.h
rename to Tracking/TrkTools/TrkResidualPullCalculator/doc/packagedoc.h
index 4c62f7eb8f2a6123e7da2337ac9c71896a263a22..d0eb80deddd4353e957bf5b6dc94b0dba451fb7c 100644
--- a/Tracking/TrkTools/TrkResidualPullCalculator/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkResidualPullCalculator/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-@mainpage The TrkResidualPullCalculator Package
+@page TrkResidualPullCalculator_page The TrkResidualPullCalculator Package
 
 
 @author Sebastian.Fleischmann -at- cern.ch, Wolfgang.Liebig -at- cern.ch
 
-@section TrkResidualPullCalculatorIntro Introduction
+@section TrkResidualPullCalculator_TrkResidualPullCalculatorIntro Introduction
 
   Tool for the calculation of residuals and pulls.
   Detector-specific specialities like the SCT endcap residuals are taken into
@@ -16,7 +16,7 @@
   See details with Trk::IResidualPullCalculator interface description
 
 */
-@section TrkResidualPullCalculatorExtras Extra Pages
+@section TrkResidualPullCalculator_TrkResidualPullCalculatorExtras Extra Pages
 
  - @ref TrkResidualPullCalculatorUsed
  - @ref TrkResidualPullCalculatorReqs
@@ -25,10 +25,8 @@
 
 /**
 @page TrkResidualPullCalculatorUsed Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page TrkResidualPullCalculatorReqs Requirements
-@include requirements
 */
diff --git a/Tracking/TrkTools/TrkSegmentConverter/doc/mainpage.h b/Tracking/TrkTools/TrkSegmentConverter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 73%
rename from Tracking/TrkTools/TrkSegmentConverter/doc/mainpage.h
rename to Tracking/TrkTools/TrkSegmentConverter/doc/packagedoc.h
index 904eb9dfb1b68c134ada9de70ad7cd3812c21322..2be27f3cf476a4def2a16664c3c9899b9d18aab2
--- a/Tracking/TrkTools/TrkSegmentConverter/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkSegmentConverter/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrkSegmentConverter Package
+@page TrkSegmentConverter_page TrkSegmentConverter Package
 
 >> Please enter an overview of the created package here: What does it contain?
 This package implements the SegmentConverter interface. It uses a TrackFitter to convert the Segments into full Tracks.
@@ -11,8 +11,7 @@ This package implements the SegmentConverter interface. It uses a TrackFitter to
 @author Christian Schmitt <Christian.Schmitt@cern.ch>
 
 
-@section TrkSegmentConverterReq Requirements
+@section TrkSegmentConverter_TrkSegmentConverterReq Requirements
 
-@include requirements
 
 */
diff --git a/Tracking/TrkTools/TrkToolInterfaces/doc/mainpage.h b/Tracking/TrkTools/TrkToolInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from Tracking/TrkTools/TrkToolInterfaces/doc/mainpage.h
rename to Tracking/TrkTools/TrkToolInterfaces/doc/packagedoc.h
index ded6157b5139c27b5b09953002c79718d7f9ff00..fecacaa2d0ac5ccf5c119126b5555885d8ecf451
--- a/Tracking/TrkTools/TrkToolInterfaces/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkToolInterfaces/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrkToolInterfaces Package
+@page TrkToolInterfaces_page TrkToolInterfaces Package
 
 This package contains abstract interfaces for common tracking tools,
 in particular those under the TrkTools container package.
@@ -14,7 +14,7 @@ instead of this package.
 
 @author Common Tracking Software Group
 
-@section TrkToolInterfacesList List of Defined Interfaces
+@section TrkToolInterfaces_TrkToolInterfacesList List of Defined Interfaces
 
 Abstract interfaces for the following tracking tasks are defined:
 
@@ -49,7 +49,7 @@ Abstract interfaces for the following tracking tasks are defined:
 
 This package is not built as any library, it is a simple include package.   
 
-@section ExtrasTrkToolInterfaces Extra Pages
+@section TrkToolInterfaces_ExtrasTrkToolInterfaces Extra Pages
 
  - @ref UsedTrkToolInterfaces
  - @ref requirementsTrkToolInterfaces
@@ -57,11 +57,9 @@ This package is not built as any library, it is a simple include package.
 
 /**
 @page UsedTrkToolInterfaces Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkToolInterfaces Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkTools/TrkTrackFieldIntegralTools/doc/mainpage.h b/Tracking/TrkTools/TrkTrackFieldIntegralTools/doc/packagedoc.h
similarity index 77%
rename from Tracking/TrkTools/TrkTrackFieldIntegralTools/doc/mainpage.h
rename to Tracking/TrkTools/TrkTrackFieldIntegralTools/doc/packagedoc.h
index 457e88a53aceba39f88f3a073130ccc9ee63a6d2..f0fdb1e24f28ded6b447cc840ee68bcd4cfea59a 100644
--- a/Tracking/TrkTools/TrkTrackFieldIntegralTools/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkTrackFieldIntegralTools/doc/packagedoc.h
@@ -6,10 +6,8 @@
 
  <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
 
-@mainpage
+@page TrkTrackFieldIntegralTools_page 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Tracking/TrkTools/TrkTrackSlimmingTool/doc/mainpage.h b/Tracking/TrkTools/TrkTrackSlimmingTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Tracking/TrkTools/TrkTrackSlimmingTool/doc/mainpage.h
rename to Tracking/TrkTools/TrkTrackSlimmingTool/doc/packagedoc.h
index 90eff5497dd1a5d04cc8dcb83cf7966855e4b00d..54400745f97ccbec4440f16e4cd6549ad4190991
--- a/Tracking/TrkTools/TrkTrackSlimmingTool/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkTrackSlimmingTool/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrkTrackSlimmingTool Package
+@page TrkTrackSlimmingTool_page TrkTrackSlimmingTool Package
 
 This package provides the tool to 'slim' a single Track, i.e. remove
 (possibly redundant) information from it in order to reduce its
@@ -29,7 +29,7 @@ storage.
 
 @author Edward Moyse <Edwar.Moysecern.ch>
 
-@section joboTrkTrackSlimmingTool Job Options for TrackSlimmingTool
+@section TrkTrackSlimmingTool_joboTrkTrackSlimmingTool Job Options for TrackSlimmingTool
 <DL>
   <DT>KeepOutliers
   <DD>If this is set to true, Outliers will be kept on the slimmed track.
@@ -38,7 +38,7 @@ storage.
   <DD>If this is set to true, the first and last parameters will be kept on the slimmed track. <i>Default: false</i>
 </DL>
 
-@section ExtrasTrkSlimmingTool Extra Pages
+@section TrkTrackSlimmingTool_ExtrasTrkSlimmingTool Extra Pages
 
  - @ref UsedTrkTrackSlimmingTool
  - @ref requirementsTrkTrackSlimmingTool
@@ -46,11 +46,9 @@ storage.
 
 /**
 @page UsedTrkTrackSlimmingTool Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkTrackSlimmingTool Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/doc/mainpage.h b/Tracking/TrkTools/TrkTrackSummaryTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 80%
rename from Tracking/TrkTools/TrkTrackSummaryTool/doc/mainpage.h
rename to Tracking/TrkTools/TrkTrackSummaryTool/doc/packagedoc.h
index 067d8df4a7c0d7997c44cda5d29ca544f1582e3b..27d3cbfa497dc103d156a7db571f419dd7a932e1
--- a/Tracking/TrkTools/TrkTrackSummaryTool/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkTrackSummaryTool/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage The TrkTrackSummaryTool  
+@page TrkTrackSummaryTool_page The TrkTrackSummaryTool
 
-@section introductionTrkTrackSummaryTool Overview
+@section TrkTrackSummaryTool_introductionTrkTrackSummaryTool Overview
 This AlgTool uses the InDet::InDetTrackSummaryHelperTool and/or MuonTrackSummaryHelperTool to create a Trk::TrackSummary object from the passed Trk::RIO_OnTrack. For it to work, at least one of these other tools must have been loaded into memory (i.e. the library must have been loaded by jobOptions). If TrkTrackSummaryTool cannot find either of its helper tools, then it will not initialise correctly, returning StatusCode::FAILURE.
 
 */
diff --git a/Tracking/TrkTools/TrkTruthToTrack/doc/mainpage.h b/Tracking/TrkTools/TrkTruthToTrack/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Tracking/TrkTools/TrkTruthToTrack/doc/mainpage.h
rename to Tracking/TrkTools/TrkTruthToTrack/doc/packagedoc.h
index f5ac79cd4e84facae487557fa7d60bfb69a06025..f6679bdbc086fc14d37532226e28b3cc56260153
--- a/Tracking/TrkTools/TrkTruthToTrack/doc/mainpage.h
+++ b/Tracking/TrkTools/TrkTruthToTrack/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage TrkTruthToTrack
+@page TrkTruthToTrack_page TrkTruthToTrack
 @author andrei.gaponenko@cern.ch
 
-@section TrkTruthToTrack_Intro Introduction
+@section TrkTruthToTrack_TrkTruthToTrack_Intro Introduction
 
 This package provied a way to create a Trk::TrackParameters object
 from a HepMC::GenParticle. This allows to use Trk::Extrapolator for
@@ -20,12 +20,10 @@ extrapolation of "true" track parameters.
 
 /**
 @page used_TrkTruthToTrack Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrkTruthToTrack Requirements
-@include requirements
 */
 
 
diff --git a/Tracking/TrkValidation/TrkValAlgs/doc/mainpage.h b/Tracking/TrkValidation/TrkValAlgs/doc/packagedoc.h
similarity index 88%
rename from Tracking/TrkValidation/TrkValAlgs/doc/mainpage.h
rename to Tracking/TrkValidation/TrkValAlgs/doc/packagedoc.h
index c405a74f518bdd7514fe1c6217988dbabb31e6fd..e0b0af0d4509de115ee7838fd7e082cd5a3e1a57 100644
--- a/Tracking/TrkValidation/TrkValAlgs/doc/mainpage.h
+++ b/Tracking/TrkValidation/TrkValAlgs/doc/packagedoc.h
@@ -3,23 +3,23 @@
 */
 
 /**
-@mainpage The TrkValAlgs package
+@page TrkValAlgs_page The TrkValAlgs package
 General validation algorithms for common tracking.
 
 @author Andreas.Salzburger@cern.ch, Sebastian.Fleischmann@cern.ch
 
-@section introductionTrkValAlgs Introduction
+@section TrkValAlgs_introductionTrkValAlgs Introduction
 
 This package contains algorithms to validate the common tracking. This includes an algorithm to fill validation ntuples with track data. The algorithm is based on the tools in the TrkValTools package, see the documentation of this package for more information about the ntuple variables, etc.
 
-@section TrkValAlgsOverview Class Overview
+@section TrkValAlgs_TrkValAlgsOverview Class Overview
   The TrkValAlgs package contains the following classes:
 
   - Trk::TrackValidationNtupleWriter : Alg for filling a validation ntuple with Trk::Track information using Trk::IValidationNtupleTool. It retrieves a track collection from StoreGate and loops over all contained tracks. 
   - Trk::SingleTrackDiffAlg : Alg for a simple track diff. The Trk::ITrackDiff tool is used to perform the comparison. This alg can be used
   for single track events, because only the first track of the reference collection will be compared with the best matching track of the comparison collection.
       
-@section HowToTrkValAlgs How to use the algorithms
+@section TrkValAlgs_HowToTrkValAlgs How to use the algorithms
 The Trk::TrackValidationNtupleWriter needs a configured instance of the Trk::BasicValidationNtupleTool. This tool can be configured by the Python setup class <tt>ConfiguredBasicValidationNtupleTool</tt> which is included in the TrkValTools package. An example can be found in the <tt><a href="TrkTrackValidationNtupleWriter_8py-source.html">TrkTrackValidationNtupleWriter.py</a></tt> jobOption fragment.
 
 @subsection TrackValidationNtupleWriterJobOptions jobOptions of the Trk::TrackValidationNtupleWriter
@@ -31,7 +31,7 @@ The Trk::TrackValidationNtupleWriter needs a configured instance of the Trk::Bas
   <DD>Tool and instance name of the Trk::IValidationNtupleTool. Default: <tt>Trk::BasicValidationNtupleTool/BasicValidationNtupleTool</tt>
 </DL>
 
-@section ExtrasTrkValAlgs Extra Pages
+@section TrkValAlgs_ExtrasTrkValAlgs Extra Pages
 
  - @ref UsedTrkValAlgs
  - @ref requirementsTrkValAlgs
@@ -39,11 +39,9 @@ The Trk::TrackValidationNtupleWriter needs a configured instance of the Trk::Bas
 
 /**
 @page UsedTrkValAlgs Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkValAlgs Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkValidation/TrkValEvent/doc/mainpage.h b/Tracking/TrkValidation/TrkValEvent/doc/packagedoc.h
similarity index 87%
rename from Tracking/TrkValidation/TrkValEvent/doc/mainpage.h
rename to Tracking/TrkValidation/TrkValEvent/doc/packagedoc.h
index a4ff8b2db552a334729389da6fb51ea60178a211..44aadfbfa9695f45362122db7b9081731a87af21 100644
--- a/Tracking/TrkValidation/TrkValEvent/doc/mainpage.h
+++ b/Tracking/TrkValidation/TrkValEvent/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The TrkValEvent package
+@page TrkValEvent_page The TrkValEvent package
 
 This package is part of the software for checking
 and validating the tracking algorithms. It hosts data classes which
@@ -18,7 +18,7 @@ this package.
 
 @author <a href="http://consult.cern.ch/xwho/people/485812">Wolfgang Liebig</a>
 
-@section OverviewTrkValEventw Class Overview
+@section TrkValEvent_OverviewTrkValEventw Class Overview
   The TrkValEvent package contains:
 
   - classes describing track-based jets: Trk::GenParticleJet and Trk::TrackJet.
@@ -29,7 +29,7 @@ this package.
 
 The package follows the installed_library pattern.
       
-@section ExtrasTrkValEvent Extra Pages
+@section TrkValEvent_ExtrasTrkValEvent Extra Pages
 
  - @ref UsedTrkValEvent
  - @ref requirementsTrkValEvent
@@ -37,11 +37,9 @@ The package follows the installed_library pattern.
 
 /**
 @page UsedTrkValEvent Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkValEvent Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkValidation/TrkValInterfaces/doc/mainpage.h b/Tracking/TrkValidation/TrkValInterfaces/doc/packagedoc.h
similarity index 76%
rename from Tracking/TrkValidation/TrkValInterfaces/doc/mainpage.h
rename to Tracking/TrkValidation/TrkValInterfaces/doc/packagedoc.h
index c60cd271c74a54e82c8e0240dd68234d2f1b55fa..83e29ae5857015785116d0a3e0c0eefb3ad9c969 100644
--- a/Tracking/TrkValidation/TrkValInterfaces/doc/mainpage.h
+++ b/Tracking/TrkValidation/TrkValInterfaces/doc/packagedoc.h
@@ -3,23 +3,23 @@
 */
 
 /**
-@mainpage The TrkValInterfaces package
+@page TrkValInterfaces_page The TrkValInterfaces package
 Interfaces for common tracking validation tools.
 
 @author Andreas.Salzburger@cern.ch, Sebastian.Fleischmann@cern.ch
 
-@section introductionTrkValInterfaces Introduction
+@section TrkValInterfaces_introductionTrkValInterfaces Introduction
 
 This package contains the interfaces for common tracking validation tools.
 
-@section TrkValInterfacesOverview Class Overview
+@section TrkValInterfaces_TrkValInterfacesOverview Class Overview
   The TrkValInterfaces package contains the following classes:
 
   - Trk::IValidationNtupleTool : Interface for main validation ntuple tools which steer Trk::IValidationNtupleHelperTool.
   - Trk::IValidationNtupleHelperTool : Interface for helper tools which add special data to the validation ntuple.
   - Trk::ITrackDiff : Interface for track diff tools.
       
-@section ExtrasTrkValInterfaces Extra Pages
+@section TrkValInterfaces_ExtrasTrkValInterfaces Extra Pages
 
  - @ref UsedTrkValInterfaces
  - @ref requirementsTrkValInterfaces
@@ -27,11 +27,9 @@ This package contains the interfaces for common tracking validation tools.
 
 /**
 @page UsedTrkValInterfaces Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkValInterfaces Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkValidation/TrkValTools/doc/mainpage.h b/Tracking/TrkValidation/TrkValTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 98%
rename from Tracking/TrkValidation/TrkValTools/doc/mainpage.h
rename to Tracking/TrkValidation/TrkValTools/doc/packagedoc.h
index aac4561d69fe2fa0a28d59a6618776bf524f789b..fbc6b40eeab3d1ec2d1e5d0a324ce241b43399c5
--- a/Tracking/TrkValidation/TrkValTools/doc/mainpage.h
+++ b/Tracking/TrkValidation/TrkValTools/doc/packagedoc.h
@@ -4,12 +4,12 @@
 
 /**
 
-@mainpage The TrkValTools package
+@page TrkValTools_page The TrkValTools package
 General validation tools for common tracking.
 
 @author Andreas.Salzburger -at- cern.ch, Sebastian.Fleischmann -at- cern.ch, Wolfgang.Liebig -at- cern.ch
 
-@section introductionTrkValTools Introduction
+@section TrkValTools_introductionTrkValTools Introduction
 
 This package contains tools to validate track reconstruction on a common Inner Detector -
 Muons code basis. It includes tools to fill validation ntuples e.g. with track data.
@@ -25,7 +25,7 @@ in the InnerDetector to check the performance of track fitters "by hand".
 surface, providing a general tool to validate the measurement error calibration
 and material effect corrections.
 
-@section valNtupleSchemeTrkValTools Validation ntuple scheme
+@section TrkValTools_valNtupleSchemeTrkValTools Validation ntuple scheme
 The main steering of the ntuple entries is performed by the Trk::BasicValidationNtupleTool, which can book the ntuple, create the tree directory and add basic entries. This tool is also able to write the current record to the ntuple file and start a new entry. One can also use an existing ntuple tree (which has to have the same track-wise structure) and just use the Trk::BasicValidationNtupleTool to add some ntuple variables.
 
 Every entry (track) contains the event number, a track id (numbering the tracks within one event) and an optional iteration index, which can be used if different intermediate results of a track are produced in the refit procedure (see Trk::DeterministicAnnealingFilter for an example). The track id is the same for all tracks generated within one iteration process and reset to 0 every time a new event is started. Perigee parameters and @f$ \chi^2 @f$ are filled for every track if available.
@@ -38,7 +38,7 @@ Each detector-specific helper tool list may contain several tools and some tools
 
 @image html ValidationNtupleToolScheme.png
 
-@section TrkValToolsOverview Class Overview
+@section TrkValTools_TrkValToolsOverview Class Overview
 The TrkValTools package contains the following classes:
 
  - Trk::DirectTrackNtupleWriterTool : Tool to write an ntuple record about a track on the fly to a tree, using the same set of Trk::IValidationNtupleHelperTool s like the Trk::TrackValidationNtupleWriter has.
@@ -75,7 +75,7 @@ The TrkValTools package contains the following classes:
         track). Differences in the Trk::TrackStateOnSurface are listed in the
         messages and a summary for each track is written to a ntuple.
 
-@section HowToTrkValTools How to use the tools
+@section TrkValTools_HowToTrkValTools How to use the tools
 The most convenient way to use the validation ntuple tools is to run the Trk::TrackValidationNtupleWriter algorithm from the TrkValAlgs package, which retrieves a track collection from StoreGate and loops over all contained tracks. It needs a configured instance of the Trk::BasicValidationNtupleTool.
 
 You can also run the Trk::BasicValidationNtupleTool directly by calling it from your own algorithm or tool to write data of complete tracks or add data of measurements successively. An example for this use case is the Trk::DeterministicAnnealingFilter.
@@ -183,7 +183,7 @@ e</tt>. Default: <tt>Validation</tt>
   <DD>Shall data about Trk::TrkCompetingRIOsOnTrack be written?  Default: <tt>False</tt>
 </DL>
 
-@section WhichVariablesTrkValTools List of the Ntuple variables
+@section TrkValTools_WhichVariablesTrkValTools List of the Ntuple variables
 This paragraph gives a short overview of the ntuple variables provided by the different tools
 @subsection BasicValidationNtupleToolVariables Ntuple variables of the Trk::BasicValidationNtupleTool
 <table>
@@ -302,7 +302,7 @@ All entries are zero for an index, if the measurement was not a Trk::CompetingRI
 All numbers contain just the Trk::TrackStateOnSurface which have the types selected
 in the jobOptions, i.e. in the standard configuration only Measurements and Outliers.
 
-@section TrackPlotterTrkValTools TrackPlotter
+@section TrkValTools_TrackPlotterTrkValTools TrackPlotter
 Stand-alone ROOT application to plot tracks. The code can be found in the subdirectory
 <tt>root/TrackPlotter</tt> of this package; it has to be compiled separately (see below).
 This application runs on the ValidationNtuple written by the
@@ -335,7 +335,7 @@ fill the RIO data into the ntuple.
 @image html TrackPlotterInDetXY.png
 @image html TrackPlotterInDetLarge.png
 
-@section ExtrasTrkValTools Extra Pages
+@section TrkValTools_ExtrasTrkValTools Extra Pages
 
  - @ref UsedTrkValTools
  - @ref requirementsTrkValTools
@@ -343,11 +343,9 @@ fill the RIO data into the ntuple.
 
 /**
 @page UsedTrkValTools Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkValTools Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/doc/mainpage.h b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 68%
rename from Tracking/TrkValidation/TrkVertexFitterValidationUtils/doc/mainpage.h
rename to Tracking/TrkValidation/TrkVertexFitterValidationUtils/doc/packagedoc.h
index 373f94a4222a5d3aea8b71076554ed06ee998d61..0e932622536d37724962649f32ba3969e4d7c199
--- a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/doc/mainpage.h
+++ b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage TrkVertexFitterValidationUtils Package
+@page TrkVertexFitterValidationUtils_page TrkVertexFitterValidationUtils Package
 
 @author Kirill.Prokofiev@cern.ch
 
-\section introTrkVertexFitterValidationUtils Introduction
+@section TrkVertexFitterValidationUtils_introTrkVertexFitterValidationUtils Introduction
 This package is designed to contain a set of helper 
 utils suitable for the estimation of efficiency of   
 primary vertex reconstruction.
-\section designTrkVertexFitterValidationUtils Design
+@section TrkVertexFitterValidationUtils_designTrkVertexFitterValidationUtils Design
 
 <b><i>Trk::TrkPriVxPurity </i></b> 
 A storage object designed
@@ -26,8 +26,6 @@ number of correct tracks and their weights, number of
 pileup tracks and their weight etc.. The outlyer tracks are 
 defined as those coming from vertexes in the configurable region
 around  a primary collision in Monte Carlo.
-\section requirementsTrkVertexFitterValidationUtils Requirements
-@htmlinclude used_packages.html
-@include requirements
+@section TrkVertexFitterValidationUtils_requirementsTrkVertexFitterValidationUtils Requirements
 
 */
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkJetVxFitter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from Tracking/TrkVertexFitter/TrkJetVxFitter/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkJetVxFitter/doc/packagedoc.h
index ff4256dfc56bdf0f5091a6761f28bab7465e6b7b..14901967175b22471c8d7f0e8aeadb7596ec6422
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage  TrkJetVxFitter
+@page TrkJetVxFitter_page TrkJetVxFitter
  
 @author Nicola.Giacinto.Piacquadio@cern.ch
  
-\section introTrkVertexFitterUtils Introduction
+@section TrkJetVxFitter_introTrkVertexFitterUtils Introduction
 This package contains a new fitter application, which we 
 called JetFitter, which permits to do a multi-vertex fit, 
 where all the vertices are constrained to lie on a single  
@@ -27,7 +27,7 @@ coming from the D-hadron. A clustering procedure is following.
 For more information please give a look at the documentation 
 of the JetFitter finder in the <i>InDetSecVxFinderTool</i> package.
 
-\section designTrkJetVxFitter Design 
+@section TrkJetVxFitter_designTrkJetVxFitter Design
 
 <b><i>Trk::JetFitterRoutines</i></b> This class contains the 
 core functions for the "JetFitter" algorithm.
@@ -86,7 +86,5 @@ the vertex.
 For additional information or in case 
 of problems please contact the authors...
 
-@htmlinclude used_packages.html
-@include requirements
 
 */
diff --git a/Tracking/TrkVertexFitter/TrkV0Fitter/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkV0Fitter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 68%
rename from Tracking/TrkVertexFitter/TrkV0Fitter/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkV0Fitter/doc/packagedoc.h
index 67e60e5145680badebd6630c048887a06e046f51..a85ffe997852e44e55154a43f4053894e39b58ca
--- a/Tracking/TrkVertexFitter/TrkV0Fitter/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkV0Fitter/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-\mainpage The TrkV0FitterInterfaces package
+@page TrkV0Fitter_page The TrkV0FitterInterfaces package
 
 @author Evelina.Bouhova@cern.ch
 
-\section introductionTrkV0Fitter Introduction
+@section TrkV0Fitter_introductionTrkV0Fitter Introduction
 
 This class implements a vertex fitting algorithm optimised for V0 finding.
 The algorithm fits the full track information, incorporating the
@@ -15,11 +15,9 @@ possibility of performing full kinematic constraints at the same time.
 The full covariance matrix from the fit, including track-track and track-vertex
 correlations is calculated and returned via Trk::ExtendedVxCandidate
 
-\section designTrkV0Fitter Design
+@section TrkV0Fitter_designTrkV0Fitter Design
 
-\section requirementsTrkV0Fitter  Requirements
+@section TrkV0Fitter_requirementsTrkV0Fitter Requirements
 
-@htmlinclude used_packages.html
-@include requirements
 
 */
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtCore/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkVKalVrtCore/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from Tracking/TrkVertexFitter/TrkVKalVrtCore/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkVKalVrtCore/doc/packagedoc.h
index 2525751d8d1e91eaec395bafb79d1f43a8b56c61..a2b8ca4ab02b8a9ff67648fbcec6a5815b223c2f
--- a/Tracking/TrkVertexFitter/TrkVKalVrtCore/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtCore/doc/packagedoc.h
@@ -4,20 +4,20 @@
 
 
 /**
-@mainpage TrkVKalVrtCore Package
+@page TrkVKalVrtCore_page TrkVKalVrtCore Package
 
 Vertex fitting engine and some service routines of VKalVrt. 
 
 @author Vadim.Kostyukhin@cern.ch
 
-@section TrkVKalVrtCoreIntro Introduction
+@section TrkVKalVrtCore_TrkVKalVrtCoreIntro Introduction
 
 This package contains vertex fitting engine and some service routines
 of VKalVrt. Package is independent on ATLAS software and on any external library.
 External magnetic field and propagator may be plugged in. 
 Neutral and charged tracks may be mixed together. 
 
-@section TrkVKalVrtCoreOverview Class Overview
+@section TrkVKalVrtCore_TrkVKalVrtCoreOverview Class Overview
 
 
    Package does vertex fitting with constraints. Tracks are transported to 
@@ -36,11 +36,9 @@ Neutral and charged tracks may be mixed together.
 
 /**
 @page used_TrkVKalVrtCore Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrkVKalVrtCore Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 77%
rename from Tracking/TrkVertexFitter/TrkVKalVrtFitter/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkVKalVrtFitter/doc/packagedoc.h
index 38125be2498fca7a8190749e2c87fab4ee1677ea..e9e9ee917f42c331cc1760ef35fa4442e683490b
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 
 /**
-@mainpage TrkVKalVrtFitter Package
+@page TrkVKalVrtFitter_page TrkVKalVrtFitter Package
 
 Collection of interfaces to VKalVrt core. 
 
 @author Vadim.Kostyukhin@cern.ch
 
-@section TrkVKalVrtFitterIntro Introduction
+@section TrkVKalVrtFitter_TrkVKalVrtFitterIntro Introduction
 
 This package contains ATHENA interfaces to VKalVrt. 
 
-@section TrkVKalVrtFitterOverview Class Overview
+@section TrkVKalVrtFitter_TrkVKalVrtFitterOverview Class Overview
 
   
  Some description of algorithms may be found in http://kostyuk.home.cern.ch/kostyuk/vertex/ and
@@ -30,11 +30,9 @@ This package contains ATHENA interfaces to VKalVrt.
 
 /**
 @page used_TrkVKalVrtFitter Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrkVKalVrtFitter Requirements
-@include requirements
 */
 
diff --git a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/doc/packagedoc.h
index 52fd0a5f9b2f033544036170d4d17094a301c725..40572ee23a60c5410f41e2d98cde90f862afe205
--- a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-\mainpage The TrkVertexAnalysisUtilsInterfaces package
+@page TrkVertexAnalysisUtils_page The TrkVertexAnalysisUtilsInterfaces package
 
 @author Evelina.Bouhova@cern.ch
 
-\section introductionTrkVertexAnalysisUtils Introduction
+@section TrkVertexAnalysisUtils_introductionTrkVertexAnalysisUtils Introduction
 
 This package contains methods to calculate a number of properties of the vertices returned by the TrkV0Fitter.
 
-\section designTrkVertexAnalysisUtils Design
+@section TrkVertexAnalysisUtils_designTrkVertexAnalysisUtils Design
 <br>
 <b></i>V0Tools</i></b>
 Methods specific to V0 reconstructed objects. V0 vertices contain two tracks, the first of which is always the positive one.
@@ -47,9 +47,7 @@ Trk::RecVertex, Trk::Vertex and CLHEP::Hep3Vector
 
 <br><br>
 
-\section requirementsTrkVertexAnalysisUtils  Requirements
+@section TrkVertexAnalysisUtils_requirementsTrkVertexAnalysisUtils Requirements
 
-@htmlinclude used_packages.html
-@include requirements
 
 */
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from Tracking/TrkVertexFitter/TrkVertexBilloirTools/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkVertexBilloirTools/doc/packagedoc.h
index f9343defaa427b37f9755bebb0d80e89cece0d8c..3cd9534e6b1f398e0d518b509ec59f2dfd9ef640
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-\mainpage trkVertexBilloirTools
+@page TrkVertexBilloirTools_page trkVertexBilloirTools
 
-\section introduction Introduction:
+@section TrkVertexBilloirTools_introduction Introduction:
 TrkVertexBilloirTools is a package which provides basic vertex fitting algorithms based on the Billoir fitting
 method.<br>
 
@@ -17,7 +17,7 @@ Using the general parametrisation of the helix above we can parametrise the traj
 
 The Billoir vertex fitter requires an a priori selection of tracks. This selection of tracks is the task of a vertex finding algorithm. The next important point is to choose the starting point. In case of primary vertex this point is surely the interaction point, but for secondary tracks one has to make an educated guess of the vertex position before fitting. Therefore the fitting procedure is iteratively executed. By default the starting point is set to (0,0,0) and the vertex point will be calculated. If another starting point has been chosen, then the origin of the local coordinate system will be shifted to the chosen starting point. In the next iteration the calculated vertex point is taken as the starting point and the new vertex point is calculated and so on. <br>
 
-\section howitworks How it works:
+@section TrkVertexBilloirTools_howitworks How it works:
 Two billoir fitting methods (so called FastVertexFitter and FullVertexFitter) are implemented as Athena AlgTools. The user
 can retrieve the tool(s) from the ToolSvc during runtime and use them to fit a vertex. The basic usage
 is to provide it with some Trk::Track(s) plus a start vertex (and optionally a beam constraint) and call
@@ -27,16 +27,14 @@ can be accessed via the pointer to the tool (which was also used to call its cal
 Be aware that neither tool rights anything to StoreGate.<br>
 A very good usecase can be found in: InnerDetector/InDetRecAlgs/InDetPriVxFinder.
 
-\section packagecontent Package Contents:
+@section TrkVertexBilloirTools_packagecontent Package Contents:
 VxBilloirTools contains the following files/classes:
 - FastVertexFitter.cxx ... the fast version. Calculates only the vertex position. Track parameters are untouched.
 - FullVertexFitter.cxx ... the slower version. Calculates both: vertex position and track parameters.
 
-\section used_packagesInDetPriVxFinder used packages
-@htmlinclude used_packages.html
+@section TrkVertexBilloirTools_used_packagesInDetPriVxFinder used packages
 
-\section requirements Requirements
-@include requirements
+@section TrkVertexBilloirTools_requirements Requirements
 
 \namespace Trk
 A namespace for all vertexing packages and related stuff.
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterInterfaces/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkVertexFitterInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Tracking/TrkVertexFitter/TrkVertexFitterInterfaces/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkVertexFitterInterfaces/doc/packagedoc.h
index 0b7595bbf66e1ff2037e98d55e843dc09a851446..b5227bf566c6ed533539d33c7a5ad833ea68af5c
--- a/Tracking/TrkVertexFitter/TrkVertexFitterInterfaces/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterInterfaces/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 
 /**
-\mainpage The TrkVertexFitterInterfaces package
+@page TrkVertexFitterInterfaces_page The TrkVertexFitterInterfaces package
 
 @author Kirill.Prokofiev@cern.ch
 
-\section introductionTrkVertexFitterInterfaces Introduction
+@section TrkVertexFitterInterfaces_introductionTrkVertexFitterInterfaces Introduction
 
 This package  contains abstract interfaces for the ATLAS 
 vertex fitters and related classes, such as VertexUpdators, 
@@ -19,7 +19,7 @@ The design is supposed to handle both iterative(Kalman filter-based)
 and global(global chi2-based) vertex fitters. The extensions of this
 interface are also used for a constraint fits (see V0). 
 
-\section designTrkVertexFitterInterfaces  Design
+@section TrkVertexFitterInterfaces_designTrkVertexFitterInterfaces Design
 The design of the base classes is the following:
 <br>
 <b><i>Trk::IVertexFitter</i></b>
@@ -69,9 +69,7 @@ Interface for kinematic vertex-fitting.
 <b><i>Trk::IKinematicConstraint</i></b>
 Abstract class used for implementing constraint-equations used
 by the kinematic vertex-fitting methods.
-\section requirementsTrkVertexFitterInterfaces  Requirements
+@section TrkVertexFitterInterfaces_requirementsTrkVertexFitterInterfaces Requirements
 
-@htmlinclude used_packages.html
-@include requirements
 
 */
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from Tracking/TrkVertexFitter/TrkVertexFitterUtils/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkVertexFitterUtils/doc/packagedoc.h
index 3e3a94e7d14cfbb2a02120efc0f3919657914d16..a8a1fc31d2b2ae0d3b98bf0b943e812617c7d7d2
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage  TrkVertexFitterUtils
+@page TrkVertexFitterUtils_page TrkVertexFitterUtils
 
 @author Kirill.Prokofiev@cern.ch
-\section introTrkVertexFitterUtils Introduction
+@section TrkVertexFitterUtils_introTrkVertexFitterUtils Introduction
 This package contains a set of tools required for
 various vertex fitting applications. Most of theses
 tools are descendants of abstract interfaces defined
@@ -16,7 +16,7 @@ separately from each other. For a brief description of
 tools see below. For examples of use of these utils
 see <i>TrkVertexFitters</i> package.
 
-\section designTrkVertexFitterUtls Design 
+@section TrkVertexFitterUtils_designTrkVertexFitterUtls Design
 <b><i>Trk::Chi2TrackCompatibilityEstimator</i></b> A concrete 
 implementation of Trk::IVertexTrackCompatibilityEstimator.
 Estimates the compatibility a track to a vertex candidate
@@ -60,7 +60,5 @@ a Trk::IVertexUpdator. A Kalman updator for vertexing. Adds or removes
 a single track to the vertex candidate, calculates the new position and 
 covariance matrix of  the vertex.
 
-@htmlinclude used_packages.html
-@include requirements
 
 */
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkVertexFitters/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 97%
rename from Tracking/TrkVertexFitter/TrkVertexFitters/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkVertexFitters/doc/packagedoc.h
index c55828a126ea5b3a45753a2c6a14702054249621..1387f58f0e079046a210b8d85a25d2ce0df43926
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage  TrkVertexFitters
+@page TrkVertexFitters_page TrkVertexFitters
 
 @author Nicola.Giacinto.Piacquadio@cern.ch
 
-\section introTrkVertexFitters Introduction
+@section TrkVertexFitters_introTrkVertexFitters Introduction
 This package contains the Vertex Fitters in the 
 form of Athena AlgoTools, which are needed for 
 vertex finding applications. The input is typically 
@@ -17,7 +17,7 @@ the fitted vertex.
 For a description of the finders which uses these tools, 
 please give a look at the <i>InDetPriVxFinderTool</i> package.
 
-\section designTrkVertexFitters Design 
+@section TrkVertexFitters_designTrkVertexFitters Design
 
 <li><b><i>Trk::SequentialVertexFitter</i></b></li>
 
@@ -127,7 +127,5 @@ them with the knowledge of the reconstructed vertex
 position. Can be used with any VertexTrackUpdator.
 The default is KalmanVertexTrackUpdator
 
-@htmlinclude used_packages.html
-@include requirements
 
 */
diff --git a/Tracking/TrkVertexFitter/TrkVertexKinematicFitterUtils/doc/mainpage.h b/Tracking/TrkVertexFitter/TrkVertexKinematicFitterUtils/doc/packagedoc.h
similarity index 81%
rename from Tracking/TrkVertexFitter/TrkVertexKinematicFitterUtils/doc/mainpage.h
rename to Tracking/TrkVertexFitter/TrkVertexKinematicFitterUtils/doc/packagedoc.h
index 9e784248afc859cda3546739c589cf6873726bf1..05a67a8261508ee6c8d1bb49c775a2a58595e468 100644
--- a/Tracking/TrkVertexFitter/TrkVertexKinematicFitterUtils/doc/mainpage.h
+++ b/Tracking/TrkVertexFitter/TrkVertexKinematicFitterUtils/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage The TrkKinematicVertexFitterUtils package
+@page TrkVertexKinematicFitterUtils_page The TrkKinematicVertexFitterUtils package
 
 TrkKinematicVertexFitterUtils provides classes for constraints in vertex reconstruction.
 &nbsp;
@@ -14,7 +14,7 @@ Each constraint class calculates a vector of values and a matrix of derivatives
 of the corresponding constraint equation at the expansion point provided by
 the user.
 
-@section OverviewTrkKinUtils Class Overview
+@section TrkVertexKinematicFitterUtils_OverviewTrkKinUtils Class Overview
   The TrkVertexKinematicFitterUtils package contains:
 
   - Trk::MassConstraint - formulates the mass constraint in kinematic vertex fitting
@@ -25,7 +25,7 @@ of the athena components, therefore the package follows the installed_library pa
 
 @author <a href="http://cern.ch/xwho">Maaike Limper</a>
 
-@section ExtrasTrkKinUtils Extra Pages
+@section TrkVertexKinematicFitterUtils_ExtrasTrkKinUtils Extra Pages
 
  - @ref UsedTrkKinUtils
  - @ref requirementsTrkKinUtils
@@ -33,10 +33,8 @@ of the athena components, therefore the package follows the installed_library pa
 
 /**
 @page UsedTrkKinUtils Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirementsTrkKinUtils Requirements
-@include requirements
 */
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigCaloRec/doc/packagedoc.h
similarity index 74%
rename from Trigger/TrigAlgorithms/TrigCaloRec/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigCaloRec/doc/packagedoc.h
index 730e54f3114424cba45a718bcc70a83b03db01da..51aacb9edf1033961593f06ad0930fbbc4e43360 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage
+@page TrigCaloRec_page 
 @author Cibran Santamarina
 
-@section MyPackageOverview  Overview
+@section TrigCaloRec_MyPackageOverview Overview
 This package contains the Calorimeter EF data unpacking and Tower and Cluster reconstruction
 
 
diff --git a/Trigger/TrigAlgorithms/TrigEFLongLivedParticles/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigEFLongLivedParticles/doc/packagedoc.h
similarity index 84%
rename from Trigger/TrigAlgorithms/TrigEFLongLivedParticles/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigEFLongLivedParticles/doc/packagedoc.h
index 8fdf422f60199c11c1b2102f43dc6e8c5a8a20e5..4c90e73abf2011ebd87ccfb099da24edbd690f72 100644
--- a/Trigger/TrigAlgorithms/TrigEFLongLivedParticles/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigEFLongLivedParticles/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage
+@page TrigEFLongLivedParticles_page 
 @author Antonio Policicchio
 
-@section TrigEFLongLivedParticlesOverview Overview 
+@section TrigEFLongLivedParticles_TrigEFLongLivedParticlesOverview Overview
 This package contains EF Fex algorithm for Long-Lived 
 neutral particle triggers: TrigLoFRemoval.
 The TrigLoFRemoval is accessing the EF jet collection and the cal cell container.
@@ -22,10 +22,8 @@ algorithm TrigLongLivedParticlesHypo/LoFRemovalHypo.h
 
 /**
 @page used_TrigEFLongLivedParticles Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigEFLongLivedParticles Requirements
-@include requirements
 */
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigEFMissingET/doc/packagedoc.h
similarity index 94%
rename from Trigger/TrigAlgorithms/TrigEFMissingET/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigEFMissingET/doc/packagedoc.h
index 90e61c008069d75be5f03ba1f5a1a18bb91862a0..bd3af7b51766f56d7009ffa4b1e69394ed4b525d 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrigEFMissingET Package
+@page TrigEFMissingET_page TrigEFMissingET Package
 
 The TrigEFMissingET package implements the missing energy and scalar 
 energy sums feature extraction (Fex) algorithms for the EF level ATLAS
@@ -20,7 +20,7 @@ note.
          Xiaowen Lei  <xiaowen@physics.arizona.edu>
          Allen Mincer <allen.mincer@nyu.edu>
 
-@section TrigEFMissingETIntro Introduction
+@section TrigEFMissingET_TrigEFMissingETIntro Introduction
 
 The package provides Event Filter level MissingET algorithms.
 It returns the following, stored in the TrigMissingET class
@@ -48,7 +48,7 @@ which case the muon tool uses EF level muons to correct returned
 values.  Muon values are also separately included as one of the
 "layers" in the component class. 
 
-@section TrigEFMissingETOverview Class Overview
+@section TrigEFMissingET_TrigEFMissingETOverview Class Overview
 
 The TrigEFMissingET package contains of following classes:
 
@@ -65,7 +65,7 @@ The TrigEFMissingET package contains of following classes:
   - EFMissingETFlags.cxx : Does several checks on information accumulated
     in the transient class and sets event status flags.
 
-@section TrigEFMissingETTools Tools for Calculating Missing Et
+@section TrigEFMissingET_TrigEFMissingETTools Tools for Calculating Missing Et
 
   - EFMissingETBaseTool.cxx : Base class from which the derived tools 
     inherit. It provides all shared attributes, in addition to the 
@@ -98,7 +98,7 @@ The TrigEFMissingET package contains of following classes:
     of positive energy cells minus number of negative energy cells in a
     layer.
 
-@section TrigEFMissingETAlgorithm Algorithm properties
+@section TrigEFMissingET_TrigEFMissingETAlgorithm Algorithm properties
 
 The following algorithm properties can be set via athena.  See
 Trigger/TrigAlgorithms/TrigEFMissingET/trunk/python/TrigEFMissingETConfig.py
@@ -129,10 +129,8 @@ EFMissingETFromFEBHeader::EFMissingETFromFEBHeader
 
 /**
 @page used_TrigEFMissingET Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigEFMissingET Requirements
-@include requirements
 */
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigEgammaRec/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Trigger/TrigAlgorithms/TrigEgammaRec/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigEgammaRec/doc/packagedoc.h
index 9499bb5f74003c067f1e7a1d71fa60c68d544ffc..1d93ac87731d63e7cd2b16fb673a8dd57361b3e4
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/doc/packagedoc.h
@@ -5,13 +5,12 @@
 
 /**
 
-@mainpage
+@page TrigEgammaRec_page 
 @author P. Urquijo
 
-@section MyPackageOverview  Overview
+@section TrigEgammaRec_MyPackageOverview Overview
 This package contains the Event Filter reconstruction trigger algorithms for the Electron and Photon slices.   Algorithms are adaptations of the offline/Reconstruction/egammaRec/egammaBuilder.cxx
 
-@htmlinclude used_packages.html
 
 
 */
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/doc/packagedoc.h
similarity index 80%
rename from Trigger/TrigAlgorithms/TrigGenericAlgs/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigGenericAlgs/doc/packagedoc.h
index 580a0867db60e95486aa96eca8c248d916431490..a840b9839784db92fe29f6a649253f202a9dd615 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/doc/packagedoc.h
@@ -5,9 +5,9 @@
 /**
 
 
-@mainpage TrigGenericAlgs Package
+@page TrigGenericAlgs_page TrigGenericAlgs Package
 
-@section TrigGenericAlgsIntro Introduction
+@section TrigGenericAlgs_TrigGenericAlgsIntro Introduction
 
 This package contains some algorithms which are detector/slice
 independent or are plceholders to overcome steering contraints/limitations.
@@ -18,7 +18,6 @@ Pcakage contains:
  - DummyUnseededAllTEAlgo : used sometimes to make seeding fro nomale fexes
  - OverlapRemoval : for removing RoIs overlaps
 
-@htmlinclude used_packages.html 
 
 
 */
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/doc/packagedoc.h
similarity index 91%
rename from Trigger/TrigAlgorithms/TrigL2LongLivedParticles/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigL2LongLivedParticles/doc/packagedoc.h
index 31a31621badf2734b365aa41ae6f44b9fc9712c7..17559a9fc87b840b84c99196ae4587a7cd050234 100644
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage
+@page TrigL2LongLivedParticles_page 
 @author Stefano Giagu, Antonio Policicchio
 
-@section TrigL2LongLivedParticlesOverview Overview 
+@section TrigL2LongLivedParticles_TrigL2LongLivedParticlesOverview Overview
 This package contains LVL2 Fex algorithms for Long-Lived 
 neutral particle triggers: MuonCluster and  TrigMuonJetFex.
 The MuonCluster AllTE algorithm is consisting of a muon ROI cluster 
@@ -33,10 +33,8 @@ around the jet direction. No feature is written for this algorithm.
 
 /**
 @page used_TrigL2LongLivedParticles Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigL2LongLivedParticles Requirements
-@include requirements
 */
diff --git a/Trigger/TrigAlgorithms/TrigL2MissingET/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigL2MissingET/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Trigger/TrigAlgorithms/TrigL2MissingET/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigL2MissingET/doc/packagedoc.h
index 9fd54b785bb3b8d301478130d30b2ceae40b0353..b149d0ee8ef964ca9ff65511a3e40dd331f62d83
--- a/Trigger/TrigAlgorithms/TrigL2MissingET/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigL2MissingET/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrigL2MissingET Package
+@page TrigL2MissingET_page TrigL2MissingET Package
 
 
 The TrigL2MissingET package implements the missing energy and scalar
@@ -18,7 +18,7 @@ twiki page.
          Xiaowen Lei  <xiaowen@physics.arizona.edu>
          Allen Mincer <allen.mincer@nyu.edu>
 
-@section TrigL2MissingETIntro Introduction
+@section TrigL2MissingET_TrigL2MissingETIntro Introduction
 
 The package provides LVL2 MissingET algorithms.
 It returns  etx and ety, the x and y components of missing Et, 
@@ -30,12 +30,12 @@ modes.  In the seeded mode, the roi inputs must have energy sum
 first.  LVL 2 muons can be added as a second roi.  In the 
 unseeded mode only muon no roi's or only muon roi's are provided.
 
-@section TrigL2MissingETOverview Class Overview
+@section TrigL2MissingET_TrigL2MissingETOverview Class Overview
 
   The full work of TrigL2MissingET is currently carried out in 
   T2MissingET.cxx
 
-@section TrigL2MissingETAlgorithm Algorithm properties
+@section TrigL2MissingET_TrigL2MissingETAlgorithm Algorithm properties
 
 property                [default]                 meaning
 
@@ -51,12 +51,10 @@ As eta is not available from LVL1, the last two properties are not used.
 
 /**
 @page used_TrigL2MissingET Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigL2MissingET Requirements
-@include requirements
 */
 
 
diff --git a/Trigger/TrigAlgorithms/TrigMissingETMuon/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigMissingETMuon/doc/packagedoc.h
similarity index 87%
rename from Trigger/TrigAlgorithms/TrigMissingETMuon/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigMissingETMuon/doc/packagedoc.h
index b6d4abc8d88245540fb722b91f1218e06e7ab82d..f3a63fea21a8db88ef349d14018c4dbfb7023443 100644
--- a/Trigger/TrigAlgorithms/TrigMissingETMuon/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigMissingETMuon/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrigMissingETMuon Package
+@page TrigMissingETMuon_page TrigMissingETMuon Package
 
 
 The TrigMissingETMuon package implements the missing energy and scalar
@@ -18,7 +18,7 @@ twiki page.
          Xiaowen Lei  <xiaowen@physics.arizona.edu>
          Allen Mincer <allen.mincer@nyu.edu>
 
-@section TrigMissingETMuonIntro Introduction
+@section TrigMissingETMuon_TrigMissingETMuonIntro Introduction
 
 The package provides LVL2 MissingET algorithms.
 It returns  etx and ety, the x and y components of missing Et, 
@@ -30,12 +30,12 @@ modes.  In the seeded mode, the roi inputs must have energy sum
 first.  LVL 2 muons can be added as a second roi.  In the 
 unseeded mode only muon no roi's or only muon roi's are provided.
 
-@section TrigMissingETMuonOverview Class Overview
+@section TrigMissingETMuon_TrigMissingETMuonOverview Class Overview
 
   The full work of TrigMissingETMuon is currently carried out in 
   T2MissingET.cxx
 
-@section TrigMissingETMuonAlgorithm Algorithm properties
+@section TrigMissingETMuon_TrigMissingETMuonAlgorithm Algorithm properties
 
 property                [default]                 meaning
 
@@ -51,12 +51,10 @@ As eta is not available from LVL1, the last two properties are not used.
 
 /**
 @page used_TrigMissingETMuon Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigMissingETMuon Requirements
-@include requirements
 */
 
 
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigMuonEF/doc/packagedoc.h
similarity index 72%
rename from Trigger/TrigAlgorithms/TrigMuonEF/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigMuonEF/doc/packagedoc.h
index 8abc277e788ea00f3ac7de466d9c79cb5ef24091..a2ffade33c8aebc600f098132f26af34c5f4fe07 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage The TrigMuonEF Package 
+@page TrigMuonEF_page The TrigMuonEF Package
 
-@section  IntroTrigMuonEF Introduction
+@section TrigMuonEF_IntroTrigMuonEF Introduction
 
 This package provides the implementation of EF wrappers for the offline muon reconstruction algorithms.
 
@@ -17,11 +17,9 @@ This package provides the implementation of EF wrappers for the offline muon rec
 
 /**
 @page used_TrigMuonEF Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigMuonEF Requirements
-@include requirements
 */
 
diff --git a/Trigger/TrigAlgorithms/TrigSecVtxFinder/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigSecVtxFinder/doc/mainpage.h
deleted file mode 100644
index 3772646cc82f6b511be22b7514681b16b7ecb80e..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigSecVtxFinder/doc/mainpage.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-@mainpage TrigSecVtxFinder package
-
-@author Xinlu Huang
-
-@section TrigSecVtxFinderReq Requirements
-
-@include requirements
-*/
diff --git a/Trigger/TrigAlgorithms/TrigSecVtxFinder/doc/packagedoc.h b/Trigger/TrigAlgorithms/TrigSecVtxFinder/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..a6611b7ed32493e0d91babd977c7af66fa2ca694
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigSecVtxFinder/doc/packagedoc.h
@@ -0,0 +1,12 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+@page TrigSecVtxFinder_page TrigSecVtxFinder package
+
+@author Xinlu Huang
+
+@section TrigSecVtxFinder_TrigSecVtxFinderReq Requirements
+
+*/
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/doc/packagedoc.h
similarity index 82%
rename from Trigger/TrigAlgorithms/TrigT2CaloCommon/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigT2CaloCommon/doc/packagedoc.h
index 67d472400e9e19d6d5f3722af8badb88bd91410a..2067191b5dcc10efafcc8c5aa15c99be9b9565f9 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage
+@page TrigT2CaloCommon_page 
 @author Denis Oliveira
 @author Carlos Osuna
 
-@section TrigT2CaloCommonOverview Overview 
+@section TrigT2CaloCommon_TrigT2CaloCommonOverview Overview
 This package provides data access classes and bytestream converters
 objects for calorimeter reconstruction algorithms for L2 trigger.
 In addition it contains classes for (EM) calibration and geometry helpers.
@@ -21,11 +21,9 @@ In addition it contains classes for (EM) calibration and geometry helpers.
 
 /**
 @page used_TrigT2CaloCommon Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigT2CaloCommon Requirements
-@include requirements
 */
 
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloTau/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigT2CaloTau/doc/packagedoc.h
similarity index 84%
rename from Trigger/TrigAlgorithms/TrigT2CaloTau/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigT2CaloTau/doc/packagedoc.h
index 9c99d62b71f417c18413103551563c6706b3e647..3f61316755d54f6bcf045537eacd1d5ab4af2eaa 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloTau/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloTau/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage
+@page TrigT2CaloTau_page 
 @author Carlos Osuna
 @author Stefania Xella
 @author M. Pilar Casado
 @author Olga Igonkina
 
-@section TrigT2CaloTauOverview  Overview
+@section TrigT2CaloTau_TrigT2CaloTauOverview Overview
 This package is in charge of the calorimeter reconstruction in
 the trigger LVL2 for taus. It builds a set of shower shape variables
 to discriminate jet and taus.
@@ -24,12 +24,10 @@ Deposited energy is available in 3 different window sizes for all sampling.
 
 /**
 @page used_TrigT2CaloTau Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigT2CaloTau Requirements
-@include requirements
 
 
 */
diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/doc/packagedoc.h
similarity index 83%
rename from Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/doc/packagedoc.h
index 527e2edaf72de183f0cc6aa12ea316a880074f25..97c194cc65e87acae33040c199cd25d412adbb41 100644
--- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage TrigT2HistoPrmVtx Package
+@page TrigT2HistoPrmVtx_page TrigT2HistoPrmVtx Package
 
 @author Andrea.Coccaro@ge.infn.it
 
-@section Introduction
+@section TrigT2HistoPrmVtx_Introduction 
 
 This package performs a very fast primary vertex reconstruction in Z coordinate.
 
@@ -16,7 +16,6 @@ It is currently used in the Bjet slice chain since the computation of likelihood
 using longitudinal impact parameter needs the estimation of the primary vertex Z coordinate
 (for the time being, it is assumed that the primary vertex in the transverse plane is zero).
 
-@htmlinclude used_packages.html 
 
 */
 
diff --git a/Trigger/TrigAlgorithms/TrigT2Tau/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigT2Tau/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 80%
rename from Trigger/TrigAlgorithms/TrigT2Tau/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigT2Tau/doc/packagedoc.h
index 5f412cc4a309a2eeb545579148aaa36cd30a5a85..f97dd5402a26cd94f718dc3f5444167f08fd45f7
--- a/Trigger/TrigAlgorithms/TrigT2Tau/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigT2Tau/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage
+@page TrigT2Tau_page 
 @author Olga Igonkina
 @author M. Pilar Casado
 
-@section TrigT2TauOverview Overview 
+@section TrigT2Tau_TrigT2TauOverview Overview
 This package contains L2 tau trigger FEX algorithm which combines
 tracking and calorimeter reconstruction information and fills TrigTau object.
 
@@ -20,10 +20,8 @@ tracking and calorimeter reconstruction information and fills TrigTau object.
 
 /**
 @page used_TrigT2Tau Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigT2Tau Requirements
-@include requirements
 */
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigTauRec/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 78%
rename from Trigger/TrigAlgorithms/TrigTauRec/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigTauRec/doc/packagedoc.h
index d3807d51cb756e63b686175807ffced36b650f49..6928ac9f0ee68c85234e067323af47f4cba9495a
--- a/Trigger/TrigAlgorithms/TrigTauRec/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigTauRec/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage
+@page TrigTauRec_page 
 @author Stefania Xella
 
-@section MyPackageOverview  Overview
+@section TrigTauRec_MyPackageOverview Overview
 This package contains EF tauRec algorithm to find taus in  EF.
 TrigTauRec is a calo based algorithm and is seeded as opposed to the offline tauRec.
 
diff --git a/Trigger/TrigAlgorithms/TrigTileMuId/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigTileMuId/doc/packagedoc.h
similarity index 91%
rename from Trigger/TrigAlgorithms/TrigTileMuId/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigTileMuId/doc/packagedoc.h
index 665cf22da0d0657bafa22bfd5642ef12295fff4e..02180453a7aa046cb31b4cd51924c11f56686553 100644
--- a/Trigger/TrigAlgorithms/TrigTileMuId/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigTileMuId/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TrigTileMuId Package
+@page TrigTileMuId_page TrigTileMuId Package
 
 The package provides low \f$ p_{\rm{T}} \f$ muon tagging algorithms using TileCal for LVL2 trigger.
 
@@ -12,11 +12,11 @@ The package provides low \f$ p_{\rm{T}} \f$ muon tagging algorithms using TileCa
 @author Aranzazu Ruiz Martinez Aranzazu.Ruiz.Martinez@cern.ch
 @author Heuijin Lim Heuijin.Lim@cern.ch
 
-@section TrigTileMuIdIntro Introduction
+@section TrigTileMuId_TrigTileMuIdIntro Introduction
 
 The basics of the TrigTileMuId algorithms is to look for low \f$ p_{\rm{T}} \f$ muons in the Tile Calorimeter following projective patterns in eta. The search starts from the outermost layer until the innermost layer of TileCal looking for cells with energy deposited between a low and a high energy thresholds (\f$ thr_{low} \leq  E \leq thr_{hi} \f$). The low energy threshold is meant to cut electronic noise and minimum bias pile-up events. The high energy thresholds are meant to delimit the maximum muon energy deposition while eliminating hadronic showers and tails.
 
-@section TrigTileMuIdOverview Class Overview
+@section TrigTileMuId_TrigTileMuIdOverview Class Overview
 
 The TrigTileMuId package contains the following classes:
 
@@ -37,10 +37,8 @@ The TrigTileMuId package contains the following classes:
 
 /**
 @page used_TrigTileMuId Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigTileMuId Requirements
-@include requirements
 */
diff --git a/Trigger/TrigAlgorithms/TrigmuComb/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigmuComb/doc/packagedoc.h
similarity index 90%
rename from Trigger/TrigAlgorithms/TrigmuComb/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigmuComb/doc/packagedoc.h
index b6a712523bc2997d3614fd57fb7934779231c20d..73ac2dbfc57acc9197d6939dc35add79b172fdc8 100644
--- a/Trigger/TrigAlgorithms/TrigmuComb/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigmuComb/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage
+@page TrigmuComb_page 
 @author Stefano Giagu
 
-@section TrigmuCombOverview Overview 
+@section TrigmuComb_TrigmuCombOverview Overview
 This LVL2 algorithm combines a standalone muon reconstructed by the muFast algorithm 
 with an inner detector track to improve the determination of the transverse momentum of the 
 muon, to reduce the rate of fakes and to help rejectig decay in flight of kaons and pions.
@@ -25,10 +25,8 @@ event record for further analysis.
 
 /**
 @page used_TrigmuComb Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigmuComb Requirements
-@include requirements
 */
diff --git a/Trigger/TrigAlgorithms/TrigmuIso/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigmuIso/doc/packagedoc.h
similarity index 85%
rename from Trigger/TrigAlgorithms/TrigmuIso/doc/mainpage.h
rename to Trigger/TrigAlgorithms/TrigmuIso/doc/packagedoc.h
index ee44d2fa4c89053b6e466ba0d659f997274b8d0b..9e6289c0841e4f1ba00a3a28180daa68920b4b30 100644
--- a/Trigger/TrigAlgorithms/TrigmuIso/doc/mainpage.h
+++ b/Trigger/TrigAlgorithms/TrigmuIso/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage
+@page TrigmuIso_page 
 @author Stefano Giagu
 
-@section TrigmuIsoOverview Overview 
+@section TrigmuIso_TrigmuIsoOverview Overview
 This algorithm provide isolation informations for muons at LVL2.
 Both calorimetric and inner detector informations can be used. 
 The muIso algorithm decode the calorimetric informations and ID 
@@ -23,10 +23,8 @@ event record for further analysis.
 
 /**
 @page used_TrigmuIso Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigmuIso Requirements
-@include requirements
 */
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/doc/mainpage.h b/Trigger/TrigAnalysis/TrigAnalysisExamples/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 58%
rename from Trigger/TrigAnalysis/TrigAnalysisExamples/doc/mainpage.h
rename to Trigger/TrigAnalysis/TrigAnalysisExamples/doc/packagedoc.h
index 2f32dcb39d4dc4f9ba2d778d1eeec2e8897a68d4..84a7116155af58acf99fe67dfa732b8be02671c7
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/doc/mainpage.h
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage TrigAnalysisExamples Package
-@mainpage TrigDecisionTool Package
+@page TrigAnalysisExamples_page TrigAnalysisExamples Package
+@page TrigAnalysisExamples_page TrigDecisionTool Package
 
-@section TrigAnalysisExampleIntro Introduction
+@section TrigAnalysisExamples_TrigAnalysisExampleIntro Introduction
 This package contains examples of usage of TrigDecisionTool.
 
 
@@ -16,7 +16,6 @@ Find more user documentation at the page:
 https://twiki.cern.ch/twiki/bin/view/Atlas/TrigDecisionTool15
 
 
-@htmlinclude used_packages.html 
 
 
 */
diff --git a/Trigger/TrigAnalysis/TrigAnalysisInterfaces/doc/mainpage.h b/Trigger/TrigAnalysis/TrigAnalysisInterfaces/doc/packagedoc.h
similarity index 79%
rename from Trigger/TrigAnalysis/TrigAnalysisInterfaces/doc/mainpage.h
rename to Trigger/TrigAnalysis/TrigAnalysisInterfaces/doc/packagedoc.h
index aa88d3ac8e6219e600e784acc25014e71db1213b..7d6eb012f96698b1dc34ba1e8f2f4131c82658a8 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisInterfaces/doc/mainpage.h
+++ b/Trigger/TrigAnalysis/TrigAnalysisInterfaces/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-   @mainpage TrigAnalysisInterfaces package
+@page TrigAnalysisInterfaces_page TrigAnalysisInterfaces package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
-   @section TrigAnalysisInterfacesIntro Introduction
+@section TrigAnalysisInterfaces_TrigAnalysisInterfacesIntro Introduction
 
    This package holds some tool interfaces that can be used in a trigger-aware
    analysis. The implementation of the interfaces is in other packages.
    Mostly in the TrigBunchCrossingTool package.
 
-   @section TrigAnalysisInterfacesClasses Classes/Interfaces
+@section TrigAnalysisInterfaces_TrigAnalysisInterfacesClasses Classes/Interfaces
 
    The following interfaces are defined in the package:
      - Trig::IBunchCrossingTool: A common interface for all the tools providing
@@ -23,7 +23,5 @@
        from a tool. It's mainly used for writing the information as metadata
        into various types of output files.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/doc/mainpage.h b/Trigger/TrigAnalysis/TrigBunchCrossingTool/doc/packagedoc.h
similarity index 87%
rename from Trigger/TrigAnalysis/TrigBunchCrossingTool/doc/mainpage.h
rename to Trigger/TrigAnalysis/TrigBunchCrossingTool/doc/packagedoc.h
index 352ac703e01bb14e3a19ab0c9685e3781a500165..cfaac1a39b1fb31f369611d9c7e08b5c932b3f86 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/doc/mainpage.h
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-   @mainpage TrigBunchCrossingTool package
+@page TrigBunchCrossingTool_page TrigBunchCrossingTool package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
-   @section TrigBunchCrossingToolIntro Introduction
+@section TrigBunchCrossingTool_TrigBunchCrossingToolIntro Introduction
 
    This package holds the prototype implementation of the BunchCrossingTool. The
    purpose of this tool is to give analysts easy access to information about where
@@ -16,7 +16,7 @@
    The tool has of course some other functionality as well, but this is the main
    use case.
 
-   @section TrigBunchCrossingToolInstructions Usage instructions
+@section TrigBunchCrossingTool_TrigBunchCrossingToolInstructions Usage instructions
 
    The package declares two public interfaces for the bunch crossing tools.
    The main part of the interface is
@@ -41,7 +41,7 @@
    theJob.MyAlgorithm.MyBCTool = BunchCrossingTool()
    </code>
 
-   @section TrigBunchCrossingToolConfInt The configuration provider interface
+@section TrigBunchCrossingTool_TrigBunchCrossingToolConfInt The configuration provider interface
 
    The package also hosts another Athena interface: Trig::IBunchCrossingConfProvider.
    The purpose of this interface is to allow users to extract the bunch structure
@@ -50,7 +50,7 @@
 
    Usage instructions for this interface will be compiled later...
 
-   @section TrigBunchCrossingToolTools The available tools
+@section TrigBunchCrossingTool_TrigBunchCrossingToolTools The available tools
 
    The following implementations are currently available for the generic interface:
 
@@ -67,7 +67,7 @@
       as it only knows about some internally stored configurations. Mostly here
       for debugging purposes.
 
-   @section TrigBunchCrossingToolImpl Implementation details
+@section TrigBunchCrossingTool_TrigBunchCrossingToolImpl Implementation details
 
    The tools are implemented using a few smart classes:
 
@@ -82,8 +82,6 @@
    Most of the heavy lifting is done by the common base class of all the implementations
    Trig::BunchCrossingToolBase.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 
 */
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/doc/mainpage.h b/Trigger/TrigAnalysis/TrigDecisionTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 79%
rename from Trigger/TrigAnalysis/TrigDecisionTool/doc/mainpage.h
rename to Trigger/TrigAnalysis/TrigDecisionTool/doc/packagedoc.h
index 59d1f1be2fc241ffc9fbffa7eda839f6faea2ef8..614a69a7e798e51328fa683266210c4d4935cc78
--- a/Trigger/TrigAnalysis/TrigDecisionTool/doc/mainpage.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/doc/packagedoc.h
@@ -5,9 +5,9 @@
 /**
 
 
-@mainpage TrigDecisionTool Package
+@page TrigDecisionTool_page TrigDecisionTool Package
 
-@section TrigDecisionToolIntro Introduction
+@section TrigDecisionTool_TrigDecisionToolIntro Introduction
 
 This package contains TrigDecisionTool which is main tool to access trigger data. This is available since release 15.1.0 (with some manual preparations) onwards. If you are looking for old tool please refer to TrigDecision package.
 
@@ -16,7 +16,6 @@ Find more user documentation at the page:
 https://twiki.cern.ch/twiki/bin/view/Atlas/TrigDecisionTool15
 
 
-@htmlinclude used_packages.html 
 
 
 */
diff --git a/Trigger/TrigAnalysis/TrigInDetTruthAlgs/doc/mainpage.h b/Trigger/TrigAnalysis/TrigInDetTruthAlgs/doc/packagedoc.h
similarity index 67%
rename from Trigger/TrigAnalysis/TrigInDetTruthAlgs/doc/mainpage.h
rename to Trigger/TrigAnalysis/TrigInDetTruthAlgs/doc/packagedoc.h
index 653b0f85280510e135bd341d1a5f26bbbc094c58..5e40324259255df6c4b6043a78585e17117e54c5 100644
--- a/Trigger/TrigAnalysis/TrigInDetTruthAlgs/doc/mainpage.h
+++ b/Trigger/TrigAnalysis/TrigInDetTruthAlgs/doc/packagedoc.h
@@ -3,21 +3,21 @@
 */
 
 /**
-@mainpage  TrigInDetTruthAlgs
+@page TrigInDetTruthAlgs_page TrigInDetTruthAlgs
 @author R.Goncalo
 
-@section introduction_TrigInDetTruthAlgs Introduction
+@section TrigInDetTruthAlgs_introduction_TrigInDetTruthAlgs Introduction
 
 Finds GenParticles which match a TrigInDetTrack, 
 creates a TrigInDetTrackTruth for each track and 
 fills a TrigInDetTrackTruthMap with them.
 
-@section overview_TrigInDetTruthAlgs Class Overview
+@section TrigInDetTruthAlgs_overview_TrigInDetTruthAlgs Class Overview
   The TrigInDetTruthAlgs package contains of following classes:
 
   - TrigInDetTruthMaker
 
-@section extras_TrigInDetTruthAlgs Extra Pages
+@section TrigInDetTruthAlgs_extras_TrigInDetTruthAlgs Extra Pages
 
   - @ref used_TrigInDetTruthAlgs
   - @ref requirements_TrigInDetTruthAlgs
@@ -26,10 +26,8 @@ fills a TrigInDetTrackTruthMap with them.
 
 /**
 @page used_TrigInDetTruthAlgs Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigInDetTruthAlgs Requirements
-@include requirements
 */
diff --git a/Trigger/TrigAnalysis/TrigJiveXML/doc/mainpage.h b/Trigger/TrigAnalysis/TrigJiveXML/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Trigger/TrigAnalysis/TrigJiveXML/doc/mainpage.h
rename to Trigger/TrigAnalysis/TrigJiveXML/doc/packagedoc.h
index 422664253fbe561a35a14e541d4bd74504e2dcc2..5098c2e4869d995ffe4aad2c66108a2d51b52413
--- a/Trigger/TrigAnalysis/TrigJiveXML/doc/mainpage.h
+++ b/Trigger/TrigAnalysis/TrigJiveXML/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage TrigJiveXML package
+@page TrigJiveXML_page TrigJiveXML package
 @author Nikos.Konstantinidis@cern.ch, Eric.Jansen@hef.ru.nl, Juergen.Thomas@cern.ch
-@section IntroTrigJiveXML Introduction
+@section TrigJiveXML_IntroTrigJiveXML Introduction
 
 This package contains the AlgToos that produce the XML fragments of Trigger datatypes for the XML files read by atlantis.
 The AlgTools inherit from JiveXML::DataRetriever, and are the following:
@@ -27,8 +27,6 @@ The AlgTools inherit from JiveXML::DataRetriever, and are the following:
       - Property: StoreGateKey : the StoreGate location of the DataVector<LVL1::TriggerTower> ( default LVL1TriggerTowers )
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/doc/mainpage.h b/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/doc/packagedoc.h
similarity index 88%
rename from Trigger/TrigAnalysis/TrigMuonCoinHierarchy/doc/mainpage.h
rename to Trigger/TrigAnalysis/TrigMuonCoinHierarchy/doc/packagedoc.h
index c819853a3e09fbbc3ffae040892cb1d4f81ec9ba..8dc5028b02f71e1453e983ec8f5f82a9ecc7bb41 100644
--- a/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/doc/mainpage.h
+++ b/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /** 
-@mainpage TrigMuonCoinHierarchy Package
+@page TrigMuonCoinHierarchy_page TrigMuonCoinHierarchy Package
 
 The TrigMuonCoinHierarchy package contains classes to provide the hierarchical information of TGC coincidences and hits using pointers of hit PRD (TgcPrepData) and coincidence PRD (TgcCoinData). 
 
 @author Susumu Oda <Susumu.Oda@cern.ch>
 
-@section TgcCoinHierarchy TgcCoinHierarchy
+@section TrigMuonCoinHierarchy_TgcCoinHierarchy TgcCoinHierarchy
 The TgcCoinHierarchy class holds pointers of related TgcCoinData (coincidence PRD) and TgcPrepData (hit PRD). 
 There are three levels of coincidences, Sector Logic (SL), High pT (HiPt) and Tracklet. 
 HiPt and Tracklet are sub-divided into HiPt Wire (in the eta direction) and HiPt Strip (in the phi direction), and Tracklet Wire and Tracklet Strip, respectively. 
@@ -40,7 +40,7 @@ TgcCoinHierarchy also provides The conversion methods for the enum's.
  Hits Hits Hits Hits  Hits  Hits 
 \endcode
 
-@section TgcCoinHierarchySvc TgcCoinHierarchySvc
+@section TrigMuonCoinHierarchy_TgcCoinHierarchySvc TgcCoinHierarchySvc
 The TgcCoinHierarchySvc provides pointers of the TgcCoinHierarchy class based on the followings: 
 - Hit
  - Identifier 
@@ -60,23 +60,23 @@ The TgcCoinHierarchySvc provides pointers of the TgcCoinHierarchy class based on
 - Event 
   - In this case, returns all the pointers of TgcCoinHierarchy's in the event. 
 
-@section TgcCoinHierarchyClassifyTool TgcCoinHierarchyClassifyTool 
+@section TrigMuonCoinHierarchy_TgcCoinHierarchyClassifyTool TgcCoinHierarchyClassifyTool
 The TgcCoinHierarchyClassifyTool class classifies TgcCoinData and TgcPrepData into each trigger sector using the TgcCoinHierarchyTriggerSector class. 
 While the trigger decision is performed for each trigger sector, the TgcCoinData and TgcPrepData are recorded in those container with the granuality of sector (there are 12 sectors per side). 
 The TgcCoinHierarchyClassifyTool also provides ID conversion functionalities. 
 
-@section TgcCoinHierarchyTriggerSector TgcCoinHierarchyTriggerSector
+@section TrigMuonCoinHierarchy_TgcCoinHierarchyTriggerSector TgcCoinHierarchyTriggerSector
 The TgcCoinHierarchyTriggerSector class holds multiple coincidence PRD's and multiple hit PRD's in one trigger sector. 
 This class is created by TgcCoinHierarchyClassifyTool and is used by TgcCoinHierarchyFindTool to create TgcCoinHierarchy. 
 
-@section TgcCoinHierarchyFindTool TgcCoinHierarchyFindTool 
+@section TrigMuonCoinHierarchy_TgcCoinHierarchyFindTool TgcCoinHierarchyFindTool
 The TgcCoinHierarchyFindTool class checks relations among coincidences and hits in one sector and creates TgcCoinHierarchy instances. 
 The relations among coincidences are checked by TrackletId.  
 The relations between hits and coincidences are checked using the TGC cabling service. 
 The check of the relations between hits and coincidences will be improved very soon (as of July 16, 2009). 
 Currently, all the hits in a trigger sector are associated to all the TgcCoinHierarchy's in the same trigger sector.  
 
-@section TgcCoinHierarchyTestAlg TgcCoinHierarchyTestAlg
+@section TrigMuonCoinHierarchy_TgcCoinHierarchyTestAlg TgcCoinHierarchyTestAlg
 The TgcCoinHierarchyTestAlg is used for debugging and validation. 
 Currently, it uses the following as starting points: 
 - Event 
@@ -88,11 +88,10 @@ Currently, it uses the following as starting points:
 
 In share/TgcCoinHierarchyTestAlg_topOptions.py, there are flags to enable/disable the above starting points.  
 
-@section Presentation Presentation 
+@section TrigMuonCoinHierarchy_Presentation Presentation
 A presentation on the TrigMuonCoinHierarchy package and on the results obtained with the package was shown at the Muon Offline Software Meeting on 9 December, 2009. 
 - http://indicobeta.cern.ch/conferenceDisplay.py?confId=76230
  - Validation of decoding of TGC hits and coincidences   
 
-@include requirements
 
 */
diff --git a/Trigger/TrigAnalysis/TrigRootAnalysis/doc/mainpage.h b/Trigger/TrigAnalysis/TrigRootAnalysis/doc/packagedoc.h
similarity index 79%
rename from Trigger/TrigAnalysis/TrigRootAnalysis/doc/mainpage.h
rename to Trigger/TrigAnalysis/TrigRootAnalysis/doc/packagedoc.h
index 1f7ff7298e97949b2330f5982bf586e99c3285fc..ddf5e66e111d53871c547efe1e856802aa015ad3 100644
--- a/Trigger/TrigAnalysis/TrigRootAnalysis/doc/mainpage.h
+++ b/Trigger/TrigAnalysis/TrigRootAnalysis/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-   @mainpage TrigRootAnalysis - Tools for trigger-aware D3PD analysis
+@page TrigRootAnalysis_page TrigRootAnalysis - Tools for trigger-aware D3PD analysis
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
-   @section TrigRootAnalysisIntro Introduction
+@section TrigRootAnalysis_TrigRootAnalysisIntro Introduction
 
    This package holds some code meant to help with analyzing the trigger
    information in D3PD files. It's main use is to decode the full trigger
    decision, and trigger configuration information found in many D3PD
    types.
 
-   @section TrigRootAnalysisUsage Usage instructions
+@section TrigRootAnalysis_TrigRootAnalysisUsage Usage instructions
 
    A TWiki page with some usage instructions can be found
    <a href="https://twiki.cern.ch/twiki/bin/viewauth/Atlas/TriggerD3PDMaker#ROOT_helper_code_for_reading_som">here</a>.
@@ -27,7 +27,5 @@
    Examples demonstrating the usage of D3PD::TrigDecisionToolD3PD can be found
    under <strong>/afs/cern.ch/user/k/krasznaa/public/roottdt/</strong>.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Trigger/TrigConfiguration/TrigConfInterfaces/doc/mainpage.h b/Trigger/TrigConfiguration/TrigConfInterfaces/doc/packagedoc.h
similarity index 88%
rename from Trigger/TrigConfiguration/TrigConfInterfaces/doc/mainpage.h
rename to Trigger/TrigConfiguration/TrigConfInterfaces/doc/packagedoc.h
index 5a6ee6ecd471b5bc4973ea7edc60e331c842870b..cc7fc24d0256f33b94f96efc0c4533008437a53d 100644
--- a/Trigger/TrigConfiguration/TrigConfInterfaces/doc/mainpage.h
+++ b/Trigger/TrigConfiguration/TrigConfInterfaces/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-   @mainpage TrigConfInterfaces Package
+@page TrigConfInterfaces_page TrigConfInterfaces Package
 
    @author Joerg Stelzer        <Joerg.Stelzer@cern.ch>
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
@@ -11,13 +11,13 @@
    $Revision: 612008 $
    $Date: 2014-08-15 15:35:58 +0200 (Fri, 15 Aug 2014) $
 
-   @section TrigConfInterfacesOverview Overview
+@section TrigConfInterfaces_TrigConfInterfacesOverview Overview
 
    This package holds all the interfaces through which the trigger
    configuration services should be accessed both in- and outside of
    Athena.
 
-   @section TrigConfInterfacesClasses Classes
+@section TrigConfInterfaces_TrigConfInterfacesClasses Classes
 
    The following are the interfaces that can be used outside of Athena:
      - TrigConf::IILVL1ConfigSvc: Interface to services providing LVL1
@@ -40,7 +40,5 @@
    and outside of Athena: TrigConf::ITrigConfigTool. This is an interface
    for dual-use ASG tools that are meant for trigger aware analysis.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/doc/mainpage.h b/Trigger/TrigConfiguration/TrigConfxAOD/doc/packagedoc.h
similarity index 82%
rename from Trigger/TrigConfiguration/TrigConfxAOD/doc/mainpage.h
rename to Trigger/TrigConfiguration/TrigConfxAOD/doc/packagedoc.h
index 947a254b7802733ef53a990f7275c7330a6d4c2f..70386be093d4972c6fe604a331a2aed8c8d3e5c6 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/doc/mainpage.h
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 /**
-   @mainpage TrigConfxAOD Package
+@page TrigConfxAOD_page TrigConfxAOD Package
 
    @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
 
    $Revision: 580638 $
    $Date: 2014-01-29 14:18:16 +0100 (Wed, 29 Jan 2014) $
 
-   @section TrigConfxAODOverview Overiview
+@section TrigConfxAOD_TrigConfxAODOverview Overiview
 
    This package holds code that can be used in- and outside of Athena to
    set up and interact with the trigger configuration metadata of xAOD files.
 
-   @section TrigConfxAODClasses Main Classes
+@section TrigConfxAOD_TrigConfxAODClasses Main Classes
 
    The package holds two main components for Athena usage:
     - TrigConf::xAODMenuWriter: An algorithm that creates the event-wise and
@@ -25,7 +25,5 @@
       interface that can provide the trigger configuration information using
       the "normal" Athena interfaces, when reading an xAOD file.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 */
diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/doc/mainpage.h b/Trigger/TrigDataAccess/TrigSerializeResult/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Trigger/TrigDataAccess/TrigSerializeResult/doc/mainpage.h
rename to Trigger/TrigDataAccess/TrigSerializeResult/doc/packagedoc.h
index 51c3d9190595f7c818ee2464b1082fde55e69333..51f71cd70bccd906461e48fd725d1216e28e97d5
--- a/Trigger/TrigDataAccess/TrigSerializeResult/doc/mainpage.h
+++ b/Trigger/TrigDataAccess/TrigSerializeResult/doc/packagedoc.h
@@ -5,9 +5,9 @@
 /**
 
 
-@mainpage TrigSerializeResult
+@page TrigSerializeResult_page TrigSerializeResult
 
-@section introduction Introduction 
+@section TrigSerializeResult_introduction Introduction
 
 The package is used for sending the L2 result to the EF in the online
 environment where other serialization technologies are too heavy to be
@@ -30,15 +30,13 @@ Maguerite Traynor.
 The package which is using this tools is HLT::Navigation.
 
 
-@section bcomp Backward compatibility
+@section TrigSerializeResult_bcomp Backward compatibility
 Please note that the result of 
 changes may affect possibility to read back data already taken.
 Please make sure that changes in this package (especially in Serializer)
 are well tested in this context.
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TrigEvent/TrigBSExtraction/doc/mainpage.h b/Trigger/TrigEvent/TrigBSExtraction/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from Trigger/TrigEvent/TrigBSExtraction/doc/mainpage.h
rename to Trigger/TrigEvent/TrigBSExtraction/doc/packagedoc.h
index 297404c9358026edc4d4bd27516fe64efa9700d9..55c108bc7318021ca440db3a81ac5e9344329002
--- a/Trigger/TrigEvent/TrigBSExtraction/doc/mainpage.h
+++ b/Trigger/TrigEvent/TrigBSExtraction/doc/packagedoc.h
@@ -5,10 +5,10 @@
 /**
 
 
-@mainpage
+@page TrigBSExtraction_page 
 
 
-@section TrigBSExtractionIntro Introduction 
+@section TrigBSExtraction_TrigBSExtractionIntro Introduction
 
 This package contains only one top algorithms. It should be run during
 reconstruction phase and is extracting all objects stored in
@@ -19,8 +19,6 @@ The main disadvantage of this package is that it depemds on all Trigger EDM obje
 
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TrigEvent/TrigDecision/doc/mainpage.h b/Trigger/TrigEvent/TrigDecision/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 63%
rename from Trigger/TrigEvent/TrigDecision/doc/mainpage.h
rename to Trigger/TrigEvent/TrigDecision/doc/packagedoc.h
index baab807bcdb35d1b244edfe53e2c9ed06c9262b7..131405a205eca9dcb80e4c5ae5b336a1ca5edc37
--- a/Trigger/TrigEvent/TrigDecision/doc/mainpage.h
+++ b/Trigger/TrigEvent/TrigDecision/doc/packagedoc.h
@@ -6,14 +6,12 @@
 
 
 
-@mainpage
+@page TrigDecision_page 
 
-@section TrigDecisionIntro
+@section TrigDecision_TrigDecisionIntro 
 The package is obsolete. PLease look inti TrigDecisionTool.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
 
diff --git a/Trigger/TrigEvent/TrigInDetEvent/doc/mainpage.h b/Trigger/TrigEvent/TrigInDetEvent/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Trigger/TrigEvent/TrigInDetEvent/doc/mainpage.h
rename to Trigger/TrigEvent/TrigInDetEvent/doc/packagedoc.h
index 3f90ae06ff1b9741b151bedc2fe80da0e1870e4c..2404ece65bc591b162e14c4da16fa6f728f100a5
--- a/Trigger/TrigEvent/TrigInDetEvent/doc/mainpage.h
+++ b/Trigger/TrigEvent/TrigInDetEvent/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage TrigInDetEvent  Package
+@page TrigInDetEvent_page TrigInDetEvent Package
 
 This package contains classes used in the LVL2 ID algorithms
 
 @author D.Emeliyanov AT rlDOTacDOTuk
 
-@section TrigInDetEventIntro Introduction
+@section TrigInDetEvent_TrigInDetEventIntro Introduction
 
 The following classes are defined
 
@@ -36,8 +36,7 @@ The following classes are defined
 
 This package also contains selection.xml - a file for lcgdict generation
       
-@section TrigInDetEventReq Requirements
+@section TrigInDetEvent_TrigInDetEventReq Requirements
 
-@include requirements
 
 */
diff --git a/Trigger/TrigEvent/TrigMissingEtEvent/doc/mainpage.h b/Trigger/TrigEvent/TrigMissingEtEvent/doc/packagedoc.h
similarity index 90%
rename from Trigger/TrigEvent/TrigMissingEtEvent/doc/mainpage.h
rename to Trigger/TrigEvent/TrigMissingEtEvent/doc/packagedoc.h
index a313e400c446f295738aeac3cbeb94e971ea62f1..02ead7764f3d53a2472ca6daa5625749471c0fc4 100644
--- a/Trigger/TrigEvent/TrigMissingEtEvent/doc/mainpage.h
+++ b/Trigger/TrigEvent/TrigMissingEtEvent/doc/packagedoc.h
@@ -3,11 +3,11 @@
 */
 
 /**
-@mainpage TrigMissingEtEvent
+@page TrigMissingEtEvent_page TrigMissingEtEvent
 @author   Diego Casadei
 
 
-@section TrigMissingEtEventIntro Introduction
+@section TrigMissingEtEvent_TrigMissingEtEventIntro Introduction
 
 This package defines the transient class needed to keep info about the
 missing energy vector and the total (scalar) energy sums computed by
@@ -18,7 +18,7 @@ href="http://cdsweb.cern.ch/record/1129146">ATL-COM-DAQ-2008-008</a>
 note.
 
 
-@section TrigMissingEtEventOverview Class Overview
+@section TrigMissingEtEvent_TrigMissingEtEventOverview Class Overview
 
 The TrigMissingEtEvent package contains of following classes:
 
@@ -49,10 +49,8 @@ The TrigMissingEtEvent package contains of following classes:
 
 /**
 @page used_TrigMissingEtEvent Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigMissingEtEvent Requirements
-@include requirements
 */
diff --git a/Trigger/TrigEvent/TrigMuonEvent/doc/mainpage.h b/Trigger/TrigEvent/TrigMuonEvent/doc/packagedoc.h
similarity index 90%
rename from Trigger/TrigEvent/TrigMuonEvent/doc/mainpage.h
rename to Trigger/TrigEvent/TrigMuonEvent/doc/packagedoc.h
index 3cc5bc7ab8164d2df149a76ece50b9bf87faf6dc..cf012b0033c34bb23aa8456f2602344b5a75a8f3 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/doc/mainpage.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/doc/packagedoc.h
@@ -3,17 +3,17 @@
 */
 
 /**
-@mainpage  TrigMuonEvent
+@page TrigMuonEvent_page TrigMuonEvent
 @author alexander.oh@cern.ch
 
-@section TrigMuonEventIntro Introduction
+@section TrigMuonEvent_TrigMuonEventIntro Introduction
 
 
 EDM package implementing transient objects to be used by FEX algorithms to
 fill information for later processing by Hypo's or other tools and
 storage.
 
-@section MyPackageOverview Class Overview
+@section TrigMuonEvent_MyPackageOverview Class Overview
   The TrigMuonEvent package contains of following classes:
 
   - CombinedMuonFeature          : used by muComb
@@ -41,10 +41,8 @@ storage.
 
 /**
 @page used_TrigMuonEvent Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigMuonEvent Requirements
-@include requirements
 */
diff --git a/Trigger/TrigEvent/TrigNavTools/doc/mainpage.h b/Trigger/TrigEvent/TrigNavTools/doc/packagedoc.h
similarity index 81%
rename from Trigger/TrigEvent/TrigNavTools/doc/mainpage.h
rename to Trigger/TrigEvent/TrigNavTools/doc/packagedoc.h
index e4eabec74e5f79ec36e9c52bff4023497e9d20da..2d46df3830b86c2333f1b3fc404f107437e4e1f8 100644
--- a/Trigger/TrigEvent/TrigNavTools/doc/mainpage.h
+++ b/Trigger/TrigEvent/TrigNavTools/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-  @mainpage TrigNavTools package
+@page TrigNavTools_page TrigNavTools package
 
-  @section TrigNavToolsIntro Introduction
+@section TrigNavTools_TrigNavToolsIntro Introduction
 
   This package contains tools and algorithms for performing slimming of the 
   trigger Navigation structure:
diff --git a/Trigger/TrigEvent/TrigNavigation/doc/mainpage.h b/Trigger/TrigEvent/TrigNavigation/doc/packagedoc.h
similarity index 80%
rename from Trigger/TrigEvent/TrigNavigation/doc/mainpage.h
rename to Trigger/TrigEvent/TrigNavigation/doc/packagedoc.h
index b01797bfe5cbcf31f93027fa4ce63ec80c3d887b..e014bcc4560bb4dc50312f110f859d02527069e7 100644
--- a/Trigger/TrigEvent/TrigNavigation/doc/mainpage.h
+++ b/Trigger/TrigEvent/TrigNavigation/doc/packagedoc.h
@@ -5,9 +5,9 @@
 /**
 
 
-@mainpage TrigNavigation Package
+@page TrigNavigation_page TrigNavigation Package
 
-@section TrigSteeringEventIntro Introduction
+@section TrigNavigation_TrigSteeringEventIntro Introduction
 
 This package contains the new(rel 13) Trigger Navigation structure:
  - HLT::TriggerElement: which is node of navigation structure graph
@@ -17,7 +17,6 @@ This package contains the new(rel 13) Trigger Navigation structure:
 
 
 Notice little dependency. It is a core package.
-@htmlinclude used_packages.html 
 
 
 */
diff --git a/Trigger/TrigEvent/TrigParticle/doc/mainpage.h b/Trigger/TrigEvent/TrigParticle/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from Trigger/TrigEvent/TrigParticle/doc/mainpage.h
rename to Trigger/TrigEvent/TrigParticle/doc/packagedoc.h
index da0f0bb84af46e0ca4e5a7ba69b3728340990e65..0397b80c390dbabe016882f6aa2507fc29adafd0
--- a/Trigger/TrigEvent/TrigParticle/doc/mainpage.h
+++ b/Trigger/TrigEvent/TrigParticle/doc/packagedoc.h
@@ -3,14 +3,14 @@
 */
 
 /**
-@mainpage TrigParticle Package
+@page TrigParticle_page TrigParticle Package
 @author Some.One@cern.ch  - see below for responsibles
 
-@section MTrigParticleIntro Introduction
+@section TrigParticle_MTrigParticleIntro Introduction
 
 This package contains the diverse TrigParticle classes 
 
-@section TrigParticleOverview Class Overview
+@section TrigParticle_TrigParticleOverview Class Overview
   The TrigParticle package contains of following classes:
 
   - TrigElectron : stores the Electron candidates (Jose.Goncalo@cern.ch)
@@ -29,10 +29,8 @@ This package contains the diverse TrigParticle classes
 
 /**
 @page used_TrigParticle Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigParticle Requirements
-@include requirements
 */
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/doc/mainpage.h b/Trigger/TrigEvent/TrigSteeringEvent/doc/packagedoc.h
similarity index 80%
rename from Trigger/TrigEvent/TrigSteeringEvent/doc/mainpage.h
rename to Trigger/TrigEvent/TrigSteeringEvent/doc/packagedoc.h
index b225ae51b47b1ed874b259261876e308c5a992f6..ccb7b6d37f239237607818c7423b1c745e188a1a 100644
--- a/Trigger/TrigEvent/TrigSteeringEvent/doc/mainpage.h
+++ b/Trigger/TrigEvent/TrigSteeringEvent/doc/packagedoc.h
@@ -5,9 +5,9 @@
 /**
 
 
-@mainpage TrigSteeringEvent Package
+@page TrigSteeringEvent_page TrigSteeringEvent Package
 
-@section TrigSteeringEventIntro Introduction
+@section TrigSteeringEvent_TrigSteeringEventIntro Introduction
 
 This package contains utilisties used to stream PESA results. 
  - HLT::HLTResult:
@@ -22,7 +22,6 @@ And some other misc helpers:
  - MessageSvcProvider: 
 
 Notice little dependency. It is realy a core package.
-@htmlinclude used_packages.html 
 
 
 */
diff --git a/Trigger/TrigEvent/TrigThinning/doc/mainpage.h b/Trigger/TrigEvent/TrigThinning/doc/packagedoc.h
similarity index 100%
rename from Trigger/TrigEvent/TrigThinning/doc/mainpage.h
rename to Trigger/TrigEvent/TrigThinning/doc/packagedoc.h
diff --git a/Trigger/TrigFTK/TrigFTKPool/doc/mainpage.h b/Trigger/TrigFTK/TrigFTKPool/doc/packagedoc.h
similarity index 63%
rename from Trigger/TrigFTK/TrigFTKPool/doc/mainpage.h
rename to Trigger/TrigFTK/TrigFTKPool/doc/packagedoc.h
index a8f40a45f6476164fed0e9eea370dd79f87fcd2a..2d922ed63eddd445cd7e27e0b0ceb64e1b3db4d7 100644
--- a/Trigger/TrigFTK/TrigFTKPool/doc/mainpage.h
+++ b/Trigger/TrigFTK/TrigFTKPool/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage TrigFTKEventPool Package
+@page TrigFTKPool_page TrigFTKEventPool Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Guido Volpi <guido.volpi@cern.ch>
 
-@section TrigFTKEventPoolIntro Introduction
+@section TrigFTKPool_TrigFTKEventPoolIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section TrigFTKEventPoolReq Requirements
+@section TrigFTKPool_TrigFTKEventPoolReq Requirements
 
-@include requirements
 
 */
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/doc/mainpage.h b/Trigger/TrigHypothesis/TrigBjetHypo/doc/packagedoc.h
similarity index 93%
rename from Trigger/TrigHypothesis/TrigBjetHypo/doc/mainpage.h
rename to Trigger/TrigHypothesis/TrigBjetHypo/doc/packagedoc.h
index 7ecf6d3df54a43d81155c2659b9883b8a5b5ba09..088b59a2451483fc709d9597ff52ee449f900218 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/doc/mainpage.h
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage TrigBjetHypo Package
+@page TrigBjetHypo_page TrigBjetHypo Package
 
 @author Andrea.Coccaro@ge.infn.it
 
-@section Introduction
+@section TrigBjetHypo_Introduction 
 
 This package contains the HLT b-tagging selection based on the likelihood ratio method and on a track-based chi2 probability method.
 It is running both at LVL2 and EF and it basically contains a feature extraction algorithm to compute the b-tagging weight of all the different taggers and an hypothesis algorithm which implements the selection.
@@ -29,9 +29,7 @@ Hypothesis algorithm can perform the selection using these different taggers: CH
 
 In order to optimize b-tagging performance keeping the reconstruction efficiency as high as possible, in the feature extraction algorithm a dedicated track selection has been added.
 
-@htmlinclude used_packages.html
 
-@htmlinclude used_packages.html 
 
 */
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/doc/mainpage.h b/Trigger/TrigHypothesis/TrigBphysHypo/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Trigger/TrigHypothesis/TrigBphysHypo/doc/mainpage.h
rename to Trigger/TrigHypothesis/TrigBphysHypo/doc/packagedoc.h
index 68a415a8c039d6b0298affe4c61be9cd78483b01..8d802284ea7ae8163f0dcee512cd35e55a26679b
--- a/Trigger/TrigHypothesis/TrigBphysHypo/doc/mainpage.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/doc/packagedoc.h
@@ -3,10 +3,10 @@
 */
 
 /**
-@mainpage TrigBphysHypo Package
+@page TrigBphysHypo_page TrigBphysHypo Package
 @author Julie.Kirk@rl.ac.uk, John.Baines@rl.ac.uk, Natalia.Panikashvili@cern.ch, Serguei.Sivoklokov@cern.ch
 
-@section TrigBphysHypoIntro Introduction
+@section TrigBphysHypo_TrigBphysHypoIntro Introduction
 This package contains the code for hypothesis algorithms in the Bphysics slice of the trigger. 
 It comprises the following algorithms:
 
@@ -28,12 +28,10 @@ JpsiHypo.cxx  :                   Select Jpsi->mumu decays after TrigDiMuon from
 
 /**
 @page used_TrigBphysHypo Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigBphysHypo Requirements
-@include requirements
 */
 
 
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/doc/mainpage.h b/Trigger/TrigHypothesis/TrigEgammaHypo/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Trigger/TrigHypothesis/TrigEgammaHypo/doc/mainpage.h
rename to Trigger/TrigHypothesis/TrigEgammaHypo/doc/packagedoc.h
index 91d0faa9805281d5103dd50b9c2f0b8ac6d83f78..8002c94c9e9b5476ea0dac85e7726b4defef2d2d
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/doc/mainpage.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/doc/packagedoc.h
@@ -5,7 +5,7 @@
 
 /**
 
-@mainpage
+@page TrigEgammaHypo_page 
 @author R. Goncalo
 @author J. Baines
 @author I. Graboska-Bold
@@ -15,7 +15,7 @@
 @author C. SantaMarina
 @author P. Urquijo
 
-@section MyPackageOverview  Overview
+@section TrigEgammaHypo_MyPackageOverview Overview
 This package contains the fex and hypo trigger algorithms for the Electron and Photon Slice
 It contains 2 algorithm classes: <br/>
 Fex - which create a feature extraction object <br/>
@@ -26,7 +26,6 @@ The package also contains the configuration files for the Electron and Photon Sl
 electron and photon trigger menus.
 
 
-@htmlinclude used_packages.html
 
 
 */
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/doc/mainpage.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/doc/packagedoc.h
similarity index 89%
rename from Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/doc/mainpage.h
rename to Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/doc/packagedoc.h
index 427f364a71ff287b2cea26ba9d299badf9b13cd6..aad363b1bdf06495aef0ef2e90020861aa169208 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/doc/mainpage.h
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage
+@page TrigLongLivedParticlesHypo_page 
 @author Stefano Giagu, Antonio Policicchio
 
-@section TrigLongLivedParticlesHypoOverview Overview 
+@section TrigLongLivedParticlesHypo_TrigLongLivedParticlesHypoOverview Overview
 This package contains LVL2 Hypotesis  algorithms for Long-Lived 
 neutral particle triggers: MuonClusterHypo, TrigL2HVJetHypo and TrigMuonJetHypo.
 The MuonClusterHypo applies cuts on the TrigMuonClusterFeature written by the MuonCluster Fex.
@@ -27,10 +27,8 @@ around the jet direction. Moreover the jet has to be the non-standard value for
 
 /**
 @page used_TrigLongLivedParticlesHypo Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigLongLivedParticlesHypo Requirements
-@include requirements
 */
diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/doc/mainpage.h b/Trigger/TrigHypothesis/TrigMissingETHypo/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from Trigger/TrigHypothesis/TrigMissingETHypo/doc/mainpage.h
rename to Trigger/TrigHypothesis/TrigMissingETHypo/doc/packagedoc.h
index 8731e5ac19804034ff66ef5262cd02308d9082eb..39674f03aac8062ee35760ed9348b079c7e4431c
--- a/Trigger/TrigHypothesis/TrigMissingETHypo/doc/mainpage.h
+++ b/Trigger/TrigHypothesis/TrigMissingETHypo/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrigMissingETHypo Package
+@page TrigMissingETHypo_page TrigMissingETHypo Package
 
 The package provides the MissingET HYPO algorithm for 
 both LVL2 and EF.
@@ -15,7 +15,7 @@ both LVL2 and EF.
          Xiaowen Lei  <xiaowen@physics.arizona.edu>
          Allen Mincer <allen.mincer@nyu.edu>
 
-@section TrigMissingETHypoIntro Introduction
+@section TrigMissingETHypo_TrigMissingETHypoIntro Introduction
 
 The package provides the hypothesis algorithm for both LVL2 and 
 EF MissingET. The FEX algorithms currently return 
@@ -28,7 +28,7 @@ uncertainty in et.
 The algorithm passes an event based on the values of missing Et
 and sumEt as presented in the properties description below.
 
-@section TrigEFMissingETAlgorithm Algorithm properties
+@section TrigMissingETHypo_TrigEFMissingETAlgorithm Algorithm properties
 
 Hypothesis thresholds are defined via MissingETCut and SumETCut.
 The algorithm cuts on both missing transverse energy
@@ -71,7 +71,7 @@ property                   [default]               meaning
 "Forward"            0.                      If <0 require calo_MET<|Forward|
                                              If >0 require calo_MET<Forward AND muon_MET<Forward
 
-@section TrigMissingETHypoOverview Class Overview
+@section TrigMissingETHypo_TrigMissingETHypoOverview Class Overview
 
 Currently TrigEFMissingETHypo::hltExecute does the full event by
 event work of the algorithm.
@@ -95,10 +95,8 @@ the  Trigger/TrigEvent/TrigMissingEtEvent package.
 
 /**
 @page UsedTrigMissingETHypo Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page RequirementsTrigMissingETHypo Requirements
-@include requirements
 */
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/doc/mainpage.h b/Trigger/TrigHypothesis/TrigTauHypo/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from Trigger/TrigHypothesis/TrigTauHypo/doc/mainpage.h
rename to Trigger/TrigHypothesis/TrigTauHypo/doc/packagedoc.h
index 9fc30403d04952af3bd724aa9cba251834fdedf3..261effc9c7a20679e30f027b8a5caa27527e1477
--- a/Trigger/TrigHypothesis/TrigTauHypo/doc/mainpage.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/doc/packagedoc.h
@@ -4,12 +4,12 @@
 
 /**
 
-@mainpage
+@page TrigTauHypo_page 
 @author Stefania Xella
 @author M. Pilar Casado
 @author Olga Igonkina
 
-@section MyPackageOverview  Overview
+@section TrigTauHypo_MyPackageOverview Overview
 This package contains HLT variables to select taus in LVL2 and EF.
 Tracking and calorimeter information is used to select a narrow jet with
 low multiplicity.
diff --git a/Trigger/TrigMonitoring/TrigMonitorBase/doc/mainpage.h b/Trigger/TrigMonitoring/TrigMonitorBase/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from Trigger/TrigMonitoring/TrigMonitorBase/doc/mainpage.h
rename to Trigger/TrigMonitoring/TrigMonitorBase/doc/packagedoc.h
index ac800c6df70c49d57e7d5797926c7c9d514d627c..8e285fc6d5951c6d0b49b8be88077bdeeffc31de
--- a/Trigger/TrigMonitoring/TrigMonitorBase/doc/mainpage.h
+++ b/Trigger/TrigMonitoring/TrigMonitorBase/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page TrigMonitorBase_page 
 
-@section TrigMonitorbase Introduction
+@section TrigMonitorBase_TrigMonitorbase Introduction
 
 There are basically 2 philosophies of writing monitoring tools for HLT.<br/>
 1) - do not write any tools. Use IMonitoredAlgo interface (now every HLT algorithm has it in the inheritcance tree).
@@ -19,7 +19,7 @@ In this case it compleetly up to user to define filling methods (i.e. can be sev
 One is to be rememberd however that histograms should be booked during beginRun of algorithm and not deleted in finalize or endRun.
   
 
-@section  TrigMonitorbaseContent Content
+@section TrigMonitorBase_TrigMonitorbaseContent Content
 The package contains: <br/> 
 
 TrigMonitorToolBase an interface for the
@@ -51,8 +51,6 @@ python::TrigGenericMonitoringToolConfig::defineHistogram.
 
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/doc/mainpage.h b/Trigger/TrigMonitoring/TrigSteerMonitor/doc/packagedoc.h
similarity index 93%
rename from Trigger/TrigMonitoring/TrigSteerMonitor/doc/mainpage.h
rename to Trigger/TrigMonitoring/TrigSteerMonitor/doc/packagedoc.h
index 7803c6b5f2fcfcc97f1004934f556121e3a5a63f..9e2a1c39cc6378b68c558a8fb980e69ad99ba91c 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/doc/mainpage.h
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrigSteerMonitor Package
+@page TrigSteerMonitor_page TrigSteerMonitor Package
 @author Gordon.Fischer@desy.de
 @author nedden@mail.desy.de
 @author Till.Eifert@cern.ch
@@ -12,10 +12,10 @@
 
 
 
-@section TrigSteerMonitorIntroduction
+@section TrigSteerMonitor_TrigSteerMonitorIntroduction 
 The Package that monitors the Steering decision, Errorcode, RoI
 
-@section TrigSteerMonitor Class Overview
+@section TrigSteerMonitor_TrigSteerMonitor Class Overview
 
 Monitoring the Steering Decision:
 
diff --git a/Trigger/TrigMonitoring/TrigTimeMonitor/doc/mainpage.h b/Trigger/TrigMonitoring/TrigTimeMonitor/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 83%
rename from Trigger/TrigMonitoring/TrigTimeMonitor/doc/mainpage.h
rename to Trigger/TrigMonitoring/TrigTimeMonitor/doc/packagedoc.h
index 3d94a1dcb68c4cacb130f2740a71a06ab5a089aa..0a48a64c2a53d4a0dd3a4da48835513e61944752
--- a/Trigger/TrigMonitoring/TrigTimeMonitor/doc/mainpage.h
+++ b/Trigger/TrigMonitoring/TrigTimeMonitor/doc/packagedoc.h
@@ -6,9 +6,9 @@
 
 
 
-@mainpage
+@page TrigTimeMonitor_page 
 
-@section TrigTimeMonitrIntro Introduction
+@section TrigTimeMonitor_TrigTimeMonitrIntro Introduction
 This package contains implementation of two monitoring tools used for timing monitoring.<br/>
 
 The TrigTimeHistTool records the timers in the form of histograms.<br/>
@@ -25,8 +25,6 @@ infrastructure is better described there:
 
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TrigSteer/TrigInterfaces/doc/mainpage.h b/Trigger/TrigSteer/TrigInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 92%
rename from Trigger/TrigSteer/TrigInterfaces/doc/mainpage.h
rename to Trigger/TrigSteer/TrigInterfaces/doc/packagedoc.h
index a036e0969d90a92ca505ba1f91982d5789907eb6..bd9c8119709bd8c9d62e9575211948a9fd70987a
--- a/Trigger/TrigSteer/TrigInterfaces/doc/mainpage.h
+++ b/Trigger/TrigSteer/TrigInterfaces/doc/packagedoc.h
@@ -5,9 +5,9 @@
 /**
 
 
-@mainpage TrigInterfaces Package
+@page TrigInterfaces_page TrigInterfaces Package
 
-@section TrigSteeringInterfacesIntro Introduction
+@section TrigInterfaces_TrigSteeringInterfacesIntro Introduction
 
 This package defines the new base classes for trigger algorithms.
 The base classes from which developers must inherit their algorithms are:
@@ -27,7 +27,6 @@ The base classes from which developers must inherit their algorithms are:
 		   examples: missing transverse energy algorithms.
 
 
-@htmlinclude used_packages.html 
 
 
 */
diff --git a/Trigger/TrigSteer/TrigSteering/doc/mainpage.h b/Trigger/TrigSteer/TrigSteering/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 87%
rename from Trigger/TrigSteer/TrigSteering/doc/mainpage.h
rename to Trigger/TrigSteer/TrigSteering/doc/packagedoc.h
index 74c785a8047e2f88cbe75da86c91cb3103e60acd..0ff978fe7b82771fa2bddd42a8408dbd60373d23
--- a/Trigger/TrigSteer/TrigSteering/doc/mainpage.h
+++ b/Trigger/TrigSteer/TrigSteering/doc/packagedoc.h
@@ -3,7 +3,7 @@
 */
 
 /**
-@mainpage TrigSteering Package
+@page TrigSteering_page TrigSteering Package
 
 
 New classes:
@@ -11,7 +11,7 @@ New classes:
 @author Nicolas.Berger@cern.ch
 @author Tomasz.Bold@cern.ch
 
-@section TrigSteeringIntro Introduction
+@section TrigSteering_TrigSteeringIntro Introduction
 
 This package is used for the High Level Trigger (HLT), both
 in the Level 2 (L2) and Event Filter (EF).
@@ -24,7 +24,7 @@ algorithms.
 
 
 
-@section TrigSteeringOverview Class Overview
+@section TrigSteering_TrigSteeringOverview Class Overview
   The TrigSteering package contains of following classes:
 
   - HLT::TrigSteer : Gaudi TopAlgorithm, controlling all other sub algorithms
@@ -42,10 +42,8 @@ algorithms.
 
 /**
 @page used_TrigSteering Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigSteering Requirements
-@include requirements
 */
diff --git a/Trigger/TrigSteer/TrigSteeringTest/doc/mainpage.h b/Trigger/TrigSteer/TrigSteeringTest/doc/packagedoc.h
similarity index 77%
rename from Trigger/TrigSteer/TrigSteeringTest/doc/mainpage.h
rename to Trigger/TrigSteer/TrigSteeringTest/doc/packagedoc.h
index 9737bd557354262a7adea7ae53832323ee42da31..ba680c3de1ccaa6f2c95c37977fe273526ff9ddb 100644
--- a/Trigger/TrigSteer/TrigSteeringTest/doc/mainpage.h
+++ b/Trigger/TrigSteer/TrigSteeringTest/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage TrigSteeringTest Package
+@page TrigSteeringTest_page TrigSteeringTest Package
 
 @author Till.Eifert@cern.ch
 @author Nicolas.Berger@cern.ch
 @author Tomasz.Bold@cern.ch
 
-@section TrigSteeringTestIntro Introduction
+@section TrigSteeringTest_TrigSteeringTestIntro Introduction
 This package provides some dummy algorithm to test the HLT Steering w/o any real or MC data!
 
 
@@ -22,12 +22,10 @@ This package provides some dummy algorithm to test the HLT Steering w/o any real
 
 /**
 @page used_TrigSteeringTest Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigSteeringTest Requirements
-@include requirements
 */
 
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/doc/mainpage.h b/Trigger/TrigT1/L1Topo/L1TopoByteStream/doc/mainpage.h
deleted file mode 100644
index 457e88a53aceba39f88f3a073130ccc9ee63a6d2..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/doc/mainpage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
- <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
-
-@mainpage
-
-@htmlinclude used_packages.html
-
-@include requirements
-
-*/
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/doc/packagedoc.h b/Trigger/TrigT1/L1Topo/L1TopoByteStream/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..96f7dee17908aa6cebab481e0818d4378a0eb811
--- /dev/null
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/doc/packagedoc.h
@@ -0,0 +1,13 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+
+ <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
+
+@page L1TopoByteStream_page 
+
+
+
+*/
diff --git a/Trigger/TrigT1/L1Topo/L1TopoMonitoring/doc/mainpage.h b/Trigger/TrigT1/L1Topo/L1TopoMonitoring/doc/mainpage.h
deleted file mode 100644
index 457e88a53aceba39f88f3a073130ccc9ee63a6d2..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/L1Topo/L1TopoMonitoring/doc/mainpage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
- <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
-
-@mainpage
-
-@htmlinclude used_packages.html
-
-@include requirements
-
-*/
diff --git a/Trigger/TrigT1/L1Topo/L1TopoMonitoring/doc/packagedoc.h b/Trigger/TrigT1/L1Topo/L1TopoMonitoring/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..cbb4c3c20d9387b25f204e9f1b4f2e4a12e9f286
--- /dev/null
+++ b/Trigger/TrigT1/L1Topo/L1TopoMonitoring/doc/packagedoc.h
@@ -0,0 +1,13 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+
+ <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
+
+@page L1TopoMonitoring_page 
+
+
+
+*/
diff --git a/Trigger/TrigT1/L1Topo/L1TopoRDO/doc/mainpage.h b/Trigger/TrigT1/L1Topo/L1TopoRDO/doc/mainpage.h
deleted file mode 100644
index 457e88a53aceba39f88f3a073130ccc9ee63a6d2..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/L1Topo/L1TopoRDO/doc/mainpage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
- <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
-
-@mainpage
-
-@htmlinclude used_packages.html
-
-@include requirements
-
-*/
diff --git a/Trigger/TrigT1/L1Topo/L1TopoRDO/doc/packagedoc.h b/Trigger/TrigT1/L1Topo/L1TopoRDO/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..db4b6513887a0dd640fc703e897e0c63b9dc819a
--- /dev/null
+++ b/Trigger/TrigT1/L1Topo/L1TopoRDO/doc/packagedoc.h
@@ -0,0 +1,13 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+
+ <i>This page has been automatically generated by the tool. Please remove this line when you start creating your own mainpage</i>
+
+@page L1TopoRDO_page 
+
+
+
+*/
diff --git a/Trigger/TrigT1/TrigT1CTP/doc/mainpage.h b/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from Trigger/TrigT1/TrigT1CTP/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h
index 329d9def1d9973aa17c6bf9d1c245525165ee17e..8c8b857ca60f48d215192df683f7068ca8c9f30e
--- a/Trigger/TrigT1/TrigT1CTP/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h
@@ -3,19 +3,19 @@
 */
 
 /**
-@mainpage TrigT1CTP Package
+@page TrigT1CTP_page TrigT1CTP Package
 
 @author Attila Kraznahorkay Jr. <Attila.Krasznahorkay@cern.ch>
 @author Wolfgang Ehrenfeld <Wolfgang.Ehrenfeld@desy.de>
 
-@section TrigT1CTPIntro Introduction
+@section TrigT1CTP_TrigT1CTPIntro Introduction
 
 This package contains the simulation of the Central Trigger Processor (CTP).
 It gets inputs from the MuCTPI and the CALO sub-system and calculates if the
 %LVL1 trigger accept (L1A) for a given trigger menu. In addition certain internal
 triggers are simulated: random trigger, prescaled clock trigger and bunch group trigger.
 
-@section TrigT1CTPOverview Class Overview
+@section TrigT1CTP_TrigT1CTPOverview Class Overview
   The TrigT1CTP package contains of following algorithms:
 
   - LVL1CTP::CTPSimulation: simulation of the CTP hardware
@@ -35,7 +35,7 @@ triggers are simulated: random trigger, prescaled clock trigger and bunch group
   - LVL1CTP::PrescaledClockTrigger: simulation of the internal prescaled clock trigger
   - LVL1CTP::RandomTrigger: simulation of the internal random trigger
 
-@section TrigT1CTPJobOptions Job Options
+@section TrigT1CTP_TrigT1CTPJobOptions Job Options
   The algorithms of the TrigT1CTP package can be configured using configurables.
   For an example see TrigT1CTP_jobOptions.py:
   @include TrigT1CTP_jobOptions.py
@@ -50,7 +50,7 @@ triggers are simulated: random trigger, prescaled clock trigger and bunch group
   - @link LVL1CTP::CBNTAA_CTP_RDO::CBNTAA_CTP_RDO @endlink
   - @link LVL1CTP::CBNTAA_ReadCTP_RIO::CBNTAA_ReadCTP_RIO @endlink
 
-@section TrigT1CTP Extra Pages
+@section TrigT1CTP_TrigT1CTP Extra Pages
 
 - @ref used_TrigT1CTP
 - @ref requirements_TrigT1CTP
@@ -58,10 +58,8 @@ triggers are simulated: random trigger, prescaled clock trigger and bunch group
 
 /**
    @page used_TrigT1CTP Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_TrigT1CTP Requirements
-   @include requirements
 */
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/doc/mainpage.h b/Trigger/TrigT1/TrigT1CaloByteStream/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 91%
rename from Trigger/TrigT1/TrigT1CaloByteStream/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1CaloByteStream/doc/packagedoc.h
index 05edfc912aff585e904bb4a92146e7f7f882e513..47bf58a0a3416cffdeb94a09e2b40bc6eb1f8b44
--- a/Trigger/TrigT1/TrigT1CaloByteStream/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/doc/packagedoc.h
@@ -3,9 +3,9 @@
 */
 
 /**
-@mainpage TrigT1CaloByteStream Package
+@page TrigT1CaloByteStream_page TrigT1CaloByteStream Package
 
-@section intro Introduction
+@section TrigT1CaloByteStream_intro Introduction
 This package contains offline bytestream conversion code for the
 Level-1 Calorimeter Trigger sub-detectors.<p>
 
@@ -38,12 +38,10 @@ Implemented so far: PPM, CPM, JEM, CMM-CP, CMM-Jet, CMM-Energy DAQ;
 
 /**
 @page used_TrigT1CaloByteStream Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigT1CaloByteStream Requirements
-@include requirements
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/doc/mainpage.h b/Trigger/TrigT1/TrigT1CaloMonitoring/doc/packagedoc.h
similarity index 95%
rename from Trigger/TrigT1/TrigT1CaloMonitoring/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1CaloMonitoring/doc/packagedoc.h
index 63b65ac2ad473b5dfbb766cea61740a8e4b2e635..33889e9714b4d53308ec2b4f0f7f3cdbaa0e7891 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page TrigT1CaloMonitoring_page 
 
 <b>Contents</b>
 - @subpage Intropage
@@ -64,31 +64,31 @@ not supported by Light Weight Histograms.
 
 @page Toolpage Monitoring Tools in the Package
                                                                <hr>
-@section Globalsection Global Monitoring Tool
+@section TrigT1CaloMonitoring_Globalsection Global Monitoring Tool
                                                                <hr><p>
   TrigT1CaloGlobalMonTool <p> @copydoc TrigT1CaloGlobalMonTool <hr>
 
-@section PPMsection Preprocessor Monitoring Tools
+@section TrigT1CaloMonitoring_PPMsection Preprocessor Monitoring Tools
                                                                <hr><p>
   PPrMon                  <p> @copydoc PPrMon                  <hr><p>
   PPrSpareMon             <p> @copydoc PPrSpareMon             <hr><p>
   PPMSimBSMon             <p> @copydoc PPMSimBSMon             <hr><p>
   PPrStabilityMon         <p> @copydoc PPrStabilityMon         <hr>
 
-@section CPMsection Cluster Processor Monitoring Tools
+@section TrigT1CaloMonitoring_CPMsection Cluster Processor Monitoring Tools
                                                                <hr><p>
   TrigT1CaloCpmMonTool    <p> @copydoc TrigT1CaloCpmMonTool    <hr><p>
   CPMSimBSMon             <p> @copydoc CPMSimBSMon             <hr><p>
   EmEfficienciesMonTool   <p> @copydoc EmEfficienciesMonTool   <hr>
 
-@section JEMsection Jet-Energy Processor Monitoring Tools
+@section TrigT1CaloMonitoring_JEMsection Jet-Energy Processor Monitoring Tools
                                                                <hr><p>
   JEMMon                  <p> @copydoc JEMMon                  <hr><p>
   CMMMon                  <p> @copydoc CMMMon                  <hr><p>
   JEPSimBSMon             <p> @copydoc JEPSimBSMon             <hr><p>
   JetEfficienciesMonTool  <p> @copydoc JetEfficienciesMonTool  <hr>
 
-@section RODsection ROD Monitoring Tool
+@section TrigT1CaloMonitoring_RODsection ROD Monitoring Tool
                                                                <hr><p>
   TrigT1CaloRodMonTool    <p> @copydoc TrigT1CaloRodMonTool
 
@@ -98,7 +98,7 @@ not supported by Light Weight Histograms.
 
 @page Rejectionpage Event Rejection Criteria and Stream Restrictions
 
-@section Rejectsection Event Rejection Criteria
+@section TrigT1CaloMonitoring_Rejectsection Event Rejection Criteria
 
   An event can be omitted from the monitoring for a number of reasons.
   The following table shows the main ones and which monitoring tools
@@ -133,7 +133,7 @@ not supported by Light Weight Histograms.
 
   <hr>
 
-@section Streamsection Event Stream Restrictions
+@section TrigT1CaloMonitoring_Streamsection Event Stream Restrictions
 
   Not all monitoring is needed or makes sense on all streams on Tier0 or online.
   The following table shows which tools are run on which streams.  The selection
@@ -184,7 +184,7 @@ not supported by Light Weight Histograms.
 
 @page Testingpage Testing the Code
 
-@section Oldsection Notes from Feb 2010
+@section TrigT1CaloMonitoring_Oldsection Notes from Feb 2010
 
   The easiest way to run the monitoring nowadays is probably just to run the
   transform used for production at Tier0 - @c Reco_trf.  You have to run this
@@ -217,7 +217,7 @@ not supported by Light Weight Histograms.
   with this.
   <hr>
 
-@section Newsection Update Feb 2013
+@section TrigT1CaloMonitoring_Newsection Update Feb 2013
 
   The monitoring has been moved back to the RAWtoESD step to avoid reading a
   large database folder in both steps.  But note that the jobOptions are still
@@ -258,7 +258,7 @@ not supported by Light Weight Histograms.
 
   <hr>
 
-@section Onlinesection Testing Online-specific Code
+@section TrigT1CaloMonitoring_Onlinesection Testing Online-specific Code
 
   The tools which contain online-specific code have a property
   @c OnlineTest which if set to true makes the tool run as if it was
@@ -266,7 +266,7 @@ not supported by Light Weight Histograms.
 
   <hr>
 
-@section CPUsection Monitoring CPU Time
+@section TrigT1CaloMonitoring_CPUsection Monitoring CPU Time
 
   For Tier0 monitoring it is important to keep CPU and memory usage as 
   low as possible.  To help with this an alternative jobOptions is provided
@@ -377,7 +377,7 @@ int main()
 
 @page Mergepage Histogram Merging and Post-Processing
 
-@section Mergesection Histogram Merging
+@section TrigT1CaloMonitoring_Mergesection Histogram Merging
 
   On Tier0 the raw data is processed one input file per job
   and the histogram outputs from each job are merged in a later step.
@@ -429,7 +429,7 @@ int main()
   and check @c rootDiff.log for any L1Calo or LVL1_Interfaces errors.
   <hr>
 
-@section MergesUsedsection Custom Merges Used in TrigT1CaloMonitoring
+@section TrigT1CaloMonitoring_MergesUsedsection Custom Merges Used in TrigT1CaloMonitoring
 
   <table>
   <tr><th> Merge Method        </th><th> Description from DataQualityUtils      </th></tr>
@@ -448,7 +448,7 @@ int main()
 
   <hr>
 
-@section PostProcessingsection Histogram Post-Processing
+@section TrigT1CaloMonitoring_PostProcessingsection Histogram Post-Processing
 
   Sometimes it's not possible to get the result you want with merging.
   In this case it is necessary to use the DQ histogram post-processing
@@ -469,7 +469,7 @@ int main()
 
 @page RoIAsymmetrypage Asymmetry in RoI eta-phi maps
 
-@section CPMRoIAsymmetrysection Asymmetry in CPM RoI eta-phi maps
+@section TrigT1CaloMonitoring_CPMRoIAsymmetrysection Asymmetry in CPM RoI eta-phi maps
 
   E-mail from Alan Watson 24 Nov 2008:
 
@@ -523,7 +523,7 @@ int main()
   maximum it would be more uniform, but that only works with a 3x3 or 5x5
   tower window, not a 4x4 tower one).
 
-@section JEMRoIAsymmetrysection Asymmetry in JEM RoI eta-phi maps
+@section TrigT1CaloMonitoring_JEMRoIAsymmetrysection Asymmetry in JEM RoI eta-phi maps
 
   E-mail from Alan Watson 26 Aug 2010:
 
@@ -609,7 +609,6 @@ CERN Castor first if you have permission (the l1ccalib account can do it).
 
 @page UsedPackagespage Used Packages
 
-@htmlinclude used_packages.html
 
 */
 
@@ -617,6 +616,5 @@ CERN Castor first if you have permission (the l1ccalib account can do it).
 
 @page Requirementspage Requirements
 
-@include requirements
 
 */
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoringTools/doc/mainpage.h b/Trigger/TrigT1/TrigT1CaloMonitoringTools/doc/packagedoc.h
similarity index 96%
rename from Trigger/TrigT1/TrigT1CaloMonitoringTools/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1CaloMonitoringTools/doc/packagedoc.h
index a9481ba4466e6ed6f74932fcbbf31c1ef2a47a3e..bd4a365564baf479efbffd3a3680b150b0df37e8 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoringTools/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1CaloMonitoringTools/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page TrigT1CaloMonitoringTools_page 
 
 Tools used by the packages TrigT1Calomonitoring and TrigT1Monitoring.  See also the documentation for those packages.
 
@@ -41,8 +41,6 @@ For more information see the documentation for TrigT1CaloMonitoring.
 
 <hr>
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TrigT1/TrigT1CaloSim/doc/mainpage.h b/Trigger/TrigT1/TrigT1CaloSim/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 96%
rename from Trigger/TrigT1/TrigT1CaloSim/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1CaloSim/doc/packagedoc.h
index 64bc9b3034f97fb97d705537934fec5c54107df9..c24722f1c13fdbd299cf69dfa585644d0a21d35e
--- a/Trigger/TrigT1/TrigT1CaloSim/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/doc/packagedoc.h
@@ -4,12 +4,12 @@
 
 
 /**
-@mainpage TrigT1CaloSim Package
+@page TrigT1CaloSim_page TrigT1CaloSim Package
 Author: Alan Watson, Ed Moyse, Pete Faulkner<P>
 
 The Package that simulates the first level calorimeter trigger.
 
-@section TrigT1CaloSim Introduction
+@section TrigT1CaloSim_TrigT1CaloSim Introduction
 
 TrigT1CaloSim is composed of 11 core Athena Algorithms, used for simulating 
 the trigger and producing RoIs, CTP inputs, CBNTAA and Bytestream data, plus 
@@ -33,7 +33,7 @@ The "Maker" algorithms construct data objects, e.g. Trigger Towers and Jet Eleme
 These algorithms started life in the TrigT1Calo package, which combined both algorithms and data objects in a single package. To allow more flexible use of the trigger algorithm code (e.g. for monitoring as well as simulation) and avoid dependency loops that package was splits, with the Athena Algorithms being separated from the tools and data objects in a new package, TrigT1CaloSim. 
 
 
-@section Class Class Overview
+@section TrigT1CaloSim_Class Class Overview
 
 *Core Classes(9):<BR>
 -----------------<BR>
@@ -96,10 +96,8 @@ DumpTriggerObjects.h -  The DumpTriggerObjects algorithm shows how to access EmT
 
 /**
 @page used_MyPackage Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_MyPackage Requirements
-@include requirements
 */
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/doc/mainpage.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 55%
rename from Trigger/TrigT1/TrigT1CaloToolInterfaces/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1CaloToolInterfaces/doc/packagedoc.h
index d679435be7e3220be617e0c646fb012d5c9ee9d8..18f7fb9d7fc6cb5627af0c322d1099fd36b3ba53
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/doc/packagedoc.h
@@ -3,18 +3,17 @@
 */
 
 /**
-@mainpage TrigT1CaloToolInterfaces Package
+@page TrigT1CaloToolInterfaces_page TrigT1CaloToolInterfaces Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Alan Watson <Alan.Watson@cern.ch>
 
-@section TrigT1CaloToolInterfacesIntro Introduction
+@section TrigT1CaloToolInterfaces_TrigT1CaloToolInterfacesIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section TrigT1CaloToolInterfacesReq Requirements
+@section TrigT1CaloToolInterfaces_TrigT1CaloToolInterfacesReq Requirements
 
-@include requirements
 
 */
diff --git a/Trigger/TrigT1/TrigT1CaloTools/doc/mainpage.h b/Trigger/TrigT1/TrigT1CaloTools/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 53%
rename from Trigger/TrigT1/TrigT1CaloTools/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1CaloTools/doc/packagedoc.h
index a14cf07bd9e8915b12ab85d8d9c835a3a7bf013b..612df27672e554787bd56cc541aefc1e12ab3f26
--- a/Trigger/TrigT1/TrigT1CaloTools/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/doc/packagedoc.h
@@ -1,16 +1,15 @@
 /**
-@mainpage TrigT1CaloTools Package
+@page TrigT1CaloTools_page TrigT1CaloTools Package
 
 >> Please enter an overview of the created package here: What does it contain?
 
 @author Alan Watson <Alan.Watson@cern.ch>
 
-@section TrigT1CaloToolsIntro Introduction
+@section TrigT1CaloTools_TrigT1CaloToolsIntro Introduction
 
 >> Please enter a brief description of the package here.
 
-@section TrigT1CaloToolsReq Requirements
+@section TrigT1CaloTools_TrigT1CaloToolsReq Requirements
 
-@include requirements
 
 */
diff --git a/Trigger/TrigT1/TrigT1Interfaces/doc/mainpage.h b/Trigger/TrigT1/TrigT1Interfaces/doc/packagedoc.h
similarity index 83%
rename from Trigger/TrigT1/TrigT1Interfaces/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1Interfaces/doc/packagedoc.h
index 8737e6139d6d37eef92f7e7f2365eb4a6d2bb45e..28253da4fb7e90197b32bdc0276d893c87706ae4 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /**
-   @mainpage TrigT1Interfaces package
+@page TrigT1Interfaces_page TrigT1Interfaces package
 
    @author E. Moyse <Edward.Moyse@cern.ch>
    @author Thomas Schoerner-Sadenius <thomas.schoerner@cern.ch>
@@ -8,7 +8,7 @@
    @author Tadashi Maeno <Tadashi.Maeno@cern.ch>
    @author Attila Krasznahorkay Jr. <Attila.Krasznahorkay@cern.ch>
 
-   @section TrigT1IntOverview Overview
+@section TrigT1Interfaces_TrigT1IntOverview Overview
 
    This package holds a large number of classes used together by various parts
    of the LVL1 trigger simulation, and also by the High Level Trigger. Since
@@ -16,8 +16,6 @@
    a general overview of them is not given here. See their individual documentation
    for more details.
 
-   @htmlinclude used_packages.html
 
-   @include requirements
 
 */
diff --git a/Trigger/TrigT1/TrigT1MBTS/doc/mainpage.h b/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h
similarity index 88%
rename from Trigger/TrigT1/TrigT1MBTS/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h
index 4ed9158205ca02d9e74f13b3716dcfec6f7f09b7..2d80aaecf698e4b2294a02dffe3737c5322a0c10 100644
--- a/Trigger/TrigT1/TrigT1MBTS/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage TrigT1MBTS Package
+@page TrigT1MBTS_page TrigT1MBTS Package
 
 @author William H. Bell <w.bell@physics.gla.ac.uk>
 
-@section TrigT1MBTS_Overview Overview
+@section TrigT1MBTS_TrigT1MBTS_Overview Overview
 
 This package simulates the level 1 MBTS trigger electronics and provides 
 input for the CTP simulation.  In hardware the 32 trigger inputs from 
@@ -20,7 +20,6 @@ code to perform the discrimination on the 32 channels and creates the CTP
 input object MbtsCTP.  The MbtsCTP contains two 16bit words: these bits 
 correspond to the 32 MBTS channels.
 
-@htmlinclude used_packages.html 
 
 */
 
diff --git a/Trigger/TrigT1/TrigT1Monitoring/doc/mainpage.h b/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h
similarity index 91%
rename from Trigger/TrigT1/TrigT1Monitoring/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h
index 6842f3ccb74354c0bf9f912a266cb94068660432..290d22a4b6f2d12ee4df943817cbe4798143bf00 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage
+@page TrigT1Monitoring_page 
 
 <b>Contents</b>
 - @subpage Intropage
@@ -47,17 +47,17 @@ See also the documentation for TrigT1CaloMonitoring.
 
 @page Toolpage Monitoring Tools in the Package
                                                          <hr>
-@section Calosection L1Calo/Calorimeter Monitoring Tools
+@section TrigT1Monitoring_Calosection L1Calo/Calorimeter Monitoring Tools
                                                          <hr><p>
   CalorimeterL1CaloMon <p> @copydoc CalorimeterL1CaloMon <hr>
   L1CaloHVScalesMon    <p> @copydoc L1CaloHVScalesMon    <hr>
   L1CaloPMTScoresMon   <p> @copydoc L1CaloPMTScoresMon   <hr>
 
-@section CTPsection L1Calo/CTP Monitoring Tool
+@section TrigT1Monitoring_CTPsection L1Calo/CTP Monitoring Tool
                                                          <hr><p>
   L1CaloCTPMon         <p> @copydoc L1CaloCTPMon         <hr><p>
 
-@section L2section L1Calo/L2 Monitoring Tool
+@section TrigT1Monitoring_L2section L1Calo/L2 Monitoring Tool
                                                          <hr><p>
   L1CaloLevel2Mon      <p> @copydoc L1CaloLevel2Mon      <hr><p>
 
@@ -67,7 +67,7 @@ See also the documentation for TrigT1CaloMonitoring.
 
 @page OtherInfopage Other Information
 
-@section Rejectsection Event Rejection Criteria
+@section TrigT1Monitoring_Rejectsection Event Rejection Criteria
 
   An event can be omitted from the monitoring for a number of reasons.
   The following table shows the main ones and which monitoring tools
@@ -91,7 +91,7 @@ See also the documentation for TrigT1CaloMonitoring.
 
   <hr>
 
-@section Streamsection Event Stream Restrictions
+@section TrigT1Monitoring_Streamsection Event Stream Restrictions
 
   Not all monitoring is needed or makes sense on all streams on Tier0 or online.
   The following table shows which tools are run on which streams.  The selection
@@ -108,7 +108,7 @@ See also the documentation for TrigT1CaloMonitoring.
 
   <hr>
 
-@section MergesUsedsection Custom Merges Used in TrigT1Monitoring
+@section TrigT1Monitoring_MergesUsedsection Custom Merges Used in TrigT1Monitoring
 
   <table>
   <tr><th> Merge Method        </th><th> Description from DataQualityUtils      </th></tr>
@@ -125,7 +125,6 @@ See also the documentation for TrigT1CaloMonitoring.
 
 @page UsedPackagespage Used Packages
 
-@htmlinclude used_packages.html
 
 */
 
@@ -133,6 +132,5 @@ See also the documentation for TrigT1CaloMonitoring.
 
 @page Requirementspage Requirements
 
-@include requirements
 
 */
diff --git a/Trigger/TrigT1/TrigT1Muctpi/doc/mainpage.h b/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h
similarity index 89%
rename from Trigger/TrigT1/TrigT1Muctpi/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h
index 46ec4d0a3cbef57007620affa503953e3982b2c4..4832a512636601e3efb591d7dc0a46ebe07fc4c9 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h
@@ -3,12 +3,12 @@
 */
 
 /**
-  @mainpage TrigT1Muctpi Package
+@page TrigT1Muctpi_page TrigT1Muctpi Package
 
   @author Attila Kraznahorkay Jr. <Attila.Krasznahorkay@cern.ch>
   @author Thorsten Wengler <Thorsten.Wengler@cern.ch>
 
-  @section TrigT1MuctpiIntro Introduction
+@section TrigT1Muctpi_TrigT1MuctpiIntro Introduction
 
   This package holds the simulation code of the Muon to CTP Interface (MuCTPI).
   This hardware is responsible for collecting the muon candidates reconstructed by
@@ -17,7 +17,7 @@
   result to the CTP. It also supplies information on the LVL1 muon candidates
   to the RoI Builder and the DAQ system.
 
-  @section TrigT1MuctpiOverview Class Overview
+@section TrigT1Muctpi_TrigT1MuctpiOverview Class Overview
 
   The package contains the following algorithms:
 
@@ -34,10 +34,8 @@
 
 /**
    @page used_TrigT1Muctpi Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_TrigT1Muctpi Requirements
-   @include requirements
 */
diff --git a/Trigger/TrigT1/TrigT1Result/doc/mainpage.h b/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 82%
rename from Trigger/TrigT1/TrigT1Result/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
index 695391b78cd2c33e0ffce61fd2510911c3e60f92..69bf2ba6b024b0b674b461a55bf7bf14af8cc17a
--- a/Trigger/TrigT1/TrigT1Result/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
@@ -3,15 +3,15 @@
 */
 
 /**
-@mainpage TrigT1Result Package
+@page TrigT1Result_page TrigT1Result Package
 
-@section TrigT1ResultIntro Introduction
+@section TrigT1Result_TrigT1ResultIntro Introduction
 
 This package contains the %LVL1 RoI, RDO and Result objects 
 produced by the RoIBuilder or the different %LVL1 subsystems.
 Usually they are written to RDO or BS files.
 
-@section TrigT1ResultOverview Class Overview
+@section TrigT1Result_TrigT1ResultOverview Class Overview
   The TrigT1Result package contains of following data classes:
 
   Result classes:
@@ -44,7 +44,7 @@ Usually they are written to RDO or BS files.
   For all classes, except ROIB::RecRoIBResult, a dictionary exist. 
   See @link TrigT1ResultDict.h @endlink and @link selection.xml @endlink for more details.
 
-@section TrigT1Result Extra Pages
+@section TrigT1Result_TrigT1Result Extra Pages
 
 - @ref used_TrigT1Result
 - @ref requirements_TrigT1Result
@@ -52,11 +52,9 @@ Usually they are written to RDO or BS files.
 
 /**
    @page used_TrigT1Result Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_TrigT1Result Requirements
-   @include requirements
 */
 
diff --git a/Trigger/TrigT1/TrigT1RoIB/doc/mainpage.h b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Trigger/TrigT1/TrigT1RoIB/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
index 8d22d8b2da36c346f0c3d6882bbfbdc66c77c888..99aee2a81901a7de9371e8b8f85c5feb001b2d5b
--- a/Trigger/TrigT1/TrigT1RoIB/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
@@ -3,18 +3,18 @@
 */
 
 /**
-@mainpage TrigT1RoIB Package
+@page TrigT1RoIB_page TrigT1RoIB Package
 
 @author Attila Kraznahorkay Jr. <Attila.Krasznahorkay@cern.ch>
 @author Wolfgang Ehrenfeld <Wolfgang.Ehrenfeld@desy.de>
 
-@section TrigT1RoIBIntro Introduction
+@section TrigT1RoIB_TrigT1RoIBIntro Introduction
 
 This package contains the simulation of the RoIBuilder running between LVL1
 and LVL2 producing the RoIBResult. In addition it contains helper 
 algorithms to access the ROIB::RoIBResult and ROIB::RecRoIBResult objects.
 
-@section TrigT1RoIBOverview Class Overview
+@section TrigT1RoIB_TrigT1RoIBOverview Class Overview
   The TrigT1RoIB package contains of following classes:
 
   - ROIB::RoIBuilder: simulation of the RoIBuilder process between LVL1 and LVL2
@@ -24,7 +24,7 @@ algorithms to access the ROIB::RoIBResult and ROIB::RecRoIBResult objects.
   - ROIB::RoIBTester: test algorithm for dumping ROIB::RoIBResult class
   - ROIB::RecRoIBTester: test algorithm for dumping ROIB::RecRoIBResult class
 
-@section TrigT1RoIBJobOptions Job Options
+@section TrigT1RoIB_TrigT1RoIBJobOptions Job Options
   The algorithms of the TrigT1RoIB package can be configured using configurables.
   For an example see TrigT1RoIBJobOptions.py:
   @include TrigT1RoIBJobOptions.py
@@ -40,7 +40,7 @@ algorithms to access the ROIB::RoIBResult and ROIB::RecRoIBResult objects.
   - @link ROIB::RoIBTester::RoIBTester @endlink
   - @link ROIB::RecRoIBTester::RecRoIBTester @endlink
 
-@section TrigT1RoIB Extra Pages
+@section TrigT1RoIB_TrigT1RoIB Extra Pages
 
 - @ref used_TrigT1RoIB
 - @ref requirements_TrigT1RoIB
@@ -48,11 +48,9 @@ algorithms to access the ROIB::RoIBResult and ROIB::RecRoIBResult objects.
 
 /**
    @page used_TrigT1RoIB Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_TrigT1RoIB Requirements
-   @include requirements
 */
 
diff --git a/Trigger/TrigT1/TrigT1TGC/doc/mainpage.h b/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h
similarity index 84%
rename from Trigger/TrigT1/TrigT1TGC/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h
index 05b196a4cc785b73be0aa9bfdd931581ba52d6f0..d675979bbd1f39a43ddf9cbf08a4930ae5a58ddb 100644
--- a/Trigger/TrigT1/TrigT1TGC/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-  @mainpage TrigT1TGC Package
+@page TrigT1TGC_page TrigT1TGC Package
 
   @author Chihiro Omachi<omati@phys.sci.kobe-u.ac.jp>
   @author Masaya Ishino<Masaya.Ishino@cern.ch>
   @author Naoko Kanaya<Naoko.Kanaya@cern.ch>   
 
-  @section TrigT1TGCIntro Introduction
+@section TrigT1TGC_TrigT1TGCIntro Introduction
 
   This package is dedicated to trigger electronic simulation for the endcap
   muon trigger system.
@@ -20,7 +20,7 @@
   The readout line is also emulated and it creats bare-RDO for digits and
   coincidences.
 
-  @section TrigT1TGCOverview Class Overview
+@section TrigT1TGC_TrigT1TGCOverview Class Overview
   
   The package contains the following algorithms:
 
@@ -36,15 +36,15 @@
   - @link LVL1TGCTrigger::LVL1TGCTrigger::LVL1TGCTrigger @endlink
   - @link LVL1TGCTrigger::CBNTAA_TGCMakeCoincidenceOut::CBNTAA_TGCMakeCoincidenceOut @endlink
 
-  @section TrigT1TGC Special configuration for cosmic run
+@section TrigT1TGC_TrigT1TGC Special configuration for cosmic run
   User can insert dummy hits to satisfy 2-station coincidence for cosmic muon trigger
   by the endcap muon trigger system. She/he can use CosmicM2.msk to make such a special configuration by
   LVL1TGCTrigger::LVL1TGCTrigger::MaskFileName="CosmicM2.msk"
 
-  @section TrigT1TGC Special configuration for a slow charged particle.
+@section TrigT1TGC_TrigT1TGC Special configuration for a slow charged particle.
   User can use all hits(i.e. associated to next bunch) by LVL1TGCTrigger::CurrentBunchTag=0   
 
-  @section TrigT1TGC Extra Packages
+@section TrigT1TGC_TrigT1TGC Extra Packages
   - @ref used_TrigT1TGC
   - @ref requirements_TrigT1TGC
 
@@ -52,10 +52,8 @@
 
 /**
    @page used_TrigT1TGC Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_TrigT1TGC Requirements
-   @include requirements
 */
diff --git a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/mainpage.h b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h
similarity index 78%
rename from Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h
index badea71521ff147ef08f2e38ed584dd218b57b74..37c27b62ab9a1e72e0aa3f92caa9a8c403d64c64 100644
--- a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h
@@ -3,25 +3,25 @@
 */
 
 /** 
-  @mainpage TrigT1TGCRecRoiSvc Package
+@page TrigT1TGCRecRoiSvc_page TrigT1TGCRecRoiSvc Package
 
   @author Chihiro Omachi<omati@phys.sci.kobe-u.ac.jp>
   @author Yoji Hasegawa<Yoji.Hasegawa@cern.ch>
   @author Naoko Kanaya<Naoko.Kanaya@cern.ch>
 
-  @section TrigT1TGCRecRoiSvcIntro Introduction
+@section TrigT1TGCRecRoiSvc_TrigT1TGCRecRoiSvcIntro Introduction
   
   This package provides tools to calculate RoI position and size for a 
   given RoI word with MuonGeoModel, TGCIdHelper and TGCCablingSvc.
 
 
-  @section TrigT1TGCRecRoiSvc Class Overview
+@section TrigT1TGCRecRoiSvc_TrigT1TGCRecRoiSvc Class Overview
   
   The packages includes one algorithm, TrigRecRoiSvc;
 
   - LVL1TGC::TGCRecRoiSvc: provide RoI size and center position.
 
-  @section TrigT1TGCRecRoiSvc methods
+@section TrigT1TGCRecRoiSvc_TrigT1TGCRecRoiSvc methods
 
   The following functions are available:
   
@@ -30,7 +30,7 @@
   - @link LVL1TGC::TGCRecRoiSvc::phi @endlink : get phi of RoI center
   - @link LVL1TGC::TGCRecRoiSvc::RoIsize @endlink : return the maximum/minimum eta and phi values for a given RoI word.
    
-  @section TrigT1TGCRecRoiSvc Extra Packages
+@section TrigT1TGCRecRoiSvc_TrigT1TGCRecRoiSvc Extra Packages
   - @ref used_TrigT1TGCRecRoiSvc
   - @ref requirements_TrigT1TGCRecRoiSvc
 
@@ -38,12 +38,10 @@
 
 /**
    @page used_TrigT1TGCRecRoiSvc Used Packages
-   @htmlinclude used_packages.html
 */
 
 /**
    @page requirements_TrigT1TGCRecRoiSvc Requirements
-   @include requirements
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1ZDC/doc/mainpage.h b/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h
similarity index 73%
rename from Trigger/TrigT1/TrigT1ZDC/doc/mainpage.h
rename to Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h
index 031115d88073cd81c498ffed4c68ca474f1ce719..e52b634c6aa60c2fd8e0ff4c8f9c821d4c91ac47 100644
--- a/Trigger/TrigT1/TrigT1ZDC/doc/mainpage.h
+++ b/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h
@@ -4,16 +4,15 @@
 
 /**
 
-@mainpage TrigT1ZDC Package
+@page TrigT1ZDC_page TrigT1ZDC Package
 
 @author William H. Bell <W.Bell@cern.ch>
 
-@section TrigT1ZDC_Overview Overview
+@section TrigT1ZDC_TrigT1ZDC_Overview Overview
 
 This package simulates the level 1 ZDC trigger electronics and provides 
 input for the CTP simulation.  The ZdcCTP contains 3 bits.
 
-@htmlinclude used_packages.html 
 
 */
 
diff --git a/Trigger/TrigTools/IDScanHitFilter/doc/mainpage.h b/Trigger/TrigTools/IDScanHitFilter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from Trigger/TrigTools/IDScanHitFilter/doc/mainpage.h
rename to Trigger/TrigTools/IDScanHitFilter/doc/packagedoc.h
index ded47ae222634c05c184a63bcdf15a7b0367cf0a..47d02054bf05aeca23ed196b13661e9779427290
--- a/Trigger/TrigTools/IDScanHitFilter/doc/mainpage.h
+++ b/Trigger/TrigTools/IDScanHitFilter/doc/packagedoc.h
@@ -4,16 +4,16 @@
 
 /**
 
-@mainpage IDScanHitFilter Package
+@page IDScanHitFilter_page IDScanHitFilter Package
 @author Nikos.Konstantinidis@cern.ch Dmitry.Emeliyanov@cern.ch
-@section IntroIDScanHitFilter Introduction
+@section IDScanHitFilter_IntroIDScanHitFilter Introduction
 
 This package contains the AlgTool that does the main part of pattern recognition of IDScan. For a full discription of all the 
 pattern recognition steps of IDScan, please look at 
 
 https://twiki.cern.ch/twiki/bin/view/Atlas/IDScanHowTo
 
-@section IDScanHitFilterProps IDScanHitFilter Properties:
+@section IDScanHitFilter_IDScanHitFilterProps IDScanHitFilter Properties:
 
    - PrintDiagnosticMessages : extra diagnostic printing to std::cout ( default false )
    - phiHalfWidth : RoI size in phi ( default 0.1 rads )
@@ -41,8 +41,6 @@ https://twiki.cern.ch/twiki/bin/view/Atlas/IDScanHowTo
    - phi0Bins_tight : As above, but tighter, for when origianl group of hits is large ( default 20000 )
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TrigTools/IDScanZFinder/doc/mainpage.h b/Trigger/TrigTools/IDScanZFinder/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from Trigger/TrigTools/IDScanZFinder/doc/mainpage.h
rename to Trigger/TrigTools/IDScanZFinder/doc/packagedoc.h
index 45e40a1790e608c50a8e706250cd01e82ae85495..d5de7d8c46440c42f5ae4c4510bacb1a462a1aed
--- a/Trigger/TrigTools/IDScanZFinder/doc/mainpage.h
+++ b/Trigger/TrigTools/IDScanZFinder/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page IDScanZFinder_page 
 @author Nikos.Konstantinidis@cern.ch Erkcan.Ozcan@cern.ch
-@section IntroIDScanZFinder Introduction
+@section IDScanZFinder_IntroIDScanZFinder Introduction
 
 This package contains the AlgTool IDScanZfinder that determines the z-position of the primary pp interaction
 before any track reconstruction. Full details about the algorithm used can be found in:
@@ -17,7 +17,7 @@ Some details of the parameters and how they are set can be found in:
 
 http://indico.cern.ch/getFile.py/access?contribId=1&resId=0&materialId=slides&confId=57832
 
-@section IDScanZFinderProps IDScanZfinder properties:
+@section IDScanZFinder_IDScanZFinderProps IDScanZfinder properties:
 
    - PhiBinSize : phi size of histogram bins ( default 0.2 degrees );
    - UseOnlyPixels  : if true, only use the pixel SPs ( default false );
@@ -40,8 +40,6 @@ http://indico.cern.ch/getFile.py/access?contribId=1&resId=0&materialId=slides&co
    - TripletDZ, TripletDK, TripletDP : Cuts applied in confirming/creating triplets ( default values 25., 0.005, 0.05 )
 
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TrigTools/TrigByteStreamTools/doc/mainpage.h b/Trigger/TrigTools/TrigByteStreamTools/doc/packagedoc.h
similarity index 90%
rename from Trigger/TrigTools/TrigByteStreamTools/doc/mainpage.h
rename to Trigger/TrigTools/TrigByteStreamTools/doc/packagedoc.h
index 9737cc97c7c5d523a552c1866501e38860e9fbae..de3b781fa19ac36a485e63b2c265bc7a873c92b4 100644
--- a/Trigger/TrigTools/TrigByteStreamTools/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigByteStreamTools/doc/packagedoc.h
@@ -4,10 +4,10 @@
 
 /**
 
-@mainpage TrigByteStreamTools
+@page TrigByteStreamTools_page TrigByteStreamTools
 @author Anna.Sfyrla@cern.ch Brian.Petersen@cern.ch Tomasz.Bold@cern.ch
 
-@section IntroTrigByteStreamTools Introduction
+@section TrigByteStreamTools_IntroTrigByteStreamTools Introduction
 
 This packages contains several small python scripts and python modules
 to ease the use of bytestream files
diff --git a/Trigger/TrigTools/TrigInDetToolInterfaces/doc/mainpage.h b/Trigger/TrigTools/TrigInDetToolInterfaces/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 88%
rename from Trigger/TrigTools/TrigInDetToolInterfaces/doc/mainpage.h
rename to Trigger/TrigTools/TrigInDetToolInterfaces/doc/packagedoc.h
index 1779689cd7ea7f425502d7c6f0d1e8288059724a..2cecbe16fee2977a5af792847d09e11cecc2a1dc
--- a/Trigger/TrigTools/TrigInDetToolInterfaces/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigInDetToolInterfaces/doc/packagedoc.h
@@ -4,13 +4,13 @@
 
 /**
 
-@mainpage TrigInDetToolInterfaces Package
+@page TrigInDetToolInterfaces_page TrigInDetToolInterfaces Package
 
 This package defines abstract interfaces for various LVL2 ID reconstruction tools.
 
 @author Dmitry.Emeliyanov@cern.ch
 
-@section TrigInDetToolInterfacesOverview Overview
+@section TrigInDetToolInterfaces_TrigInDetToolInterfacesOverview Overview
 
 The list of abstract interfaces is below:
 
diff --git a/Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/mainpage.h b/Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 89%
rename from Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/mainpage.h
rename to Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/packagedoc.h
index ebd0e9e6367d443d4604a12d56c84a47cf6de823..4a7d3a87133f92cd83f40e217937617ab817261f
--- a/Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage TrigInDetTrackExtrapolator Package
+@page TrigInDetTrackExtrapolator_page TrigInDetTrackExtrapolator Package
 
 This package contains an implementation of the LVL2 ID track extrapolator tool.
 This tool is based on an abstract interface ITrigInDetTrackExtrapolator.  
 
 @author Dmitry.Emeliyanov@cern.ch
 
-@section TrigInDetTrackFitOverview Overview
+@section TrigInDetTrackExtrapolator_TrigInDetTrackFitOverview Overview
 
 The main functonality of this tool is to provide extrapolation of TrigInDetTrack track
 parameters from perigee point to the calorimeter surface. Only track parameters are extrapolated, 
diff --git a/Trigger/TrigTools/TrigInDetTrackFitter/doc/mainpage.h b/Trigger/TrigTools/TrigInDetTrackFitter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 84%
rename from Trigger/TrigTools/TrigInDetTrackFitter/doc/mainpage.h
rename to Trigger/TrigTools/TrigInDetTrackFitter/doc/packagedoc.h
index 5d57eb7fb57178cce10d857e70e84b6e50f7b7c6..f7b2ff65cf9fe03030bfe0625ff31dd42a71cd7f
--- a/Trigger/TrigTools/TrigInDetTrackFitter/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigInDetTrackFitter/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage TrigInDetTrackFitter Package
+@page TrigInDetTrackFitter_page TrigInDetTrackFitter Package
 
 This package contains implementations of various track fitting tools for the LVL ID 
 tracking. All these tools are based on the same abstract interface: ITrigInDetTrackFitter.  
 
 @author Dmitry.Emeliyanov@cern.ch
 
-@section TrigInDetTrackFitIntro Introduction
+@section TrigInDetTrackFitter_TrigInDetTrackFitIntro Introduction
 
 The list of track fitting tools is below:
 
@@ -21,7 +21,7 @@ uses TrigSiSpacePoints directly, i.e. without dissolving them into clusters.
    - TrigInDetKarimakiFitter - a track fitter for TrigSiTrack
    - TrigInDetSctKFitter - an old fitter based on Sijin QIAN's code
 
-@section TrigInDetTrackFitOverview Overview
+@section TrigInDetTrackFitter_TrigInDetTrackFitOverview Overview
 
 The fitting tools make use of the following abstract interface 
 
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/doc/mainpage.h b/Trigger/TrigTools/TrigOnlineSpacePointTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 93%
rename from Trigger/TrigTools/TrigOnlineSpacePointTool/doc/mainpage.h
rename to Trigger/TrigTools/TrigOnlineSpacePointTool/doc/packagedoc.h
index 2ec17051592d8b26e252999ad53ff82bc57a9bb1..ff61a632e771af52a94d0c364466eec00e22968f
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/doc/packagedoc.h
@@ -4,7 +4,7 @@
 
 /**
 
-@mainpage TrigOnlineSpacePointTool Package
+@page TrigOnlineSpacePointTool_page TrigOnlineSpacePointTool Package
 
 This package contains implementation of a LVL2 data providing tool. 
 The TrigOnlineSpacePointTool has the following functionality:
@@ -17,7 +17,7 @@ the London Scheme which was used in releases before 10.0.6.
 
 @author Dmitry.Emeliyanov@cern.ch
 
-@section  TrigOnlineSpacePointTool Overview
+@section TrigOnlineSpacePointTool_TrigOnlineSpacePointTool Overview
 
 The tool is based on an abstract interface SpacePointProvider (defined in 
 Trigger/TrigTools/TrigSiSpacePointTool package). 
diff --git a/Trigger/TrigTools/TrigSiSpacePointTool/doc/mainpage.h b/Trigger/TrigTools/TrigSiSpacePointTool/doc/packagedoc.h
similarity index 87%
rename from Trigger/TrigTools/TrigSiSpacePointTool/doc/mainpage.h
rename to Trigger/TrigTools/TrigSiSpacePointTool/doc/packagedoc.h
index 61c4486d5e0c71c04edc416316a257b54af4c781..24c11a18592910a6ebe7ab3417a292f86453e56f 100644
--- a/Trigger/TrigTools/TrigSiSpacePointTool/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigSiSpacePointTool/doc/packagedoc.h
@@ -3,13 +3,13 @@
 */
 
 /**
-@mainpage TrigSiSpacePointTool  Package
+@page TrigSiSpacePointTool_page TrigSiSpacePointTool Package
 
 This package contains an interface class ISpacePointProvider
 
 @author D.Emeliyanov AT rlDOTacDOTuk
 
-@section TrigSiSpacePointToolIntro Introduction
+@section TrigSiSpacePointTool_TrigSiSpacePointToolIntro Introduction
 
 This package defines an abstract interface for the LVL2 Silicon 
 data providers (TrigOnlineSpacePointTool, TrigOfflineSpacePointTool and 
@@ -40,8 +40,7 @@ The interface defines the following methods
 
 Note that getSpacePoints methods are obsolete and must not be used. 
     
-@section TrigSiSpacePointToolReq Requirements
+@section TrigSiSpacePointTool_TrigSiSpacePointToolReq Requirements
 
-@include requirements
 
 */
diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/doc/mainpage.h b/Trigger/TrigTools/TrigT2CaloCalibration/doc/packagedoc.h
similarity index 82%
rename from Trigger/TrigTools/TrigT2CaloCalibration/doc/mainpage.h
rename to Trigger/TrigTools/TrigT2CaloCalibration/doc/packagedoc.h
index 654a30b56b5638c3f89b000bfdcf33d6aac322f5..5dca1cb2adb5ae010c276395d130bc59ea033cbf 100644
--- a/Trigger/TrigTools/TrigT2CaloCalibration/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigT2CaloCalibration/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage
+@page TrigT2CaloCalibration_page 
 @author Carlos Osuna
 @author Patricia Conde
 
-@section TrigT2CaloCalibrationOverview  Overview
+@section TrigT2CaloCalibration_TrigT2CaloCalibrationOverview Overview
 This package provides classes and methods to perform a Sampling Calibration 
 for L2 trigger. With EM energy, HAD energy and eta as input, it provides
 a fast calibration suitable for hadronic objects.
@@ -21,12 +21,10 @@ a fast calibration suitable for hadronic objects.
 
 /**
 @page used_TrigT2CaloCalibration Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigT2CaloCalibration Requirements
-@include requirements
 */
 
 
diff --git a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/mainpage.h b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/mainpage.h
rename to Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/packagedoc.h
index 0db9d700921c5b442f7220f30cdb502ec3fccd1e..7900cce3e64d3fe67d70bbf6f0edda798923ff1b
--- a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage TrigTRT_TrackExtensionTool Package
+@page TrigTRT_TrackExtensionTool_page TrigTRT_TrackExtensionTool Package
 
 This package contains implementation of the TRT track extension tool for the LVL2 ID tracking.
 The tool is based on an abstract interface ITrigTRT_TrackExtensionTool
 
 @author Dmitry.Emeliyanov@cern.ch
 
-@section TrigTRT_TrackExtensionIntro Introduction
+@section TrigTRT_TrackExtensionTool_TrigTRT_TrackExtensionIntro Introduction
 
 This tool takes a collection of TrigInDetTrack tracks and extends them into the TRT performing 
 "on-the-fly" pattern recognition and track fitting. Track parameters are updated so that no new 
@@ -22,7 +22,7 @@ Data Association Filter (PDAF). A detailed description of this method can be fou
 
 D. Emeliyanov, Nucl.Instr.and Meth., A566, 1, (2006) p 50.
 
-@section TrigTRT_TrackExtensionToolOverview Overview
+@section TrigTRT_TrackExtensionTool_TrigTRT_TrackExtensionToolOverview Overview
 
 The main method of the tool (inherited from an abstract interface) is 
 
diff --git a/Trigger/TrigTools/TrigTimeAlgs/doc/mainpage.h b/Trigger/TrigTools/TrigTimeAlgs/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from Trigger/TrigTools/TrigTimeAlgs/doc/mainpage.h
rename to Trigger/TrigTools/TrigTimeAlgs/doc/packagedoc.h
index 34e5cad7ab1897e6a1e3fed1720aed9a1346b59d..d8e6fa253613832aa2c5bc4e5d6692dce211c6fa
--- a/Trigger/TrigTools/TrigTimeAlgs/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigTimeAlgs/doc/packagedoc.h
@@ -4,11 +4,11 @@
 
 /**
 
-@mainpage
+@page TrigTimeAlgs_page 
 @author John Baines
 @author Tomasz Bold
 
-@section MyPackageOverview  Introducion
+@section TrigTimeAlgs_MyPackageOverview Introducion
 This package is defining utilities to be used within trigger community to measure times of execution.
 It contains basically 2 ingredients: <br/>
 
@@ -34,7 +34,6 @@ It contains basically 2 ingredients: <br/>
 For the whole picture look at: <a href="https://twiki.cern.ch/twiki/bin/view/Atlas/TrigTimerSvc"> TWIKI page explaining usage of all timing related utilities. </a>
 
 
-@htmlinclude used_packages.html
 
 
 */
diff --git a/Trigger/TrigTools/TrigVKalFitter/doc/mainpage.h b/Trigger/TrigTools/TrigVKalFitter/doc/packagedoc.h
similarity index 77%
rename from Trigger/TrigTools/TrigVKalFitter/doc/mainpage.h
rename to Trigger/TrigTools/TrigVKalFitter/doc/packagedoc.h
index 2a615936bd37467603f821d1c09ae8b74df8bd38..a61ae9bb3e75ba201e6a3753a79e9d4070f99cd8 100644
--- a/Trigger/TrigTools/TrigVKalFitter/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigVKalFitter/doc/packagedoc.h
@@ -4,17 +4,17 @@
 
 
 /**
-@mainpage TrigVKalFitter Package
+@page TrigVKalFitter_page TrigVKalFitter Package
 
 Collection of trigger related interfaces to VKalVrt core. 
 
 @author Vadim.Kostyukhin@cern.ch
 
-@section TrigVKalFitterIntro Introduction
+@section TrigVKalFitter_TrigVKalFitterIntro Introduction
 
 This package contains  interfaces to VKalVrt. 
 
-@section TrigVKalFitterOverview Class Overview
+@section TrigVKalFitter_TrigVKalFitterOverview Class Overview
 
   
  Some description of algorithms may be found in http://kostyuk.home.cern.ch/kostyuk/vertex/ and
@@ -30,11 +30,9 @@ This package contains  interfaces to VKalVrt.
 
 /**
 @page used_TrigVKalFitter Used Packages
-@htmlinclude used_packages.html
 */
 
 /**
 @page requirements_TrigVKalFitter Requirements
-@include requirements
 */
 
diff --git a/Trigger/TrigTools/TrigVertexFitter/doc/mainpage.h b/Trigger/TrigTools/TrigVertexFitter/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 95%
rename from Trigger/TrigTools/TrigVertexFitter/doc/mainpage.h
rename to Trigger/TrigTools/TrigVertexFitter/doc/packagedoc.h
index 3aeea612b9873fa84444c0b84808769a65178e57..adece53b2225d84de0f5aefe2318c063ef8716e5
--- a/Trigger/TrigTools/TrigVertexFitter/doc/mainpage.h
+++ b/Trigger/TrigTools/TrigVertexFitter/doc/packagedoc.h
@@ -4,14 +4,14 @@
 
 /**
 
-@mainpage TrigVertexFitter Package
+@page TrigVertexFitter_page TrigVertexFitter Package
 
 This package contains implementations of various vertex fitting tools for the LVL2 
 reconstruction. 
 
 @author Dmitry.Emeliyanov@cern.ch
 
-@section TrigVFIntro Introduction
+@section TrigVertexFitter_TrigVFIntro Introduction
 
 The package defines and implements the following class: 
 
@@ -36,7 +36,7 @@ The list of vertex fitting tools is below:
 
    - TrigVertexingTool - a toolbox to facilitate handling of TrigL2Vertex class
 
-@section TrigVFOverview How to use LVL2 vertexing tools: 
+@section TrigVertexFitter_TrigVFOverview How to use LVL2 vertexing tools:
 
   - Example I : fitting Ds(phi pi) vertex with phi(KK)
 
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/doc/mainpage.h b/Trigger/TriggerCommon/TriggerJobOpts/doc/packagedoc.h
similarity index 79%
rename from Trigger/TriggerCommon/TriggerJobOpts/doc/mainpage.h
rename to Trigger/TriggerCommon/TriggerJobOpts/doc/packagedoc.h
index cf12124f81de4c627f263ecdfc3bbfa2809d17b8..8d73731736b136f757baa3e8b8a4a371cc91f310 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/doc/mainpage.h
+++ b/Trigger/TriggerCommon/TriggerJobOpts/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage
+@page TriggerJobOpts_page 
 
-@section TriggerJobOptsIntroduction Introduction
+@section TriggerJobOpts_TriggerJobOptsIntroduction Introduction
 This package contains basic configuration scripts for Trigger.
 This are python Getters for HLT and LVL1 for various usecases.
 
@@ -15,8 +15,6 @@ It also contains global TriggerFlags container of job properties.
 This package does not contain code and is not meant to be used by developers.
 The usefull information is however set of flags defined in python::TriggerFlags .
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TriggerCommon/TriggerMenu/doc/mainpage.h b/Trigger/TriggerCommon/TriggerMenu/doc/packagedoc.h
similarity index 91%
rename from Trigger/TriggerCommon/TriggerMenu/doc/mainpage.h
rename to Trigger/TriggerCommon/TriggerMenu/doc/packagedoc.h
index ac29b96d0d853a93ca1317e39e95507f5b06b20a..a43f38b63bdbc9535a87daeaa4f1755f0a7876a4 100644
--- a/Trigger/TriggerCommon/TriggerMenu/doc/mainpage.h
+++ b/Trigger/TriggerCommon/TriggerMenu/doc/packagedoc.h
@@ -6,9 +6,9 @@
 
 
 
-@mainpage
+@page TriggerMenu_page 
 
-@section TrigerMenuPythonIntro Introduction
+@section TriggerMenu_TrigerMenuPythonIntro Introduction
 
 This package contains only python code which is used to dynamically
 generate XML configuration of trigger which are used by HLT::TrigSteer to schedule HLT selection.
@@ -24,8 +24,6 @@ There are 3 types of files here:<br/>
 3) generic script for generation - python::GenerateManu.py which drives all the generation. <br/>
    It is used by Trigger Getter modules defined in TriggerJobOpts package.
  
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/doc/mainpage.h b/Trigger/TriggerCommon/TriggerMenuXML/doc/packagedoc.h
similarity index 70%
rename from Trigger/TriggerCommon/TriggerMenuXML/doc/mainpage.h
rename to Trigger/TriggerCommon/TriggerMenuXML/doc/packagedoc.h
index a5c62b312a41f63682683c4013997088bfc3f8eb..7fa5a9b141995eabd47635cd7666643e2f5e0346 100644
--- a/Trigger/TriggerCommon/TriggerMenuXML/doc/mainpage.h
+++ b/Trigger/TriggerCommon/TriggerMenuXML/doc/packagedoc.h
@@ -6,15 +6,13 @@
 
 
 
-@mainpage
+@page TriggerMenuXML_page 
 
-@section TrigerMenuPythonIntro Introduction
+@section TriggerMenuXML_TrigerMenuPythonIntro Introduction
 
 This package contains only fozen trigger configurations in XML files.
 This files are meant to be used during productions. They should be for low/high luminosities.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/docs/.gitkeep b/docs/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/docs/mainpage.h b/docs/mainpage.h
deleted file mode 100644
index c4a425257dde79b80a290177fdb10a7f1d2dd33f..0000000000000000000000000000000000000000
--- a/docs/mainpage.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*! \mainpage ATLAS offline software
- *
- * \section intro_sec Introduction
- *
- * This is the documentation for ATLAS offline software.
- *
- * Please see the https://twiki.cern.ch/twiki/bin/view/AtlasComputing/AtlasComputing twiki for more information, or look at the documentation:
- * https://atlassoftwaredocs.web.cern.ch
- *
- */
\ No newline at end of file
diff --git a/graphics/GeometryJiveXML/doc/mainpage.h b/graphics/GeometryJiveXML/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 81%
rename from graphics/GeometryJiveXML/doc/mainpage.h
rename to graphics/GeometryJiveXML/doc/packagedoc.h
index afcdbda1f273f6510a6f8454aadc0fff1e695fe8..cb3d1b1d877f9cd86fefa4b94f4c3f16a4b28330
--- a/graphics/GeometryJiveXML/doc/mainpage.h
+++ b/graphics/GeometryJiveXML/doc/packagedoc.h
@@ -4,16 +4,14 @@
 
 /**
 
-@mainpage
+@page GeometryJiveXML_page 
 @author Nikos.Konstantinidis -at- cern.ch, Eric.Jansen -at- hef.ru.nl, Juergen.Thomas -at- cern.ch
-@section IntroGeometryJiveXML Introduction
+@section GeometryJiveXML_IntroGeometryJiveXML Introduction
 
 This package contains two AlgTools, GeometryWriter and MuonGeometryWriter, which produce two XML files with the geometry 
 information required by Atlantis. These AlgTools are used by EventData2XML (in graphics/JiveXML) when the jobOption
 EventData2XML.WriteGeometry is set to True.
 
-@htmlinclude used_packages.html
 
-@include requirements
 
 */
diff --git a/graphics/JiveXML/doc/mainpage.h b/graphics/JiveXML/doc/packagedoc.h
old mode 100755
new mode 100644
similarity index 94%
rename from graphics/JiveXML/doc/mainpage.h
rename to graphics/JiveXML/doc/packagedoc.h
index 568e332178c96c490ae8b540edceccf90fea9733..ed67821ca95008df31c9b8c618548b7a950df23b
--- a/graphics/JiveXML/doc/mainpage.h
+++ b/graphics/JiveXML/doc/packagedoc.h
@@ -4,9 +4,9 @@
 
 /**
 
-@mainpage JiveXML Package
+@page JiveXML_page JiveXML Package
 @author Nikos.Konstantinidis@cern.ch, Eric.Jansen@hef.ru.nl, Juergen.Thomas@cern.ch
-@section IntroJiveXML Introduction
+@section JiveXML_IntroJiveXML Introduction
 
 
 This is the core package containing the code for producing the XML event files for 
@@ -25,7 +25,7 @@ only for interesting or pathological events). However it is often simpler (and s
 produce an XML file for each event processed in athena. For this there is the athena Algorithm JiveXML::AlgoJiveXML,
 which does nothing but initialize and then execute the EventData2XML AlgTool.
 
-@section propsJiveXML JiveXML properties
+@section JiveXML_propsJiveXML JiveXML properties
 
    - FileNamePrefix : Prefix of output XML files ( default JiveXML )
    - AtlasRelease : The offline release version, appears in the XML files 
@@ -37,9 +37,7 @@ which does nothing but initialize and then execute the EventData2XML AlgTool.
    - IgnoreEventInfo : when True the event/run number are ignored and instead the XML file names have the form FileNamePrefix_0_X, where X is incremented every time EventData2XML is called. Potentially useful if you want to call EventData2XML more than once for the same event (e.g. for different Trigger RoIs?) ( default False )
 
 
-@htmlinclude used_packages.html
 
 
-@include requirements
 
 */