diff --git a/CHANGELOG.md b/servant/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to servant/CHANGELOG.md
diff --git a/LICENSE b/servant/LICENSE
similarity index 100%
rename from LICENSE
rename to servant/LICENSE
diff --git a/README.md b/servant/README.md
similarity index 100%
rename from README.md
rename to servant/README.md
diff --git a/Setup.hs b/servant/Setup.hs
similarity index 100%
rename from Setup.hs
rename to servant/Setup.hs
diff --git a/default.nix b/servant/default.nix
similarity index 100%
rename from default.nix
rename to servant/default.nix
diff --git a/docs.sh b/servant/docs.sh
similarity index 100%
rename from docs.sh
rename to servant/docs.sh
diff --git a/servant.cabal b/servant/servant.cabal
similarity index 100%
rename from servant.cabal
rename to servant/servant.cabal
diff --git a/servant.png b/servant/servant.png
similarity index 100%
rename from servant.png
rename to servant/servant.png
diff --git a/src/Servant/API.hs b/servant/src/Servant/API.hs
similarity index 100%
rename from src/Servant/API.hs
rename to servant/src/Servant/API.hs
diff --git a/src/Servant/API/Alternative.hs b/servant/src/Servant/API/Alternative.hs
similarity index 100%
rename from src/Servant/API/Alternative.hs
rename to servant/src/Servant/API/Alternative.hs
diff --git a/src/Servant/API/Capture.hs b/servant/src/Servant/API/Capture.hs
similarity index 100%
rename from src/Servant/API/Capture.hs
rename to servant/src/Servant/API/Capture.hs
diff --git a/src/Servant/API/ContentTypes.hs b/servant/src/Servant/API/ContentTypes.hs
similarity index 100%
rename from src/Servant/API/ContentTypes.hs
rename to servant/src/Servant/API/ContentTypes.hs
diff --git a/src/Servant/API/Delete.hs b/servant/src/Servant/API/Delete.hs
similarity index 100%
rename from src/Servant/API/Delete.hs
rename to servant/src/Servant/API/Delete.hs
diff --git a/src/Servant/API/Get.hs b/servant/src/Servant/API/Get.hs
similarity index 100%
rename from src/Servant/API/Get.hs
rename to servant/src/Servant/API/Get.hs
diff --git a/src/Servant/API/Header.hs b/servant/src/Servant/API/Header.hs
similarity index 100%
rename from src/Servant/API/Header.hs
rename to servant/src/Servant/API/Header.hs
diff --git a/src/Servant/API/MatrixParam.hs b/servant/src/Servant/API/MatrixParam.hs
similarity index 100%
rename from src/Servant/API/MatrixParam.hs
rename to servant/src/Servant/API/MatrixParam.hs
diff --git a/src/Servant/API/Patch.hs b/servant/src/Servant/API/Patch.hs
similarity index 100%
rename from src/Servant/API/Patch.hs
rename to servant/src/Servant/API/Patch.hs
diff --git a/src/Servant/API/Post.hs b/servant/src/Servant/API/Post.hs
similarity index 100%
rename from src/Servant/API/Post.hs
rename to servant/src/Servant/API/Post.hs
diff --git a/src/Servant/API/Put.hs b/servant/src/Servant/API/Put.hs
similarity index 100%
rename from src/Servant/API/Put.hs
rename to servant/src/Servant/API/Put.hs
diff --git a/src/Servant/API/QueryParam.hs b/servant/src/Servant/API/QueryParam.hs
similarity index 100%
rename from src/Servant/API/QueryParam.hs
rename to servant/src/Servant/API/QueryParam.hs
diff --git a/src/Servant/API/Raw.hs b/servant/src/Servant/API/Raw.hs
similarity index 100%
rename from src/Servant/API/Raw.hs
rename to servant/src/Servant/API/Raw.hs
diff --git a/src/Servant/API/ReqBody.hs b/servant/src/Servant/API/ReqBody.hs
similarity index 100%
rename from src/Servant/API/ReqBody.hs
rename to servant/src/Servant/API/ReqBody.hs
diff --git a/src/Servant/API/ResponseHeaders.hs b/servant/src/Servant/API/ResponseHeaders.hs
similarity index 100%
rename from src/Servant/API/ResponseHeaders.hs
rename to servant/src/Servant/API/ResponseHeaders.hs
diff --git a/src/Servant/API/Sub.hs b/servant/src/Servant/API/Sub.hs
similarity index 100%
rename from src/Servant/API/Sub.hs
rename to servant/src/Servant/API/Sub.hs
diff --git a/src/Servant/Common/Text.hs b/servant/src/Servant/Common/Text.hs
similarity index 100%
rename from src/Servant/Common/Text.hs
rename to servant/src/Servant/Common/Text.hs
diff --git a/src/Servant/Utils/Links.hs b/servant/src/Servant/Utils/Links.hs
similarity index 100%
rename from src/Servant/Utils/Links.hs
rename to servant/src/Servant/Utils/Links.hs
diff --git a/test/Doctests.hs b/servant/test/Doctests.hs
similarity index 100%
rename from test/Doctests.hs
rename to servant/test/Doctests.hs
diff --git a/test/Servant/API/ContentTypesSpec.hs b/servant/test/Servant/API/ContentTypesSpec.hs
similarity index 100%
rename from test/Servant/API/ContentTypesSpec.hs
rename to servant/test/Servant/API/ContentTypesSpec.hs
diff --git a/test/Servant/API/ResponseHeadersSpec.hs b/servant/test/Servant/API/ResponseHeadersSpec.hs
similarity index 100%
rename from test/Servant/API/ResponseHeadersSpec.hs
rename to servant/test/Servant/API/ResponseHeadersSpec.hs
diff --git a/test/Servant/Common/TextSpec.hs b/servant/test/Servant/Common/TextSpec.hs
similarity index 100%
rename from test/Servant/Common/TextSpec.hs
rename to servant/test/Servant/Common/TextSpec.hs
diff --git a/test/Servant/Utils/LinksSpec.hs b/servant/test/Servant/Utils/LinksSpec.hs
similarity index 100%
rename from test/Servant/Utils/LinksSpec.hs
rename to servant/test/Servant/Utils/LinksSpec.hs
diff --git a/test/Spec.hs b/servant/test/Spec.hs
similarity index 100%
rename from test/Spec.hs
rename to servant/test/Spec.hs
diff --git a/update-nixpkgs.sh b/servant/update-nixpkgs.sh
similarity index 100%
rename from update-nixpkgs.sh
rename to servant/update-nixpkgs.sh