diff --git a/bin/doxyFilt b/bin/doxyFilt
index 40d4fadd11b27f94c8deb1cf933c731a307497d0..7bbb5a4ba8032185ca8d7892a5bfc40cbbe680c0 100755
--- a/bin/doxyFilt
+++ b/bin/doxyFilt
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamAllHC b/bin/foamAllHC
index 3d68b5467b9d7e531c24eabd183c33c5411b2ef6..bf90df16bdc49c3757c0e54582d845589e6101b2 100755
--- a/bin/foamAllHC
+++ b/bin/foamAllHC
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamCheckJobs b/bin/foamCheckJobs
index 8812c964669dfb4dc362761836530ac1f192b9a5..c26befc4c03b8ac8773b8bfaedc4118e9a4810b3 100755
--- a/bin/foamCheckJobs
+++ b/bin/foamCheckJobs
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamCleanTutorials b/bin/foamCleanTutorials
index ccc9f320b030410b18988fb83bd5562cbdbd3fde..1e022460c1dc3494ce3773a08a170459efd01e9a 100755
--- a/bin/foamCleanTutorials
+++ b/bin/foamCleanTutorials
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/bin/foamCopySettings b/bin/foamCopySettings
index 1a41a3a59f2556b7d764b663e36ffd8fca02f61a..9c22cb13d344d00ab66b7b7d1de20702052894fd 100755
--- a/bin/foamCopySettings
+++ b/bin/foamCopySettings
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamDistccd b/bin/foamDistccd
index 2a450a2b1714aee1b30ec28b49bc1450b9c55634..38bfd05c3c99c601f6af1a3d63683a2059f0f6d7 100755
--- a/bin/foamDistccd
+++ b/bin/foamDistccd
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamEbrowse b/bin/foamEbrowse
index 365d0fa60590433b2986606a63616f6eb68c4169..b62137615097ba18e007ae624331633220b81a77 100755
--- a/bin/foamEbrowse
+++ b/bin/foamEbrowse
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamEndJob b/bin/foamEndJob
index 1964d86100c0bd46a4146cf6de2395512e4c3b5b..f82f7409ce9f36b714edc2714ee628952d78e04e 100755
--- a/bin/foamEndJob
+++ b/bin/foamEndJob
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamGraphExecTime b/bin/foamGraphExecTime
index 3dc2fa2c70b78e5f697c6c550d5dac731293db8a..82671151ac3a35be3b59b9c051334697b30858ca 100755
--- a/bin/foamGraphExecTime
+++ b/bin/foamGraphExecTime
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamGraphResKE b/bin/foamGraphResKE
index d00798f507f936c038e5904b10b0f8ec87b5cf19..22254fc2438c70d7bba633f0932adfc935c4b7fa 100755
--- a/bin/foamGraphResKE
+++ b/bin/foamGraphResKE
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamGraphResUVWP b/bin/foamGraphResUVWP
index 1b34258fcf29cea7b50c6a1a047da65a4cea5795..3d9433e17e00273579190979247dbefa0e9d8784 100755
--- a/bin/foamGraphResUVWP
+++ b/bin/foamGraphResUVWP
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index eacda19ccea72367443d72532d9685f17b2927b0..708c63841026d556d4fcde194276e2eb5549f099 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamLog b/bin/foamLog
index 06b2a2c5dc3960b6ecd70313e2e0dc03b8e1cbb6..d33d8e317f787444b28cc8f31430c9f37f523a61 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamNew b/bin/foamNew
index fde1aa1979aab6445f1b65f71d51d3415fb70d27..a1d66f225ec71d9a40a69f7901fde701aa9cd622 100755
--- a/bin/foamNew
+++ b/bin/foamNew
@@ -27,7 +27,7 @@
 #     foamNew
 #
 # Description
-#     Create a new standard OpenFOAM source file
+#     Create a new standard OpenFOAM source or template file
 #
 #------------------------------------------------------------------------------
 usage() {
@@ -50,11 +50,11 @@ USAGE
 case "$1" in
 source)
     shift
-    $WM_PROJECT_DIR/bin/templates/source/foamNewSource $*
+    $WM_PROJECT_DIR/etc/codeTemplates/source/foamNewSource $*
     ;;
 template)
     shift
-    $WM_PROJECT_DIR/bin/templates/sourceTemplate/foamNewTemplate $*
+    $WM_PROJECT_DIR/etc/codeTemplates/template/foamNewTemplate $*
     ;;
 *)
     usage "unknown type"
