diff --git a/src/coreComponents/physicsSolvers/CMakeLists.txt b/src/coreComponents/physicsSolvers/CMakeLists.txt
index dbf4df9e509..ee5c8ff2a0b 100644
--- a/src/coreComponents/physicsSolvers/CMakeLists.txt
+++ b/src/coreComponents/physicsSolvers/CMakeLists.txt
@@ -24,7 +24,6 @@ Contains:
 # Specify solver headers
 #
 set( physicsSolversBase_headers
-     FieldApplicator.hpp
      FieldStatisticsBase.hpp
      LinearSolverParameters.hpp
      NonlinearSolverParameters.hpp
@@ -35,7 +34,6 @@ set( physicsSolversBase_headers
 # Specify solver sources
 #
 set( physicsSolversBase_sources
-     FieldApplicator.cpp
      LinearSolverParameters.cpp
      NonlinearSolverParameters.cpp
      PhysicsSolverBase.cpp
diff --git a/src/coreComponents/physicsSolvers/multiphysics/CMakeLists.txt b/src/coreComponents/physicsSolvers/multiphysics/CMakeLists.txt
index 82c1d57e4ee..976f03d0c6c 100644
--- a/src/coreComponents/physicsSolvers/multiphysics/CMakeLists.txt
+++ b/src/coreComponents/physicsSolvers/multiphysics/CMakeLists.txt
@@ -23,6 +23,7 @@ set( multiPhysicsSolvers_headers
     CoupledReservoirAndWellsBase.hpp
     CoupledReservoirAndWellKernels.hpp
     CoupledSolver.hpp
+    FieldApplicator.hpp
     PoromechanicsSolver.hpp
     PoromechanicsConformingFractures.hpp
     FlowProppantTransportSolver.hpp
@@ -70,6 +71,7 @@ set( multiPhysicsSolvers_sources
     CoupledReservoirAndWellsBase.cpp
     FlowProppantTransportSolver.cpp
     HydrofractureSolver.cpp
+    FieldApplicator.cpp
     MultiphasePoromechanics.cpp
     OneWayCoupledFractureFlowContactMechanics.cpp
     MultiphasePoromechanicsConformingFractures.cpp
diff --git a/src/coreComponents/physicsSolvers/FieldApplicator.cpp b/src/coreComponents/physicsSolvers/multiphysics/FieldApplicator.cpp
similarity index 98%
rename from src/coreComponents/physicsSolvers/FieldApplicator.cpp
rename to src/coreComponents/physicsSolvers/multiphysics/FieldApplicator.cpp
index 0493f4b4347..9b139e775d6 100644
--- a/src/coreComponents/physicsSolvers/FieldApplicator.cpp
+++ b/src/coreComponents/physicsSolvers/multiphysics/FieldApplicator.cpp
@@ -17,19 +17,14 @@
 #include "events/tasks/TasksManager.hpp"
 #include "fieldSpecification/FieldSpecificationManager.hpp"
 #include "fieldSpecification/FieldSpecificationBase.hpp"
-#include "fieldSpecification/EquilibriumInitialCondition.hpp"
 #include "common/FieldSpecificationOps.hpp"
 #include "mesh/DomainPartition.hpp"
 #include "mesh/MeshBody.hpp"
 #include "mesh/MeshLevel.hpp"
 #include "mesh/CellElementSubRegion.hpp"
 #include "mesh/SurfaceElementSubRegion.hpp"
-#include "functions/FunctionManager.hpp"
 #include "functions/TableFunction.hpp"
-#include "mesh/ElementSubRegionBase.hpp"
-#include "physicsSolvers/fluidFlow/FlowSolverBase.hpp"
 #include "physicsSolvers/fluidFlow/FlowSolverBaseFields.hpp"
-#include "physicsSolvers/fluidFlow/CompositionalMultiphaseBase.hpp"
 #include "physicsSolvers/fluidFlow/CompositionalMultiphaseBaseFields.hpp"
 #include "constitutive/fluid/multifluid/MultiFluidBase.hpp"
 #include "constitutive/fluid/multifluid/MultiFluidSelector.hpp"
diff --git a/src/coreComponents/physicsSolvers/FieldApplicator.hpp b/src/coreComponents/physicsSolvers/multiphysics/FieldApplicator.hpp
similarity index 91%
rename from src/coreComponents/physicsSolvers/FieldApplicator.hpp
rename to src/coreComponents/physicsSolvers/multiphysics/FieldApplicator.hpp
index f6c25042502..ec69bd4a691 100644
--- a/src/coreComponents/physicsSolvers/FieldApplicator.hpp
+++ b/src/coreComponents/physicsSolvers/multiphysics/FieldApplicator.hpp
@@ -21,15 +21,20 @@
 #define SRC_CORECOMPONENTS_PHYSICSSOLVERS_FIELDAPPLICATOR_HPP_
 
 #include "events/tasks/TaskBase.hpp"
+#include "fieldSpecification/EquilibriumInitialCondition.hpp"
+#include "functions/FunctionManager.hpp"
+#include "physicsSolvers/fluidFlow/CompositionalMultiphaseBase.hpp"
+#include "physicsSolvers/fluidFlow/FlowSolverBase.hpp"
+#include "mesh/ElementSubRegionBase.hpp"
 
 namespace geos
 {
 
-class EquilibriumInitialCondition;
-class FunctionManager;
-class FlowSolverBase;
-class CompositionalMultiphaseBase;
-class ElementSubRegionBase;
+// class EquilibriumInitialCondition;
+// class FunctionManager;
+// class FlowSolverBase;
+// class CompositionalMultiphaseBase;
+// class ElementSubRegionBase;
 
 
 /**