diff --git a/applications/test/PatchTools/Make/options b/applications/test/PatchTools/Make/options
index 3d00e249a6..b6fa4bff16 100644
--- a/applications/test/PatchTools/Make/options
+++ b/applications/test/PatchTools/Make/options
@@ -1,7 +1,9 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfileFormats \
+    -lsurfMesh \
+    -lmeshTools
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index be222d83da..2d52c3e4f5 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.C
@@ -33,11 +33,8 @@ Description
 
 #include "PatchTools.H"
 #include "argList.H"
-#include "fvMesh.H"
-#include "volFields.H"
 #include "Time.H"
 #include "OBJstream.H"
-#include "fvCFD.H"
 
 using namespace Foam;
 
diff --git a/applications/test/surfaceIntersection/Make/options b/applications/test/surfaceIntersection/Make/options
index 5ae72ebd31..b6fa4bff16 100644
--- a/applications/test/surfaceIntersection/Make/options
+++ b/applications/test/surfaceIntersection/Make/options
@@ -1,7 +1,9 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
index c8ce655c3d..b06cbaa05c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
@@ -8,6 +9,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools \
     -ldynamicMesh \
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
index 3ce62891e7..b65c905e0f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
@@ -25,6 +25,8 @@ EXE_INC = \
 
 LIB_LIBS = \
     ${CGAL_LIBS} \
+    -lfileFormats \
+    -lsurfMesh \
     -lmeshTools \
     -ldecompose \
     -ldynamicMesh \
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/Make/options
index df9419059b..39fd117548 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/Make/options
+++ b/applications/utilities/surface/surfaceBooleanFeatures/Make/options
@@ -16,10 +16,12 @@ EXE_INC = \
     ${CGAL_INC} \
     ${c++CGALWARN} \
     $(COMP_FLAGS) \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools \
     $(LINK_FLAGS)
diff --git a/applications/utilities/surface/surfaceCheck/Make/options b/applications/utilities/surface/surfaceCheck/Make/options
index 5ae72ebd31..b6fa4bff16 100644
--- a/applications/utilities/surface/surfaceCheck/Make/options
+++ b/applications/utilities/surface/surfaceCheck/Make/options
@@ -1,7 +1,9 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools
diff --git a/applications/utilities/surface/surfaceInflate/Make/options b/applications/utilities/surface/surfaceInflate/Make/options
index 5ae72ebd31..b6fa4bff16 100644
--- a/applications/utilities/surface/surfaceInflate/Make/options
+++ b/applications/utilities/surface/surfaceInflate/Make/options
@@ -1,7 +1,9 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools
diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files
index e08ede224e..cf37026392 100644
--- a/src/fileFormats/Make/files
+++ b/src/fileFormats/Make/files
@@ -25,7 +25,8 @@ $(part)/surface/ensightOutputSurface.C
 ensight/read/ensightReadFile.C
 ensight/type/ensightPTraits.C
 
-nas/NASCore.C
+nastran/NASCore.C
+obj/OBJstream.C
 fire/FIRECore.C
 starcd/STARCDCore.C
 stl/STLCore.C
@@ -34,11 +35,11 @@ stl/STLAsciiParseFlex.L
 stl/STLAsciiParseManual.C
 stl/STLAsciiParseRagel.cc
 
+vtk/base/foamVtkCore.C
+vtk/base/foamVtkPTraits.C
 vtk/file/foamVtkFileWriter.C
 vtk/file/foamVtkSeriesWriter.C
 vtk/file/foamVtmWriter.C
-vtk/core/foamVtkCore.C
-vtk/core/foamVtkPTraits.C
 
 vtk/format/foamVtkFormatter.C
 vtk/format/foamVtkAsciiFormatter.C
diff --git a/src/fileFormats/nas/NASCore.C b/src/fileFormats/nastran/NASCore.C
similarity index 100%
rename from src/fileFormats/nas/NASCore.C
rename to src/fileFormats/nastran/NASCore.C
diff --git a/src/fileFormats/nas/NASCore.H b/src/fileFormats/nastran/NASCore.H
similarity index 92%
rename from src/fileFormats/nas/NASCore.H
rename to src/fileFormats/nastran/NASCore.H
index 85297e8639..24a5afcede 100644
--- a/src/fileFormats/nas/NASCore.H
+++ b/src/fileFormats/nastran/NASCore.H
@@ -46,7 +46,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class Ostream;
 
 namespace fileFormats
@@ -93,14 +93,6 @@ public:
         //- Extract numbers from things like "-2.358-8" (same as "-2.358e-8")
         static scalar readNasScalar(const std::string& str);
 
-        //- Deprecated(2017-09)
-        //  Extract numbers from things like "-2.358-8" (same as "-2.358e-8")
-        //  \deprecated(2017-09) - use readNasScalar() method
-        inline static scalar parseNASCoord(const std::string& str)
-        {
-            return readNasScalar(str);
-        }
-
         //- A string::substr() to handle fixed-format and free-format NASTRAN.
         //  Returns the substr to the next comma (if found) or the given length
         //
@@ -128,7 +120,6 @@ public:
             const word& keyword,
             const fieldFormat format
         );
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.C b/src/fileFormats/obj/OBJstream.C
similarity index 100%
rename from src/surfMesh/surfaceFormats/obj/OBJstream.C
rename to src/fileFormats/obj/OBJstream.C
diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.H b/src/fileFormats/obj/OBJstream.H
similarity index 100%
rename from src/surfMesh/surfaceFormats/obj/OBJstream.H
rename to src/fileFormats/obj/OBJstream.H
diff --git a/src/fileFormats/vtk/core/foamVtkCore.C b/src/fileFormats/vtk/base/foamVtkCore.C
similarity index 100%
rename from src/fileFormats/vtk/core/foamVtkCore.C
rename to src/fileFormats/vtk/base/foamVtkCore.C
diff --git a/src/fileFormats/vtk/core/foamVtkCore.H b/src/fileFormats/vtk/base/foamVtkCore.H
similarity index 100%
rename from src/fileFormats/vtk/core/foamVtkCore.H
rename to src/fileFormats/vtk/base/foamVtkCore.H
diff --git a/src/fileFormats/vtk/core/foamVtkPTraits.C b/src/fileFormats/vtk/base/foamVtkPTraits.C
similarity index 100%
rename from src/fileFormats/vtk/core/foamVtkPTraits.C
rename to src/fileFormats/vtk/base/foamVtkPTraits.C
diff --git a/src/fileFormats/vtk/core/foamVtkPTraits.H b/src/fileFormats/vtk/base/foamVtkPTraits.H
similarity index 100%
rename from src/fileFormats/vtk/core/foamVtkPTraits.H
rename to src/fileFormats/vtk/base/foamVtkPTraits.H
diff --git a/src/mesh/blockMesh/Make/options b/src/mesh/blockMesh/Make/options
index d4e05ad7cb..94e7ebba03 100644
--- a/src/mesh/blockMesh/Make/options
+++ b/src/mesh/blockMesh/Make/options
@@ -4,5 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 93f1f04c99..dd2b0a6ec2 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -13,8 +13,8 @@ $(edgeMeshFormats)/edgeMesh/edgeMeshFormatRunTime.C
 $(edgeMeshFormats)/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C
 $(edgeMeshFormats)/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C
 
-$(edgeMeshFormats)/nas/NASedgeFormat.C
-$(edgeMeshFormats)/nas/NASedgeFormatRunTime.C
+$(edgeMeshFormats)/nastran/NASedgeFormat.C
+$(edgeMeshFormats)/nastran/NASedgeFormatRunTime.C
 
 $(edgeMeshFormats)/obj/OBJedgeFormat.C
 $(edgeMeshFormats)/obj/OBJedgeFormatRunTime.C
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormat.C
similarity index 100%
rename from src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C
rename to src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormat.C
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormat.H
similarity index 100%
rename from src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H
rename to src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormat.H
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormatRunTime.C b/src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormatRunTime.C
similarity index 100%
rename from src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormatRunTime.C
rename to src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormatRunTime.C
diff --git a/src/overset/Make/options b/src/overset/Make/options
index 427f266c20..a7910ecd4b 100644
--- a/src/overset/Make/options
+++ b/src/overset/Make/options
@@ -5,7 +5,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
@@ -15,6 +14,7 @@ EXE_INC = \
 
 LIB_LIBS = \
     -lfiniteVolume \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools \
     -lblockMesh \
diff --git a/src/parallel/distributed/Make/options b/src/parallel/distributed/Make/options
index 5bc6c63b9f..52dbd07c96 100644
--- a/src/parallel/distributed/Make/options
+++ b/src/parallel/distributed/Make/options
@@ -1,11 +1,13 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools \
     -ldecompositionMethods
diff --git a/src/surfMesh/Make/files b/src/surfMesh/Make/files
index b66ffee772..155153d07e 100644
--- a/src/surfMesh/Make/files
+++ b/src/surfMesh/Make/files
@@ -32,7 +32,6 @@ $(surfaceFormats)/gts/GTSsurfaceFormatRunTime.C
 $(surfaceFormats)/gts/triSurfaceGTSformat.C
 $(surfaceFormats)/nas/NASsurfaceFormatRunTime.C
 $(surfaceFormats)/obj/OBJsurfaceFormatRunTime.C
-$(surfaceFormats)/obj/OBJstream.C
 $(surfaceFormats)/off/OFFsurfaceFormatRunTime.C
 $(surfaceFormats)/smesh/SMESHsurfaceFormatRunTime.C
 $(surfaceFormats)/starcd/STARCDsurfaceFormatCore.C
diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options
index 72bf81ead4..c5f90ecd3e 100644
--- a/src/thermophysicalModels/radiation/Make/options
+++ b/src/thermophysicalModels/radiation/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
@@ -13,6 +14,7 @@ EXE_INC = \
 
 LIB_LIBS = \
     -lfiniteVolume \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools \
     -lcompressibleTransportModels \
diff --git a/src/topoChangerFvMesh/Make/options b/src/topoChangerFvMesh/Make/options
index c1d3667b32..e1f704d20e 100644
--- a/src/topoChangerFvMesh/Make/options
+++ b/src/topoChangerFvMesh/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
@@ -7,6 +8,7 @@ EXE_INC = \
 
 LIB_LIBS = \
     -lfiniteVolume \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools \
     -ldynamicMesh \