diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index d3529016c7398999db3be5ee31132e22109f131e..d3883b0d7784c4fda37015eb1b3dd52308cd35f5 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -6,6 +6,9 @@ APPEND_SOURCE_FILES(SOURCES)
 add_subdirectory(BoundaryCondition)
 APPEND_SOURCE_FILES(SOURCES BoundaryCondition)
 
+add_subdirectory(Parameter)
+APPEND_SOURCE_FILES(SOURCES Parameter)
+
 add_subdirectory(GroundwaterFlow)
 APPEND_SOURCE_FILES(SOURCES GroundwaterFlow)
 
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
index ad3e99e587a542a1164af86ed785defdd7e90bc0..5adda111bec0df75c9873bb467ab315b17611c84 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
@@ -17,7 +17,7 @@
 #include "NumLib/Fem/ShapeMatrixPolicy.h"
 #include "ProcessLib/LocalAssemblerInterface.h"
 #include "ProcessLib/LocalAssemblerTraits.h"
-#include "ProcessLib/Parameter.h"
+#include "ProcessLib/Parameter/Parameter.h"
 #include "ProcessLib/Utils/InitShapeMatrices.h"
 #include "GroundwaterFlowProcessData.h"
 
diff --git a/ProcessLib/InitialCondition.h b/ProcessLib/InitialCondition.h
index 60a89bfcca9a74ad1d540ab26e74f53f9ff23fe4..ccdd80833f46eb4e64eae551682bf5cb12945954 100644
--- a/ProcessLib/InitialCondition.h
+++ b/ProcessLib/InitialCondition.h
@@ -10,7 +10,7 @@
 #ifndef PROCESS_LIB_INITIAL_CONDITION_H_
 #define PROCESS_LIB_INITIAL_CONDITION_H_
 
-#include "Parameter.h"
+#include "ProcessLib/Parameter/Parameter.h"
 
 namespace ProcessLib
 {
diff --git a/ProcessLib/Parameter/CMakeLists.txt b/ProcessLib/Parameter/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/ProcessLib/ConstantParameter.cpp b/ProcessLib/Parameter/ConstantParameter.cpp
similarity index 100%
rename from ProcessLib/ConstantParameter.cpp
rename to ProcessLib/Parameter/ConstantParameter.cpp
diff --git a/ProcessLib/ConstantParameter.h b/ProcessLib/Parameter/ConstantParameter.h
similarity index 100%
rename from ProcessLib/ConstantParameter.h
rename to ProcessLib/Parameter/ConstantParameter.h
diff --git a/ProcessLib/MeshElementParameter.cpp b/ProcessLib/Parameter/MeshElementParameter.cpp
similarity index 100%
rename from ProcessLib/MeshElementParameter.cpp
rename to ProcessLib/Parameter/MeshElementParameter.cpp
diff --git a/ProcessLib/MeshElementParameter.h b/ProcessLib/Parameter/MeshElementParameter.h
similarity index 100%
rename from ProcessLib/MeshElementParameter.h
rename to ProcessLib/Parameter/MeshElementParameter.h
diff --git a/ProcessLib/MeshNodeParameter.cpp b/ProcessLib/Parameter/MeshNodeParameter.cpp
similarity index 100%
rename from ProcessLib/MeshNodeParameter.cpp
rename to ProcessLib/Parameter/MeshNodeParameter.cpp
diff --git a/ProcessLib/MeshNodeParameter.h b/ProcessLib/Parameter/MeshNodeParameter.h
similarity index 100%
rename from ProcessLib/MeshNodeParameter.h
rename to ProcessLib/Parameter/MeshNodeParameter.h
diff --git a/ProcessLib/Parameter.cpp b/ProcessLib/Parameter/Parameter.cpp
similarity index 100%
rename from ProcessLib/Parameter.cpp
rename to ProcessLib/Parameter/Parameter.cpp
diff --git a/ProcessLib/Parameter.h b/ProcessLib/Parameter/Parameter.h
similarity index 100%
rename from ProcessLib/Parameter.h
rename to ProcessLib/Parameter/Parameter.h
diff --git a/ProcessLib/SpatialPosition.h b/ProcessLib/Parameter/SpatialPosition.h
similarity index 100%
rename from ProcessLib/SpatialPosition.h
rename to ProcessLib/Parameter/SpatialPosition.h
diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h
index b94198a31afbcad8aa82b062122fa443413f14d8..1f04c0707da1716d7b78009f9d9ceff607c7b9ad 100644
--- a/ProcessLib/Process.h
+++ b/ProcessLib/Process.h
@@ -15,9 +15,9 @@
 #include "NumLib/ODESolver/TimeDiscretization.h"
 #include "NumLib/NamedFunctionCaller.h"
 #include "ProcessLib/BoundaryCondition/BoundaryConditionCollection.h"
+#include "ProcessLib/Parameter/Parameter.h"
 
 #include "ExtrapolatorData.h"
-#include "Parameter.h"
 #include "ProcessOutput.h"
 #include "SecondaryVariable.h"
 #include "CachedSecondaryVariable.h"
diff --git a/ProcessLib/Utils/ProcessUtils.h b/ProcessLib/Utils/ProcessUtils.h
index 57062c652faf811b14ad3f4ab1d4bb5cd1aab738..b8ac0096e47dbbeaa23bf122779bd6da1d15e3cb 100644
--- a/ProcessLib/Utils/ProcessUtils.h
+++ b/ProcessLib/Utils/ProcessUtils.h
@@ -13,7 +13,7 @@
 #include <vector>
 #include "BaseLib/ConfigTree.h"
 #include "BaseLib/Error.h"
-#include "ProcessLib/Parameter.h"
+#include "ProcessLib/Parameter/Parameter.h"
 
 namespace ProcessLib
 {