diff --git a/bin/foamNewSource b/bin/foamNewSource
index 1195efa3f39f472e565be8430b8ebe97a77cfef1..f0c46dbdcb9533d490f80cdf6af8719c46e32862 120000
--- a/bin/foamNewSource
+++ b/bin/foamNewSource
@@ -1 +1 @@
-templates/source/foamNewSource
\ No newline at end of file
+../etc/codeTemplates/source/foamNewSource
\ No newline at end of file
diff --git a/bin/foamNewTemplate b/bin/foamNewTemplate
index daefeb49292eb14d9760188d1b3ec70c4e6133d3..1dabe112040cde10e16bfa82847ec48f9a077522 120000
--- a/bin/foamNewTemplate
+++ b/bin/foamNewTemplate
@@ -1 +1 @@
-templates/sourceTemplate/foamNewTemplate
\ No newline at end of file
+../etc/codeTemplates/template/foamNewTemplate
\ No newline at end of file
diff --git a/bin/foamPack b/bin/foamPack
index a719f9e23e186a227ab1e920e4af84b34eb609a7..26b356b94923d18c0317db272403a6f8b167547a 100755
--- a/bin/foamPack
+++ b/bin/foamPack
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackBin b/bin/foamPackBin
index 00d60ba5f04989ceb5601e5e1bf35373ba59c0c7..5d8e4a0f2451309c6b31865a50d86c36212583be 100755
--- a/bin/foamPackBin
+++ b/bin/foamPackBin
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackBinAll b/bin/foamPackBinAll
index 57673e980366deeaaa452c67a7e9f3322b1add16..196d91d0f9b5e6407bc5c2dd8d1bc4147b3d7f9d 100755
--- a/bin/foamPackBinAll
+++ b/bin/foamPackBinAll
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackDoxygen b/bin/foamPackDoxygen
index 4503470846a85e21700461cf75d887eadd81ebe7..9da368b36fa31544b76e4a213e80a176fb412064 100755
--- a/bin/foamPackDoxygen
+++ b/bin/foamPackDoxygen
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackGeneral b/bin/foamPackGeneral
index e55d834bce39787b57af0169090dad20513595ad..8aa109c15e998459f10ad7c1a8fc8feb8be936e1 100755
--- a/bin/foamPackGeneral
+++ b/bin/foamPackGeneral
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackSource b/bin/foamPackSource
index dbb1860bca4b8e5fcf4560c120b567354255ffa3..6b474f4e7c6b9029215afe60d877d7a1173b7b4d 100755
--- a/bin/foamPackSource
+++ b/bin/foamPackSource
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackThirdPartyBin b/bin/foamPackThirdPartyBin
index b9363f68740568fe5f66eed338b95f5ee385e154..12271682e5dc73f4850983cec5578bed4fd1c6f2 100755
--- a/bin/foamPackThirdPartyBin
+++ b/bin/foamPackThirdPartyBin
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackThirdPartyGeneral b/bin/foamPackThirdPartyGeneral
index a690f7f4481d5e12e7db3bcfad2a4c9de018d15e..fdc54272f74e69d54998783df4c6f194ad606427 100755
--- a/bin/foamPackThirdPartyGeneral
+++ b/bin/foamPackThirdPartyGeneral
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPrintJobs b/bin/foamPrintJobs
index a2851f29029b4396922e9062cc9562d438f82cda..57d6ebd5d94b9524f7a3db5973b9bf489b435d24 100755
--- a/bin/foamPrintJobs
+++ b/bin/foamPrintJobs
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamProcessInfo b/bin/foamProcessInfo
index dc8a9e650ceb2f05457e3cf268de9525fc173b83..7a3577c275d087df447bd65a3c0878bfa7eea722 100755
--- a/bin/foamProcessInfo
+++ b/bin/foamProcessInfo
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials
index 210b1bcc60605ba4a112f87700d77456968f2aee..7c52b6b9e1793eca994bc47f593ea6ad06e14817 100755
--- a/bin/foamRunTutorials
+++ b/bin/foamRunTutorials
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/bin/foamSolverSweeps b/bin/foamSolverSweeps
index 61f34279c44bc787aea0a7ee4ee43b31436b635c..29df1dabe4509455aa6c941c3c474b399dc2a18e 100755
--- a/bin/foamSolverSweeps
+++ b/bin/foamSolverSweeps
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamSystemCheck b/bin/foamSystemCheck
index 63f0f51e16fd17d9f33e1733ba0fff1558167db0..0d739d64fae008920631fa68ef0a7e873f621446 100755
--- a/bin/foamSystemCheck
+++ b/bin/foamSystemCheck
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamTags b/bin/foamTags
index 9c173497f600f2e64bf174c4f9f6b54bffa7e333..18ad697768d0ab0da6fbd3e1e728611cab0795e1 100755
--- a/bin/foamTags
+++ b/bin/foamTags
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/mpirunDebug b/bin/mpirunDebug
index a62aa938765b33dc8fba0813406ceb30fa2baf00..6869e64e30a8f25f45395862f15ef42a4970a830 100755
--- a/bin/mpirunDebug
+++ b/bin/mpirunDebug
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rmclassall b/bin/rmclassall
index c4fcc786a796f11a6088b5f05b7e6ad503196f27..3edbd1e1b0445fdf383ea0003aeed82c043ea01f 100755
--- a/bin/rmclassall
+++ b/bin/rmclassall
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rmcore b/bin/rmcore
index 1ec818057d027d32a0851397d7f2d5c7c6b58976..24e630dac4ff747b48f401525af0f6cda6b108fc 100755
--- a/bin/rmcore
+++ b/bin/rmcore
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rmdepold b/bin/rmdepold
index c633ce04c3db9d8c2a8fe5da5ba2a7fed25dc6ca..d0aceceae27bb67969cb74dd689c6893a42609c9 100755
--- a/bin/rmdepold
+++ b/bin/rmdepold
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rmoall b/bin/rmoall
index 0cc46f4a948747a849450d0f5b961ce83e13faca..3221d680cfe6ca8e2198c722bf0c06715b8af5e1 100755
--- a/bin/rmoall
+++ b/bin/rmoall
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rm~all b/bin/rm~all
index df03c3af58b053b6461fbed08c033f387b4b0127..afc658b76bafe3868584e2f8d84d3ea45b97542d 100755
--- a/bin/rm~all
+++ b/bin/rm~all
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index 5e0ea64c5ed6fd7869c64ab8ca4e03d28bcf2a72..d1a29b464c6993a0762bb4535935511c2647dbb1 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index e2c335b05b11c3b4a6b76cbd3102ce7fa63bde78..9e5f412fe23b8ce9cb30058f152f92bb954ed368 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/bin/tools/doxyFilt-ignore.awk b/bin/tools/doxyFilt-ignore.awk
index eda0dc7160746d728a375fb06971d91f1586dbb8..50de7e67425486b565a449123807671095100e69 100644
--- a/bin/tools/doxyFilt-ignore.awk
+++ b/bin/tools/doxyFilt-ignore.awk
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 # -----------------------------------------------------------------------------
 # License
