diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/container.cabal b/container.cabal
--- a/container.cabal
+++ b/container.cabal
@@ -1,79 +1,60 @@
-name:                container
-version:             1.0
-synopsis:            Containers abstraction and utilities.
--- description:         
-license:             Apache-2.0
-license-file:        LICENSE
-author:              Wojciech Danilo
-maintainer:          Wojciech Danilo <wojciech.danilo@gmail.com>
-stability:           experimental
-homepage:            https://github.com/wdanilo/containers
-bug-reports:         https://github.com/wdanilo/containers/issues
-copyright:           Copyright (C) 2015 Wojciech Danilo
-category:            Text
-build-type:          Simple
--- extra-source-files:  
-cabal-version:       >=1.10
-
-
-Library
-  hs-source-dirs:     src
-  ghc-options:        -Wall -O2
-  default-language:   Haskell2010
+name: container
+version: 1.0.1
+cabal-version: >=1.10
+build-type: Simple
+license: Apache-2.0
+license-file: LICENSE
+copyright: Copyright (C) 2015 Wojciech Danilo
+maintainer: Wojciech Danilo <wojciech.danilo@gmail.com>
+stability: experimental
+homepage: https://github.com/wdanilo/containers
+bug-reports: https://github.com/wdanilo/containers/issues
+synopsis: Containers abstraction and utilities.
+category: Text
+author: Wojciech Danilo
 
-  default-extensions: ConstraintKinds
-                      DataKinds
-                      DefaultSignatures
-                      DeriveDataTypeable
-                      DeriveFoldable
-                      DeriveFunctor
-                      DeriveGeneric
-                      DeriveTraversable
-                      DoAndIfThenElse
-                      EmptyDataDecls
-                      FlexibleContexts
-                      FlexibleInstances
-                      GeneralizedNewtypeDeriving
-                      InstanceSigs
-                      LambdaCase
-                      MultiParamTypeClasses
-                      OverloadedStrings
-                      StandaloneDeriving
-                      TemplateHaskell
-                      TupleSections
-                      TypeOperators
-                      ViewPatterns
-                      TypeFamilies
-  
-  exposed-modules:    Data.Container
-                      Data.Container.Auto
-                      Data.Container.Class
-                      Data.Container.Hetero
-                      Data.Container.Immersed
-                      Data.Container.Instances
-                      Data.Container.Instances.IntSet
-                      Data.Container.Instances.Vector.Lazy
-                      Data.Container.List
-                      Data.Container.Opts
-                      Data.Container.Parametrized
-                      Data.Container.Poly
-                      Data.Container.Proxy
-                      Data.Container.Resizable
-                      Data.Container.Reusable
-                      Data.Container.Type
-                      Data.Container.Weak
+library
+    exposed-modules:
+        Data.Container
+        Data.Container.Auto
+        Data.Container.Class
+        Data.Container.Hetero
+        Data.Container.Immersed
+        Data.Container.Instances
+        Data.Container.Instances.IntSet
+        Data.Container.Instances.Vector.Lazy
+        Data.Container.List
+        Data.Container.Opts
+        Data.Container.Parametrized
+        Data.Container.Poly
+        Data.Container.Proxy
+        Data.Container.Resizable
+        Data.Container.Reusable
+        Data.Container.Type
+        Data.Container.Weak
+    build-depends:
+        base >=4.6 && <4.9,
+        containers >=0.5.6.2,
+        data-default >=0.5.3,
+        data-layer >=1.0.1,
+        functor-utils >=1.0,
+        lens >=4.12.3,
+        lens-utils >=1.0,
+        mtl >=2.2.1,
+        template-haskell >=2.10.0.0,
+        transformers >=0.4.2.0,
+        transformers-base >=0.4.4,
+        typelevel >=1.0.2,
+        vector >=0.10.12.3,
+        text >=1.2.1.3
+    default-language: Haskell2010
+    default-extensions: ConstraintKinds DataKinds DefaultSignatures
+                        DeriveDataTypeable DeriveFoldable DeriveFunctor DeriveGeneric
+                        DeriveTraversable DoAndIfThenElse EmptyDataDecls FlexibleContexts
+                        FlexibleInstances GeneralizedNewtypeDeriving InstanceSigs
+                        LambdaCase MultiParamTypeClasses OverloadedStrings
+                        StandaloneDeriving TemplateHaskell TupleSections TypeOperators
+                        ViewPatterns TypeFamilies
+    hs-source-dirs: src
+    ghc-options: -Wall -O2
 
-  build-depends:      base >=4.6 && <4.9
-                    , containers
-                    , data-default
-                    , data-layer
-                    , functor-utils
-                    , lens
-                    , lens-utils
-                    , mtl
-                    , template-haskell
-                    , transformers
-                    , transformers-base
-                    , typelevel
-                    , vector
-                    , text