diff --git a/Control/Lens/TH.hs b/Control/Lens/TH.hs
new file mode 100644
--- /dev/null
+++ b/Control/Lens/TH.hs
@@ -0,0 +1,105 @@
+{-# LANGUAGE ViewPatterns, TemplateHaskell #-}
+
+module Control.Lens.TH (mkLens) where
+
+import Prelude hiding (concat, concatMap, foldr, foldl, foldl1)
+
+import Control.Applicative
+import Control.Arrow
+import Control.Category.Unicode
+import Control.Lens
+import Control.Monad
+import Data.Bool (bool)
+import Data.Function (on)
+import qualified Data.List as List
+import Data.Maybe
+import Data.Map (Map)
+import qualified Data.Map as Map
+import Data.Ord.Unicode
+import Data.Set (Set)
+import qualified Data.Set as Set
+import Data.Monoid
+import Data.Foldable
+import Data.Foldable.Unicode
+import Data.Traversable
+import Language.Haskell.TH
+import Language.Haskell.TH.Syntax
+
+reifyTyConDec :: Name -> Q ([TyVarBndr], [Con])
+reifyTyConDec =
+    fmap (\ case TyConI (DataD    _ _ bs _ cs _) -> (bs, cs)
+                 TyConI (NewtypeD _ _ bs _ c  _) -> (bs, [c])
+                 x -> error ("name of no simple type constructor: " ++ show x)) ∘ reify
+
+mkLens :: ([Char] -> [Char]) -> Name -> Q [Dec]
+mkLens name v0 =
+    reifyTyConDec v0 >>= \ (bs@(fmap binderName -> vs0), cs) ->
+    let labels :: [((Name, Type), [Name])]
+        labels =
+          (factorizeL ∘
+           concatMap
+           (\ case RecC v (fmap (\ (v, _, t) -> (v, t)) -> vts) -> flip (,) v <$> vts
+                   _ -> [])) cs
+
+        goT :: ((Name, Type), [Name]) -> Q Type
+        goT ((v, t), us) =
+          (\ vm ->
+           ForallT (liftA2 List.union id (fmap (/. vm)) bs) [] $
+           foldl1 AppT [ConT ''Control.Lens.Lens,
+                        foldl AppT (ConT v0) (VarT <$> vs0),
+                        foldl AppT (ConT v0) (VarT <$> (vs0 /. vm)),
+                        t, t /. vm]) <$>
+           foldrM (\ v m -> flip (Map.insert v) m <$> newName (nameBase v)) Map.empty
+           (Set.filter
+            (\ v ->
+             -- can not make lens polymorphic in type variable shared between multiple labels
+             (≤ 1) ∘ length $ List.filter (fst & snd & freeTypeVars & (v ∈)) labels) (freeTypeVars t))
+
+        goX :: ((Name, Type), [Name]) -> Q Exp
+        goX ((v, t), us) =
+          (\ (u, w) ->
+           foldl1 AppE
+           [VarE 'Control.Lens.lens,
+            LamCaseE ((\ u -> Match (RecP u [(v, VarP w)]) (NormalB $ VarE w) []) <$> us),
+            LamE [VarP w, VarP u] (RecUpdE (VarE u) [(v, VarE w)])]) <$> liftA2 (,) (newName "u") (newName "v")
+    in (traverse
+        ((\ l@((mkName ∘ name ∘ nameBase -> v, _), _) -> liftA3 (,,) (pure v) (goT l) (goX l)) &
+         fmap (\ (v, t, x) -> [SigD v t, ValD (VarP v) (NormalB x) []])) & fmap concat) labels
+
+freeTypeVars :: Type -> Set Name
+freeTypeVars (ForallT (fmap binderName & Set.fromList -> vs) _ t) = freeTypeVars t `Set.difference` vs
+freeTypeVars (AppT s t) = freeTypeVars s <> freeTypeVars t
+freeTypeVars (SigT t _) = freeTypeVars t
+freeTypeVars (VarT v) = Set.singleton v
+freeTypeVars _ = Set.empty
+
+binderName :: TyVarBndr -> Name
+binderName (PlainTV v) = v
+binderName (KindedTV v _) = v
+
+class Functor' b a where fmap' :: (a -> a) -> b -> b
+
+instance Functor' Type Name where
+    fmap' f (ForallT bs@(fmap binderName & Set.fromList -> vs) c t) = ForallT bs c $ fmap' (liftA3 bool f id (∈ vs)) t
+    fmap' f (AppT s t) = AppT (fmap' f s) (fmap' f t)
+    fmap' f (SigT t k) = AppT (fmap' f t) k
+    fmap' f (VarT v) = VarT (f v)
+    fmap' f t = t
+
+instance Functor' TyVarBndr Name where
+    fmap' f (PlainTV v) = PlainTV (f v)
+    fmap' f (KindedTV v k) = KindedTV (f v) k
+
+instance Functor f => Functor' (f a) a where fmap' = fmap
+
+(/.) :: (Ord a, Functor' b a) => b -> Map a a -> b
+xs /. m = liftA2 fromMaybe id (flip Map.lookup m) `fmap'` xs
+
+factorizeLBy :: (a -> a -> Bool) -> [(a, b)] -> [(a, [b])]
+factorizeLBy (==) = List.groupBy ((==) `on` fst) & fmap (unzip >>> head *** id)
+
+factorizeL :: (Eq a) => [(a, b)] -> [(a, [b])]
+factorizeL = factorizeLBy (==)
+
+infixr 9 &
+(&) = flip (∘)
diff --git a/Data/Lens/TH.hs b/Data/Lens/TH.hs
deleted file mode 100644
--- a/Data/Lens/TH.hs
+++ /dev/null
@@ -1,105 +0,0 @@
-{-# LANGUAGE ViewPatterns, TemplateHaskell #-}
-
-module Data.Lens.TH (mkLens) where
-
-import Prelude hiding (concat, concatMap, foldr, foldl, foldl1)
-
-import Control.Applicative
-import Control.Arrow
-import Control.Category.Unicode
-import Control.Monad
-import Data.Bool (bool)
-import Data.Function (on)
-import Data.Lens
-import qualified Data.List as List
-import Data.Maybe
-import Data.Map (Map)
-import qualified Data.Map as Map
-import Data.Ord.Unicode
-import Data.Set (Set)
-import qualified Data.Set as Set
-import Data.Monoid
-import Data.Foldable
-import Data.Foldable.Unicode
-import Data.Traversable
-import Language.Haskell.TH
-import Language.Haskell.TH.Syntax
-
-reifyTyConDec :: Name -> Q ([TyVarBndr], [Con])
-reifyTyConDec =
-    fmap (\ case TyConI (DataD    _ _ bs _ cs _) -> (bs, cs)
-                 TyConI (NewtypeD _ _ bs _ c  _) -> (bs, [c])
-                 _ -> error "name of no simple type constructor") ∘ reify
-
-mkLens :: ([Char] -> [Char]) -> Name -> Q [Dec]
-mkLens name v0 =
-    reifyTyConDec v0 >>= \ (bs@(fmap binderName -> vs0), cs) ->
-    let labels :: [((Name, Type), [Name])]
-        labels =
-          (factorizeL ∘
-           concatMap
-           (\ case RecC v (fmap (\ (v, _, t) -> (v, t)) -> vts) -> flip (,) v <$> vts
-                   _ -> [])) cs
-
-        goT :: ((Name, Type), [Name]) -> Q Type
-        goT ((v, t), us) =
-          (\ vm ->
-           ForallT (liftA2 List.union id (fmap (/. vm)) bs) [] $
-           foldl1 AppT [ConT ''Data.Lens.Lens,
-                        foldl AppT (ConT v0) (VarT <$> vs0),
-                        foldl AppT (ConT v0) (VarT <$> (vs0 /. vm)),
-                        t, t /. vm]) <$>
-           foldrM (\ v m -> flip (Map.insert v) m <$> newName (nameBase v)) Map.empty
-           (Set.filter
-            (\ v ->
-             -- can not make lens polymorphic in type variable shared between multiple labels
-             (≤ 1) ∘ length $ List.filter (fst & snd & freeTypeVars & (v ∈)) labels) (freeTypeVars t))
-
-        goX :: ((Name, Type), [Name]) -> Q Exp
-        goX ((v, t), us) =
-          (\ (u, w) ->
-           foldl1 AppE
-           [VarE 'Data.Lens.lens,
-            LamCaseE ((\ u -> Match (RecP u [(v, VarP w)]) (NormalB $ VarE w) []) <$> us),
-            LamE [VarP w, VarP u] (RecUpdE (VarE u) [(v, VarE w)])]) <$> liftA2 (,) (newName "u") (newName "v")
-    in (traverse
-        ((\ l@((mkName ∘ name ∘ nameBase -> v, _), _) -> liftA3 (,,) (pure v) (goT l) (goX l)) &
-         fmap (\ (v, t, x) -> [SigD v t, ValD (VarP v) (NormalB x) []])) & fmap concat) labels
-
-freeTypeVars :: Type -> Set Name
-freeTypeVars (ForallT (fmap binderName & Set.fromList -> vs) _ t) = freeTypeVars t `Set.difference` vs
-freeTypeVars (AppT s t) = freeTypeVars s <> freeTypeVars t
-freeTypeVars (SigT t _) = freeTypeVars t
-freeTypeVars (VarT v) = Set.singleton v
-freeTypeVars _ = Set.empty
-
-binderName :: TyVarBndr -> Name
-binderName (PlainTV v) = v
-binderName (KindedTV v _) = v
-
-class Functor' b a where fmap' :: (a -> a) -> b -> b
-
-instance Functor' Type Name where
-    fmap' f (ForallT bs@(fmap binderName & Set.fromList -> vs) c t) = ForallT bs c $ fmap' (liftA3 bool f id (∈ vs)) t
-    fmap' f (AppT s t) = AppT (fmap' f s) (fmap' f t)
-    fmap' f (SigT t k) = AppT (fmap' f t) k
-    fmap' f (VarT v) = VarT (f v)
-    fmap' f t = t
-
-instance Functor' TyVarBndr Name where
-    fmap' f (PlainTV v) = PlainTV (f v)
-    fmap' f (KindedTV v k) = KindedTV (f v) k
-
-instance Functor f => Functor' (f a) a where fmap' = fmap
-
-(/.) :: (Ord a, Functor' b a) => b -> Map a a -> b
-xs /. m = liftA2 fromMaybe id (flip Map.lookup m) `fmap'` xs
-
-factorizeLBy :: (a -> a -> Bool) -> [(a, b)] -> [(a, [b])]
-factorizeLBy (==) = List.groupBy ((==) `on` fst) & fmap (unzip >>> head *** id)
-
-factorizeL :: (Eq a) => [(a, b)] -> [(a, [b])]
-factorizeL = factorizeLBy (==)
-
-infixr 9 &
-(&) = flip (∘)
diff --git a/lenz-template.cabal b/lenz-template.cabal
--- a/lenz-template.cabal
+++ b/lenz-template.cabal
@@ -1,5 +1,5 @@
 name:		lenz-template
-version:	0.1.0.1
+version:	0.2.0.0
 synopsis:	Van Laarhoven lens templates
 license:	OtherLicense
 license-file:	LICENSE
@@ -10,6 +10,6 @@
 cabal-version:	>=1.4
 
 library
-  exposed-modules:	Data.Lens.TH
-  build-depends:	base >= 4.10 && < 4.11, base-unicode-symbols >= 0.1 && < 0.3, template-haskell >= 2.12 && < 2.13, containers >= 0.5 && < 0.6, lenz >= 0.1 && < 0.2
+  exposed-modules:	Control.Lens.TH
+  build-depends:	base >= 4.9 && < 4.11, base-unicode-symbols >= 0.1 && < 0.3, template-haskell >= 2.11 && < 2.13, containers >= 0.5 && < 0.6, lenz >= 0.2 && < 0.3
   extensions:		LambdaCase, MultiParamTypeClasses, FlexibleInstances