diff --git a/bin/tools/doxyFilt-top.awk b/bin/tools/doxyFilt-top.awk
index 06a5d2ac85d1386e0ae1a66007e94aed8e5976dd..9cb87afd70818e338e075f105163d67768ae1e99 100644
--- a/bin/tools/doxyFilt-top.awk
+++ b/bin/tools/doxyFilt-top.awk
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/bin/tools/doxyFilt.awk b/bin/tools/doxyFilt.awk
index a7751f9fb948684e771a86a5d50fa13e78594c25..8562ee08bd1009681bb87cb67ac49afbbd81cbd9 100644
--- a/bin/tools/doxyFilt.awk
+++ b/bin/tools/doxyFilt.awk
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 # -----------------------------------------------------------------------------
 # License
diff --git a/bin/tools/gtagsrc b/bin/tools/gtagsrc
index ce66e0c084a8188bf63b707880344ccc18813143..a5564c6ffdc4f787209f2a517cffb14639731874 100644
--- a/bin/tools/gtagsrc
+++ b/bin/tools/gtagsrc
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/touchapp b/bin/touchapp
index a753357566553cd1d4d6bccb9c4b74fb9f3f5cdc..79ff05885e7b4d0c36ccc7ab7ee82b40624cb207 100755
--- a/bin/touchapp
+++ b/bin/touchapp
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/touchdep b/bin/touchdep
index 56afff2456b9ae8f8897b9f30788add0b507a295..9db4c9f015885f1f9030224818887f7e94e82408 100755
--- a/bin/touchdep
+++ b/bin/touchdep
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/touchlib b/bin/touchlib
index 589084d2f1e91a6b9056a6801e93ae22ce33191f..c98f9afbb0fc6f05bebd32ac21887e24936e93ed 100755
--- a/bin/touchlib
+++ b/bin/touchlib
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/toucho b/bin/toucho
index 82ef064ac30926417e053b03a4632cd078c2a544..feeb4b0cb8deb18d917428e1b68370073b3a2dbc 100755
--- a/bin/toucho
+++ b/bin/toucho
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/templates/foamCommentStyles b/etc/codeTemplates/foamCommentStyles
similarity index 100%
rename from bin/templates/foamCommentStyles
rename to etc/codeTemplates/foamCommentStyles
diff --git a/bin/templates/foamScript b/etc/codeTemplates/foamScript
similarity index 100%
rename from bin/templates/foamScript
rename to etc/codeTemplates/foamScript
diff --git a/bin/templates/source/_Template.C b/etc/codeTemplates/source/_Template.C
similarity index 100%
rename from bin/templates/source/_Template.C
rename to etc/codeTemplates/source/_Template.C
diff --git a/bin/templates/source/_Template.H b/etc/codeTemplates/source/_Template.H
similarity index 100%
rename from bin/templates/source/_Template.H
rename to etc/codeTemplates/source/_Template.H
diff --git a/bin/templates/source/_TemplateApp.C b/etc/codeTemplates/source/_TemplateApp.C
similarity index 100%
rename from bin/templates/source/_TemplateApp.C
rename to etc/codeTemplates/source/_TemplateApp.C
diff --git a/bin/templates/source/_TemplateI.H b/etc/codeTemplates/source/_TemplateI.H
similarity index 100%
rename from bin/templates/source/_TemplateI.H
rename to etc/codeTemplates/source/_TemplateI.H
diff --git a/bin/templates/source/_TemplateIO.C b/etc/codeTemplates/source/_TemplateIO.C
similarity index 100%
rename from bin/templates/source/_TemplateIO.C
rename to etc/codeTemplates/source/_TemplateIO.C
diff --git a/bin/templates/source/foamNewSource b/etc/codeTemplates/source/foamNewSource
similarity index 96%
rename from bin/templates/source/foamNewSource
rename to etc/codeTemplates/source/foamNewSource
index 8924b09448226eee99be2b3df38cfba366d859b5..ee6483e4e720850de38fd4a9c34118024269a91a 100755
--- a/bin/templates/source/foamNewSource
+++ b/etc/codeTemplates/source/foamNewSource
@@ -31,12 +31,12 @@
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
-Template="$WM_PROJECT_DIR/bin/templates/source/_Template"
+Template="$WM_PROJECT_DIR/etc/codeTemplates/source/_Template"
 
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-Usage: $Script <type> <class name>
+Usage: $Script <type> <ClassName>
 
 * create a new standard OpenFOAM source file
 
