diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0855a79b..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-dist
-cabal-dev
-*.o
-*.hi
-*.chi
-*.chs.h
-*.dyn_o
-*.dyn_hi
-.virtualenv
-.hpc
-.hsenv
-.cabal-sandbox/
-cabal.sandbox.config
-cabal.config
-*.prof
-*.aux
-*.hp
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b6a1f304..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-language: haskell
-
-env:
-- GHCVER=7.8.3
-
-before_install:
- - |
-    if [ $GHCVER = `ghc --numeric-version` ]; then
-        travis/cabal-apt-install --enable-tests $MODE
-        export CABAL=cabal
-    else
-        travis_retry sudo add-apt-repository -y ppa:hvr/ghc
-        travis_retry sudo apt-get update
-        travis_retry sudo apt-get install cabal-install-1.18 ghc-$GHCVER happy
-        export CABAL=cabal-1.18
-        export PATH=/opt/ghc/$GHCVER/bin:$PATH
-    fi
- - $CABAL update
- - |
-    if [ $GHCVER = "head" ] || [ $GHCVER = "7.8.3" ]; then
-        $CABAL install happy alex
-        export PATH=$HOME/.cabal/bin:$PATH
-    fi
- - git clone https://github.com/haskell-servant/servant.git
- - cabal sandbox init
- - cabal sandbox add-source servant
-
-install:
- - cabal install --only-dependencies --enable-tests
-
-script:
- - cabal configure --enable-tests --enable-library-coverage
- - cabal build && cabal test
- - cabal sdist
-
-after_script:
-  - cabal install hpc-coveralls
-  - export PATH=.cabal-sandbox/bin:$PATH
-  - hpc-coveralls --exclude-dir=test spec
-
-notifications:
-  irc:
-    channels:
-      - "irc.freenode.org#servant"
-    template:
-      - "%{repository}#%{build_number} - %{commit} on %{branch} by %{author}: %{message}"
-      - "Build details: %{build_url} - Change view: %{compare_url}"
-    skip_join: true
-    on_success: change
-    on_failure: always
diff --git a/CHANGELOG.md b/servant-server/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to servant-server/CHANGELOG.md
diff --git a/LICENSE b/servant-server/LICENSE
similarity index 100%
rename from LICENSE
rename to servant-server/LICENSE
diff --git a/README.md b/servant-server/README.md
similarity index 100%
rename from README.md
rename to servant-server/README.md
diff --git a/Setup.hs b/servant-server/Setup.hs
similarity index 100%
rename from Setup.hs
rename to servant-server/Setup.hs
diff --git a/default.nix b/servant-server/default.nix
similarity index 100%
rename from default.nix
rename to servant-server/default.nix
diff --git a/example/README.md b/servant-server/example/README.md
similarity index 100%
rename from example/README.md
rename to servant-server/example/README.md
diff --git a/example/greet.hs b/servant-server/example/greet.hs
similarity index 100%
rename from example/greet.hs
rename to servant-server/example/greet.hs
diff --git a/example/greet.md b/servant-server/example/greet.md
similarity index 100%
rename from example/greet.md
rename to servant-server/example/greet.md
diff --git a/servant-server.cabal b/servant-server/servant-server.cabal
similarity index 100%
rename from servant-server.cabal
rename to servant-server/servant-server.cabal
diff --git a/src/Servant.hs b/servant-server/src/Servant.hs
similarity index 100%
rename from src/Servant.hs
rename to servant-server/src/Servant.hs
diff --git a/src/Servant/Server.hs b/servant-server/src/Servant/Server.hs
similarity index 100%
rename from src/Servant/Server.hs
rename to servant-server/src/Servant/Server.hs
diff --git a/src/Servant/Server/Internal.hs b/servant-server/src/Servant/Server/Internal.hs
similarity index 100%
rename from src/Servant/Server/Internal.hs
rename to servant-server/src/Servant/Server/Internal.hs
diff --git a/src/Servant/Utils/StaticFiles.hs b/servant-server/src/Servant/Utils/StaticFiles.hs
similarity index 100%
rename from src/Servant/Utils/StaticFiles.hs
rename to servant-server/src/Servant/Utils/StaticFiles.hs
diff --git a/test/Servant/ServerSpec.hs b/servant-server/test/Servant/ServerSpec.hs
similarity index 100%
rename from test/Servant/ServerSpec.hs
rename to servant-server/test/Servant/ServerSpec.hs
diff --git a/test/Servant/Utils/StaticFilesSpec.hs b/servant-server/test/Servant/Utils/StaticFilesSpec.hs
similarity index 100%
rename from test/Servant/Utils/StaticFilesSpec.hs
rename to servant-server/test/Servant/Utils/StaticFilesSpec.hs
diff --git a/test/Spec.hs b/servant-server/test/Spec.hs
similarity index 100%
rename from test/Spec.hs
rename to servant-server/test/Spec.hs