diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index a2c32b809bfcb8ca1acb68354e0100899ba4df60..1d7f39dd1ae8eb17407591d193df3d1cdf0e9d03 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -161,7 +161,6 @@ $(dictionaryEntry)/dictionaryEntryIO.C
 
 functionEntries = $(dictionary)/functionEntries
 $(functionEntries)/codeStream/codeStream.C
-$(functionEntries)/codeStream/codeStreamTools.C
 $(functionEntries)/functionEntry/functionEntry.C
 $(functionEntries)/includeEntry/includeEntry.C
 $(functionEntries)/includeIfPresentEntry/includeIfPresentEntry.C
@@ -199,7 +198,10 @@ $(regIOobject)/regIOobjectWrite.C
 db/IOobjectList/IOobjectList.C
 db/objectRegistry/objectRegistry.C
 db/CallbackRegistry/CallbackRegistryName.C
-db/dlLibraryTable/dlLibraryTable.C
+
+dll = db/dynamicLibrary
+$(dll)/codeStream/codeStreamTools.C
+$(dll)/dlLibraryTable/dlLibraryTable.C
 
 db/functionObjects/functionObject/functionObject.C
 db/functionObjects/functionObjectList/functionObjectList.C
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStreamTools.C b/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.C
similarity index 100%
rename from src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStreamTools.C
rename to src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.C
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStreamTools.H b/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.H
similarity index 100%
rename from src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStreamTools.H
rename to src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.H
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
similarity index 100%
rename from src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
rename to src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
similarity index 100%
rename from src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
rename to src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTableTemplates.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C
similarity index 97%
rename from src/OpenFOAM/db/dlLibraryTable/dlLibraryTableTemplates.C
rename to src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C
index e98cb1932ca835de788d07e33d97e23621725b28..13a9ae919f178531f9835e217c268f5a9616e164 100644
--- a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTableTemplates.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License