diff --git a/LICENSE b/LICENSE
index d19d17cba..17ec62d23 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2016, David Johnson
+Copyright (c) 2015-2016, Servant contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/example/LICENSE b/example/LICENSE
index e69de29bb..17ec62d23 100644
--- a/example/LICENSE
+++ b/example/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2015-2016, Servant contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of servant-swagger nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/example/example.cabal b/example/example.cabal
index bbcee7024..c9739c8d0 100644
--- a/example/example.cabal
+++ b/example/example.cabal
@@ -1,12 +1,12 @@
 name:                example
 version:             0.1.0.0
-synopsis:            Example usage
-description:         Example usage
+synopsis:            servant-swagger demonstration
+description:         servant-swagger demonstration
 license:             BSD3
 license-file:        LICENSE
-author:              David Johnson
-maintainer:          djohnson.m@gmail.com
-copyright:           David Johnson (c) 2015-2016
+author:              David Johnson, Nickolay Kudasov
+maintainer:          nickolay.kudasov@gmail.com
+copyright:           (c) 2015-2016, Servant contributors
 category:            Web
 build-type:          Simple
 cabal-version:       >=1.10
diff --git a/servant-swagger.cabal b/servant-swagger.cabal
index 272c2aeed..f8528f06c 100644
--- a/servant-swagger.cabal
+++ b/servant-swagger.cabal
@@ -2,13 +2,13 @@ name:                servant-swagger
 version:             0.1.2
 synopsis:            Generate Swagger specification for your servant API.
 description:         Please see README.md
-homepage:            https://github.com/dmjio/servant-swagger
-bug-reports:         https://github.com/dmjio/servant-swagger/issues
+homepage:            https://github.com/haskell-servant/servant-swagger
+bug-reports:         https://github.com/haskell-servant/servant-swagger/issues
 license:             BSD3
 license-file:        LICENSE
-author:              David Johnson
-maintainer:          djohnson.m@gmail.com
-copyright:           David Johnson (c) 2015-2016
+author:              David Johnson, Nickolay Kudasov
+maintainer:          nickolay.kudasov@gmail.com
+copyright:           (c) 2015-2016, Servant contributors
 category:            Web
 build-type:          Simple
 cabal-version:       >=1.10
@@ -19,7 +19,7 @@ extra-source-files:
 
 source-repository head
   type:     git
-  location: https://github.com/dmjio/servant-swagger.git
+  location: https://github.com/haskell-servant/servant-swagger.git
 
 library
   ghc-options:         -Wall
diff --git a/src/Servant/Swagger.hs b/src/Servant/Swagger.hs
index 5c6d1cfbc..8fca97048 100644
--- a/src/Servant/Swagger.hs
+++ b/src/Servant/Swagger.hs
@@ -1,4 +1,9 @@
 -- |
+-- Module:      Servant.Swagger
+-- License:     BSD3
+-- Maintainer:  Nickolay Kudasov <nickolay@getshoptv.com>
+-- Stability:   experimental
+--
 -- This module provides means to generate and manipulate
 -- Swagger specification for servant APIs.
 --
diff --git a/src/Servant/Swagger/Test.hs b/src/Servant/Swagger/Test.hs
index e71a28eba..7d7f527d4 100644
--- a/src/Servant/Swagger/Test.hs
+++ b/src/Servant/Swagger/Test.hs
@@ -1,3 +1,10 @@
+-- |
+-- Module:      Servant.Swagger.Test
+-- License:     BSD3
+-- Maintainer:  Nickolay Kudasov <nickolay@getshoptv.com>
+-- Stability:   experimental
+--
+-- Automatic tests for servant API against Swagger spec.
 module Servant.Swagger.Test (
   validateEveryToJSON,
 ) where
diff --git a/src/Servant/Swagger/TypeLevel.hs b/src/Servant/Swagger/TypeLevel.hs
index 2668ee7eb..ca3c797bc 100644
--- a/src/Servant/Swagger/TypeLevel.hs
+++ b/src/Servant/Swagger/TypeLevel.hs
@@ -1,3 +1,10 @@
+-- |
+-- Module:      Servant.Swagger.TypeLevel
+-- License:     BSD3
+-- Maintainer:  Nickolay Kudasov <nickolay@getshoptv.com>
+-- Stability:   experimental
+--
+-- Useful type families for servant APIs.
 module Servant.Swagger.TypeLevel (
   IsSubAPI,
   EndpointsList,