diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d8a7996
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+composer.lock
+vendor/
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..4ae18b5
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# PSR-17 HTTP Factory Utilities
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..b7a1552
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,40 @@
+{
+    "name": "psr/http-factory-util",
+    "description": "Common interfaces for PSR-7 HTTP message factories",
+    "keywords": [
+        "psr",
+        "psr-7",
+        "psr-17",
+        "http",
+        "factory",
+        "message",
+        "request",
+        "response"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "require": {
+        "php": ">=7.0.0"
+    },
+    "require-dev": {
+        "psr/http-factory": "^1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Message\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    },
+    "config": {
+        "lock": false
+    }
+}
diff --git a/src/RequestFactoryAwareInterface.php b/src/RequestFactoryAwareInterface.php
new file mode 100644
index 0000000..36fea8c
--- /dev/null
+++ b/src/RequestFactoryAwareInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface RequestFactoryAwareInterface{
+
+    public function setRequestFactory(RequestFactoryInterface $requestFactory): RequestFactoryAwareInterface;
+
+}
diff --git a/src/RequestFactoryAwareTrait.php b/src/RequestFactoryAwareTrait.php
new file mode 100644
index 0000000..d7513ac
--- /dev/null
+++ b/src/RequestFactoryAwareTrait.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Psr\Http\Message;
+
+trait RequestFactoryAwareTrait{
+
+    /** @var \Psr\Http\Message\RequestFactoryInterface */
+    protected $requestFactory;
+
+    public function setRequestFactory(RequestFactoryInterface $requestFactory): RequestFactoryAwareInterface{
+        $this->requestFactory = $requestFactory;
+
+        return $this;
+    }
+
+}
diff --git a/src/ResponseFactoryAwareInterface.php b/src/ResponseFactoryAwareInterface.php
new file mode 100644
index 0000000..7257421
--- /dev/null
+++ b/src/ResponseFactoryAwareInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface ResponseFactoryAwareInterface{
+
+    public function setResponseFactory(ResponseFactoryInterface $responseFactory): ResponseFactoryAwareInterface;
+
+}
diff --git a/src/ResponseFactoryAwareTrait.php b/src/ResponseFactoryAwareTrait.php
new file mode 100644
index 0000000..e57f6cd
--- /dev/null
+++ b/src/ResponseFactoryAwareTrait.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Psr\Http\Message;
+
+trait ResponseFactoryAwareTrait{
+
+    /** @var \Psr\Http\Message\ResponseFactoryInterface */
+    protected $responseFactory;
+
+    public function setResponseFactory(ResponseFactoryInterface $responseFactory): ResponseFactoryAwareInterface{
+        $this->responseFactory = $responseFactory;
+
+        return $this;
+    }
+
+}
diff --git a/src/ServerRequestFactoryAwareInterface.php b/src/ServerRequestFactoryAwareInterface.php
new file mode 100644
index 0000000..61ececd
--- /dev/null
+++ b/src/ServerRequestFactoryAwareInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface ServerRequestFactoryAwareInterface{
+
+    public function setServerRequestFactory(ServerRequestFactoryInterface $serverRequestFactory): ServerRequestFactoryAwareInterface;
+
+}
diff --git a/src/ServerRequestFactoryAwareTrait.php b/src/ServerRequestFactoryAwareTrait.php
new file mode 100644
index 0000000..ec4e059
--- /dev/null
+++ b/src/ServerRequestFactoryAwareTrait.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Psr\Http\Message;
+
+trait ServerRequestFactoryAwareTrait{
+
+    /** @var \Psr\Http\Message\ServerRequestFactoryInterface */
+    protected $serverRequestFactory;
+
+    public function setServerRequestFactory(ServerRequestFactoryInterface $serverRequestFactory): ServerRequestFactoryAwareInterface{
+        $this->serverRequestFactory = $serverRequestFactory;
+
+        return $this;
+    }
+
+}
diff --git a/src/StreamFactoryAwareInterface.php b/src/StreamFactoryAwareInterface.php
new file mode 100644
index 0000000..825b8c9
--- /dev/null
+++ b/src/StreamFactoryAwareInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface StreamFactoryAwareInterface{
+
+    public function setStreamFactory(StreamFactoryInterface $streamFactory): StreamFactoryAwareInterface;
+
+}
diff --git a/src/StreamFactoryAwareTrait.php b/src/StreamFactoryAwareTrait.php
new file mode 100644
index 0000000..a9d5547
--- /dev/null
+++ b/src/StreamFactoryAwareTrait.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Psr\Http\Message;
+
+trait StreamFactoryAwareTrait{
+
+    /** @var \Psr\Http\Message\StreamFactoryInterface */
+    protected $streamFactory;
+
+    public function setStreamFactory(StreamFactoryInterface $streamFactory): StreamFactoryAwareInterface{
+        $this->streamFactory = $streamFactory;
+
+        return $this;
+    }
+
+}
diff --git a/src/UploadedFileFactoryAwareInterface.php b/src/UploadedFileFactoryAwareInterface.php
new file mode 100644
index 0000000..9539ba4
--- /dev/null
+++ b/src/UploadedFileFactoryAwareInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface UploadedFileFactoryAwareInterface{
+
+    public function setUploadedFileFactory(UploadedFileFactoryInterface $uploadedFileFactory): UploadedFileFactoryAwareInterface;
+
+}
diff --git a/src/UploadedFileFactoryAwareTrait.php b/src/UploadedFileFactoryAwareTrait.php
new file mode 100644
index 0000000..2ac0243
--- /dev/null
+++ b/src/UploadedFileFactoryAwareTrait.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Psr\Http\Message;
+
+trait UploadedFileFactoryAwareTrait{
+
+    /** @var \Psr\Http\Message\UploadedFileFactoryInterface */
+    protected $uploadedFileFactory;
+
+    public function setUploadedFileFactory(UploadedFileFactoryInterface $uploadedFileFactory): UploadedFileFactoryAwareInterface{
+        $this->uploadedFileFactory = $uploadedFileFactory;
+
+        return $this;
+    }
+
+}
diff --git a/src/UriFactoryAwareInterface.php b/src/UriFactoryAwareInterface.php
new file mode 100644
index 0000000..0995086
--- /dev/null
+++ b/src/UriFactoryAwareInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface UriFactoryAwareInterface{
+
+    public function setUriFactory(UriFactoryInterface $uriFactory): UriFactoryAwareInterface;
+
+}
diff --git a/src/UriFactoryAwareTrait.php b/src/UriFactoryAwareTrait.php
new file mode 100644
index 0000000..91467a2
--- /dev/null
+++ b/src/UriFactoryAwareTrait.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Psr\Http\Message;
+
+trait UriFactoryAwareTrait{
+
+    /** @var \Psr\Http\Message\UriFactoryInterface */
+    protected $uriFactory;
+
+    public function setUriFactory(UriFactoryInterface $uriFactory): UriFactoryAwareInterface{
+        $this->uriFactory = $uriFactory;
+
+        return $this;
+    }
+
+}