diff --git a/pdflib/Makefile b/pdfminer/Makefile
similarity index 100%
rename from pdflib/Makefile
rename to pdfminer/Makefile
diff --git a/pdflib/__init__.py b/pdfminer/__init__.py
similarity index 100%
rename from pdflib/__init__.py
rename to pdfminer/__init__.py
diff --git a/pdflib/arcfour.py b/pdfminer/arcfour.py
similarity index 100%
rename from pdflib/arcfour.py
rename to pdfminer/arcfour.py
diff --git a/pdflib/ascii85.py b/pdfminer/ascii85.py
similarity index 100%
rename from pdflib/ascii85.py
rename to pdfminer/ascii85.py
diff --git a/pdflib/cmap.py b/pdfminer/cmap.py
similarity index 100%
rename from pdflib/cmap.py
rename to pdfminer/cmap.py
diff --git a/pdflib/converter.py b/pdfminer/converter.py
similarity index 100%
rename from pdflib/converter.py
rename to pdfminer/converter.py
diff --git a/pdflib/fontmetrics.py b/pdfminer/fontmetrics.py
similarity index 100%
rename from pdflib/fontmetrics.py
rename to pdfminer/fontmetrics.py
diff --git a/pdflib/glyphlist.py b/pdfminer/glyphlist.py
similarity index 100%
rename from pdflib/glyphlist.py
rename to pdfminer/glyphlist.py
diff --git a/pdfminer/latin2ascii.py b/pdfminer/latin2ascii.py
new file mode 100644
index 0000000..f182d90
--- /dev/null
+++ b/pdfminer/latin2ascii.py
@@ -0,0 +1,80 @@
+# latin2ascii.py
+LATIN2ASCII = {
+  # iso-8859-1
+  0x00c0: 'A`',
+  0x00c1: "A'",
+  0x00c2: 'A^',
+  0x00c3: 'A~',
+  0x00c4: 'A:',
+  0x00c5: 'A%',
+  0x00c6: 'AE',
+  0x00c7: 'C,',
+  0x00c8: 'E`',
+  0x00c9: "E'",
+  0x00ca: 'E^',
+  0x00cb: 'E:',
+  0x00cc: 'I`',
+  0x00cd: "I'",
+  0x00ce: 'I^',
+  0x00cf: 'I:',
+  0x00d0: "D'",
+  0x00d1: 'N~',
+  0x00d2: 'O`',
+  0x00d3: "O'",
+  0x00d4: 'O^',
+  0x00d5: 'O~',
+  0x00d6: 'O:',
+  0x00d8: 'O/',
+  0x00d9: 'U`',
+  0x00da: "U'",
+  0x00db: 'U~',
+  0x00dc: 'U:',
+  0x00dd: "Y'",
+  0x00df: 'ss',
+
+  0x00e0: 'a`',
+  0x00e1: "a'",
+  0x00e2: 'a^',
+  0x00e3: 'a~',
+  0x00e4: 'a:',
+  0x00e5: 'a%',
+  0x00e6: 'ae',
+  0x00e7: 'c,',
+  0x00e8: 'e`',
+  0x00e9: "e'",
+  0x00ea: 'e^',
+  0x00eb: 'e:',
+  0x00ec: 'i`',
+  0x00ed: "i'",
+  0x00ee: 'i^',
+  0x00ef: 'i:',
+  0x00f0: "d'",
+  0x00f1: 'n~',
+  0x00f2: 'o`',
+  0x00f3: "o'",
+  0x00f4: 'o^',
+  0x00f5: 'o~',
+  0x00f6: 'o:',
+  0x00f8: 'o/',
+  0x00f9: 'o`',
+  0x00fa: "u'",
+  0x00fb: 'u~',
+  0x00fc: 'u:',
+  0x00fd: "y'",
+  0x00ff: 'y:',
+
+  # Ligatures
+  0x0152: 'OE',
+  0x0153: 'oe',
+  0x0132: 'IJ',
+  0x0133: 'ij',
+  0x1d6b: 'ue',
+  0xfb00: 'ff',
+  0xfb01: 'fi',
+  0xfb02: 'fl',
+  0xfb03: 'ffi',
+  0xfb04: 'ffl',
+  0xfb05: 'ft',
+  0xfb06: 'st',
+
+}
diff --git a/pdflib/latin_enc.py b/pdfminer/latin_enc.py
similarity index 100%
rename from pdflib/latin_enc.py
rename to pdfminer/latin_enc.py
diff --git a/pdflib/layout.py b/pdfminer/layout.py
similarity index 100%
rename from pdflib/layout.py
rename to pdfminer/layout.py
diff --git a/pdflib/lzw.py b/pdfminer/lzw.py
similarity index 100%
rename from pdflib/lzw.py
rename to pdfminer/lzw.py
diff --git a/pdflib/pdfcolor.py b/pdfminer/pdfcolor.py
similarity index 100%
rename from pdflib/pdfcolor.py
rename to pdfminer/pdfcolor.py
diff --git a/pdflib/pdfdevice.py b/pdfminer/pdfdevice.py
similarity index 100%
rename from pdflib/pdfdevice.py
rename to pdfminer/pdfdevice.py
diff --git a/pdflib/pdffont.py b/pdfminer/pdffont.py
similarity index 100%
rename from pdflib/pdffont.py
rename to pdfminer/pdffont.py
diff --git a/pdflib/pdfinterp.py b/pdfminer/pdfinterp.py
similarity index 100%
rename from pdflib/pdfinterp.py
rename to pdfminer/pdfinterp.py
diff --git a/pdflib/pdfparser.py b/pdfminer/pdfparser.py
similarity index 100%
rename from pdflib/pdfparser.py
rename to pdfminer/pdfparser.py
diff --git a/pdflib/pdftypes.py b/pdfminer/pdftypes.py
similarity index 100%
rename from pdflib/pdftypes.py
rename to pdfminer/pdftypes.py
diff --git a/pdflib/psparser.py b/pdfminer/psparser.py
similarity index 100%
rename from pdflib/psparser.py
rename to pdfminer/psparser.py
diff --git a/pdflib/pycdb.py b/pdfminer/pycdb.py
similarity index 100%
rename from pdflib/pycdb.py
rename to pdfminer/pycdb.py
diff --git a/pdflib/rijndael.py b/pdfminer/rijndael.py
similarity index 100%
rename from pdflib/rijndael.py
rename to pdfminer/rijndael.py
diff --git a/pdflib/utils.py b/pdfminer/utils.py
similarity index 100%
rename from pdflib/utils.py
rename to pdfminer/utils.py
diff --git a/tools/conv_cmap.py b/tools/conv_cmap.py
index c84ad84..e5fc4ec 100755
--- a/tools/conv_cmap.py
+++ b/tools/conv_cmap.py
@@ -7,7 +7,7 @@ def dumpcdb(cmap, cdbfile, verbose=1):
   try:
     import cdb
   except ImportError:
-    import pdflib.pycdb as cdb
+    import pdfminer.pycdb as cdb
   m = cdb.cdbmake(cdbfile, cdbfile+'.tmp')
   if verbose:
     print >>stderr, 'Writing: %r...' % cdbfile
@@ -21,7 +21,7 @@ def dumpcdb(cmap, cdbfile, verbose=1):
   return
 
 def convert_cmap(files, cmapdir, cdbcmapdir, force=False):
-  from pdflib.cmap import CMapDB
+  from pdfminer.cmap import CMapDB
   CMapDB.initialize(cmapdir)
   for fname in files:
     if fname.endswith('.upr'): continue
diff --git a/tools/dumppdf.py b/tools/dumppdf.py
index a3396ad..3003555 100755
--- a/tools/dumppdf.py
+++ b/tools/dumppdf.py
@@ -7,8 +7,8 @@
 #    -i objid : object id
 #
 import sys, re
-from pdflib.pdfparser import PDFDocument, PDFParser
-from pdflib.pdftypes import PDFStream, PDFObjRef, PSKeyword, PSLiteral, resolve1
+from pdfminer.pdfparser import PDFDocument, PDFParser
+from pdfminer.pdftypes import PDFStream, PDFObjRef, PSKeyword, PSLiteral, resolve1
 
 
 ESC_PAT = re.compile(r'[\000-\037&<>()\042\047\134\177-\377]')
diff --git a/tools/pdf2txt.py b/tools/pdf2txt.py
index 4adb809..96a7a23 100755
--- a/tools/pdf2txt.py
+++ b/tools/pdf2txt.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 import sys
-from pdflib.pdfparser import PDFDocument, PDFParser
-from pdflib.pdfinterp import PDFResourceManager, PDFPageInterpreter, process_pdf
-from pdflib.converter import SGMLConverter, HTMLConverter, TextConverter, TagExtractor
-from pdflib.cmap import CMapDB
+from pdfminer.pdfparser import PDFDocument, PDFParser
+from pdfminer.pdfinterp import PDFResourceManager, PDFPageInterpreter, process_pdf
+from pdfminer.converter import SGMLConverter, HTMLConverter, TextConverter, TagExtractor
+from pdfminer.cmap import CMapDB
 
 # main
 def main(argv):
diff --git a/tools/viewpdf.py b/tools/viewpdf.py
index e9ad95e..ec25d12 100755
--- a/tools/viewpdf.py
+++ b/tools/viewpdf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import sys
-from pdflib.sgml import PDFSGMLParser, Document
+from sgml import PDFSGMLParser, Document
 stdout = sys.stdout
 stderr = sys.stderr
 try: