diff --git a/src/fsfw/cfdp/handler/CMakeLists.txt b/src/fsfw/cfdp/handler/CMakeLists.txt
index 540bceca..ea3d7633 100644
--- a/src/fsfw/cfdp/handler/CMakeLists.txt
+++ b/src/fsfw/cfdp/handler/CMakeLists.txt
@@ -1,4 +1,4 @@
 target_sources(
   ${LIB_FSFW_NAME}
   PRIVATE SourceHandler.cpp DestHandler.cpp MetadataParser.cpp
-          PutRequestReader.cpp FaultHandlerBase.cpp UserBase.cpp)
+PutRequest.cpp FaultHandlerBase.cpp UserBase.cpp)
diff --git a/src/fsfw/cfdp/handler/MetadataParser.h b/src/fsfw/cfdp/handler/MetadataParser.h
index 4c7df335..3ab7478a 100644
--- a/src/fsfw/cfdp/handler/MetadataParser.h
+++ b/src/fsfw/cfdp/handler/MetadataParser.h
@@ -9,6 +9,7 @@ class MetadataParser {
   explicit MetadataParser(MetadataPduReader& reader);
 
  private:
+
 };
 
 }  // namespace cfdp
\ No newline at end of file
diff --git a/src/fsfw/cfdp/handler/PutRequest.cpp b/src/fsfw/cfdp/handler/PutRequest.cpp
new file mode 100644
index 00000000..73f4c876
--- /dev/null
+++ b/src/fsfw/cfdp/handler/PutRequest.cpp
@@ -0,0 +1,5 @@
+#include "PutRequest.h"
+
+[[nodiscard]] bool cfdp::PutRequest::isMetadataOnly() const {
+  return !destNameSize.has_value() and !sourceNameSize.has_value();
+}
diff --git a/src/fsfw/cfdp/handler/PutRequestReader.h b/src/fsfw/cfdp/handler/PutRequest.h
similarity index 83%
rename from src/fsfw/cfdp/handler/PutRequestReader.h
rename to src/fsfw/cfdp/handler/PutRequest.h
index bcef8222..834985bc 100644
--- a/src/fsfw/cfdp/handler/PutRequestReader.h
+++ b/src/fsfw/cfdp/handler/PutRequest.h
@@ -21,9 +21,7 @@ class PutRequest {
   std::vector<MessageToUserTlv> messagesToUser;
   std::vector<FilestoreRequestTlv> fsRequest;
 
-  [[nodiscard]] bool isMetadataOnly() const {
-    return !destNameSize.has_value() and !sourceNameSize.has_value();
-  }
+  [[nodiscard]] bool isMetadataOnly() const;
 };
 
 }  // namespace cfdp
diff --git a/src/fsfw/cfdp/handler/PutRequestReader.cpp b/src/fsfw/cfdp/handler/PutRequestReader.cpp
deleted file mode 100644
index 0b262fc9..00000000
--- a/src/fsfw/cfdp/handler/PutRequestReader.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "PutRequestReader.h"