diff --git a/src/OpenFOAM/db/runTimeSelection/addToRunTimeSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H
similarity index 100%
rename from src/OpenFOAM/db/runTimeSelection/addToRunTimeSelectionTable.H
rename to src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H
diff --git a/src/OpenFOAM/db/runTimeSelection/runTimeSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
similarity index 100%
rename from src/OpenFOAM/db/runTimeSelection/runTimeSelectionTables.H
rename to src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
diff --git a/applications/test/dictionary/calcEntry/addToGlobalFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
similarity index 100%
rename from applications/test/dictionary/calcEntry/addToGlobalFunctionSelectionTable.H
rename to src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
diff --git a/applications/test/dictionary/calcEntry/globalFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
similarity index 100%
rename from applications/test/dictionary/calcEntry/globalFunctionSelectionTables.H
rename to src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
diff --git a/src/OpenFOAM/db/memberFunctionSelection/addToMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
similarity index 100%
rename from src/OpenFOAM/db/memberFunctionSelection/addToMemberFunctionSelectionTable.H
rename to src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
diff --git a/src/OpenFOAM/db/memberFunctionSelection/memberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
similarity index 100%
rename from src/OpenFOAM/db/memberFunctionSelection/memberFunctionSelectionTables.H
rename to src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
diff --git a/applications/test/dictionary/calcEntry/addToStaticMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
similarity index 100%
rename from applications/test/dictionary/calcEntry/addToStaticMemberFunctionSelectionTable.H
rename to src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
diff --git a/applications/test/dictionary/calcEntry/staticMemberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
similarity index 100%
rename from applications/test/dictionary/calcEntry/staticMemberFunctionSelectionTables.H
rename to src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H