diff --git a/FileManip.cabal b/FileManip.cabal
--- a/FileManip.cabal
+++ b/FileManip.cabal
@@ -1,19 +1,29 @@
-Name:		FileManip
-Version:	0.2
-License:	LGPL
-License-File:	COPYING.LIB
-Author:		Bryan O'Sullivan <bos@serpentine.com>
-Maintainer:	Bryan O'Sullivan
-Synopsis:	Expressive file and directory manipulation for Haskell.
-Category:	System
-Description:	A Haskell library for working with files and directories.
-		Includes code for pattern matching, finding files,
-		modifying file contents, and more.
-Build-Depends:	base, filepath, mtl, unix
-GHC-Options:    -Wall -O2
-Exposed-Modules:
-	System.FilePath.Find,
-	System.FilePath.Glob,
-	System.FilePath.GlobPattern,
-	System.FilePath.Manip
-Extra-Source-Files: README
+Name:           FileManip
+Version:        0.3
+License:        LGPL
+License-File:   COPYING.LIB
+Author:         Bryan O'Sullivan <bos@serpentine.com>
+Maintainer:     Bryan O'Sullivan
+Synopsis:       Expressive file and directory manipulation for Haskell.
+Category:       System
+Description:    A Haskell library for working with files and directories.
+                Includes code for pattern matching, finding files,
+                modifying file contents, and more.
+Cabal-version:  >= 1.2
+
+Flag splitBase
+  Description:     Choose the new, split-up base package.
+
+Library
+  if flag(splitBase)
+    Build-Depends: base, bytestring, directory, filepath, mtl, unix
+  else
+    Build-Depends: base, filepath, mtl, unix
+
+  GHC-Options:    -Wall -O2
+  Exposed-Modules:
+          System.FilePath.Find,
+          System.FilePath.Glob,
+          System.FilePath.GlobPattern,
+          System.FilePath.Manip
+  Extra-Source-Files: README
diff --git a/README b/README
deleted file mode 100644
--- a/README
+++ /dev/null
@@ -1,50 +0,0 @@
-FileManip: expressive file manipulation
----------------------------------------
-
-This package provides functions and combinators for searching,
-matching, and manipulating files.
-
-It provides four modules.
-
-System.FilePath.Find lets you search a filesystem hierarchy efficiently:
-
-  find always (extension ==? ".pl") >>= mapM_ remove
-
-System.FilePath.GlobPattern lets you perform glob-style pattern
-matching, without going through a regexp engine:
-
-  "foo.c" ~~ "*.c"  ==> True
-
-System.FilePath.Glob lets you do simple glob-style file name searches:
-
-  namesMatching "*/*.c"  ==>  ["foo/bar.c"]
-
-System.FilePath.Manip lets you rename files procedurally, edit files
-in place, or save old copies as backups:
-
-  modifyWithBackup (<.> "bak")
-                   (unlines . map (takeWhile (/= ',')) . lines)
-                   "myPoorFile.csv"
-
-
-To build and install:
-
-  runhaskell Setup configure
-  runhaskell Setup build
-  runhaskell Setup install
-
-
-To understand:
-
-  http://darcs.serpentine.com/filemanip/dist/doc/html/FileManip/
-
-
-
-To contribute:
-
-  darcs get http://darcs.serpentine.com/filemanip
-
-
-Contributors:
-
-  Bryan O'Sullivan
diff --git a/System/FilePath/Manip.hs b/System/FilePath/Manip.hs
--- a/System/FilePath/Manip.hs
+++ b/System/FilePath/Manip.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-}
 
 -- |
 -- Module:      System.FilePath.Manip