diff --git a/bin/templates/sourceTemplate/_TemplateTemplate.C b/etc/codeTemplates/template/_TemplateTemplate.C
similarity index 100%
rename from bin/templates/sourceTemplate/_TemplateTemplate.C
rename to etc/codeTemplates/template/_TemplateTemplate.C
diff --git a/bin/templates/sourceTemplate/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H
similarity index 100%
rename from bin/templates/sourceTemplate/_TemplateTemplate.H
rename to etc/codeTemplates/template/_TemplateTemplate.H
diff --git a/bin/templates/sourceTemplate/_TemplateTemplateI.H b/etc/codeTemplates/template/_TemplateTemplateI.H
similarity index 100%
rename from bin/templates/sourceTemplate/_TemplateTemplateI.H
rename to etc/codeTemplates/template/_TemplateTemplateI.H
diff --git a/bin/templates/sourceTemplate/_TemplateTemplateIO.C b/etc/codeTemplates/template/_TemplateTemplateIO.C
similarity index 100%
rename from bin/templates/sourceTemplate/_TemplateTemplateIO.C
rename to etc/codeTemplates/template/_TemplateTemplateIO.C
diff --git a/bin/templates/sourceTemplate/foamNewTemplate b/etc/codeTemplates/template/foamNewTemplate
similarity index 92%
rename from bin/templates/sourceTemplate/foamNewTemplate
rename to etc/codeTemplates/template/foamNewTemplate
index 8045a5cac67b2d25c9681f297b31896d8cc20a43..446bc6df65f49c921d2317e76020b7a2b9288346 100755
--- a/bin/templates/sourceTemplate/foamNewTemplate
+++ b/etc/codeTemplates/template/foamNewTemplate
@@ -31,15 +31,15 @@
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
-Template="$WM_PROJECT_DIR/bin/templates/sourceTemplate/_TemplateTemplate"
+Template="$WM_PROJECT_DIR/etc/codeTemplates/template/_TemplateTemplate"
 
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-Usage: $Script <type> <Class name> <Template arguments...>
+Usage: $Script <type> <ClassName> <Template arguments...>
 
-* create a new standard OpenFOAM source file
+* create a new standard OpenFOAM source file for templated classes
 
 type: (C|H|I|IO)