diff --git a/Makefile b/Makefile
index ce8af74..625ea39 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,6 @@ PYTHON=python
 RM=rm -f
 CP=cp -f
 
-VERSION=`$(PYTHON) $(PACKAGE)/__init__.py`
-DISTFILE=$(PACKAGE)-$(VERSION).tar.gz
-
 all:
 
 install:
@@ -39,6 +36,8 @@ sdist: clean
 register: clean
 	$(PYTHON) setup.py sdist upload register
 
+VERSION=`$(PYTHON) $(PACKAGE)/__init__.py`
+DISTFILE=$(PACKAGE)-$(VERSION).tar.gz
 WEBDIR=$$HOME/Site/unixuser.org/python/$(PACKAGE)
 publish: sdist
 	$(CP) dist/$(DISTFILE) $(WEBDIR)
diff --git a/pdfminer/cmap.py b/pdfminer/cmap.py
index 0356247..b924272 100644
--- a/pdfminer/cmap.py
+++ b/pdfminer/cmap.py
@@ -1,14 +1,25 @@
 #!/usr/bin/env python
-import sys, re, os, os.path
-stderr = sys.stderr
-from struct import pack, unpack
-from pdfminer.utils import choplist, nunpack
-from pdfminer.fontmetrics import FONT_METRICS
-from pdfminer.latin_enc import ENCODING
-from pdfminer.glyphlist import charname2unicode
-from pdfminer.psparser import PSException, PSSyntaxError, PSTypeError, PSEOF, \
-     PSLiteral, PSKeyword, literal_name, keyword_name, \
-     PSStackParser
+import sys
+import re
+import os
+import os.path
+from sys import stderr
+from struct import pack
+from struct import unpack
+from fontmetrics import FONT_METRICS
+from latin_enc import ENCODING
+from glyphlist import charname2unicode
+from psparser import PSException
+from psparser import PSSyntaxError
+from psparser import PSTypeError
+from psparser import PSEOF
+from psparser import PSLiteral
+from psparser import PSKeyword
+from psparser import literal_name
+from psparser import keyword_name
+from psparser import PSStackParser
+from utils import choplist
+from utils import nunpack
 try:
     import cdb
 except ImportError:
diff --git a/pdfminer/converter.py b/pdfminer/converter.py
index ae22b47..214f9fe 100644
--- a/pdfminer/converter.py
+++ b/pdfminer/converter.py
@@ -1,9 +1,20 @@
 #!/usr/bin/env python
 import sys
-from pdfminer.pdfdevice import PDFDevice, PDFTextDevice
-from pdfminer.pdffont import PDFUnicodeNotDefined
-from pdfminer.layout import LayoutContainer, LTPage, LTText, LTLine, LTRect, LTFigure, LTTextItem, LTTextBox, LTTextLine
-from pdfminer.utils import apply_matrix_pt, mult_matrix, enc
+from pdfdevice import PDFDevice
+from pdfdevice import PDFTextDevice
+from pdffont import PDFUnicodeNotDefined
+from layout import LayoutContainer
+from layout import LTPage
+from layout import LTText
+from layout import LTLine
+from layout import LTRect
+from layout import LTFigure
+from layout import LTTextItem
+from layout import LTTextBox
+from layout import LTTextLine
+from utils import apply_matrix_pt
+from utils import mult_matrix
+from utils import enc
 
 
 ##  TagExtractor
diff --git a/pdfminer/layout.py b/pdfminer/layout.py
index 4001fe8..cad790a 100644
--- a/pdfminer/layout.py
+++ b/pdfminer/layout.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 import sys
-from pdfminer.utils import apply_matrix_norm, apply_matrix_pt, bsearch
-INF = sys.maxint
+from sys import maxint as INF
+from utils import apply_matrix_norm
+from utils import apply_matrix_pt
+from utils import bsearch
 
 
 ##  LAParams
diff --git a/pdfminer/lzw.py b/pdfminer/lzw.py
index 8de8336..dd1c86e 100644
--- a/pdfminer/lzw.py
+++ b/pdfminer/lzw.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import sys
-stderr = sys.stderr
+from sys import stderr
 
 
 ##  LZWDecoder
diff --git a/pdfminer/pdfcolor.py b/pdfminer/pdfcolor.py
index 20bcd72..4792bfe 100644
--- a/pdfminer/pdfcolor.py
+++ b/pdfminer/pdfcolor.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-import sys
-from pdfminer.psparser import PSLiteralTable
+from psparser import PSLiteralTable
 
 
 ##  PDFColorSpace
diff --git a/pdfminer/pdfdevice.py b/pdfminer/pdfdevice.py
index fa63357..02f0ec9 100644
--- a/pdfminer/pdfdevice.py
+++ b/pdfminer/pdfdevice.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
-
 import sys
-from pdfminer.utils import mult_matrix, translate_matrix
-from pdfminer.pdffont import PDFUnicodeNotDefined
+from utils import mult_matrix
+from utils import translate_matrix
+from pdffont import PDFUnicodeNotDefined
 
 
 ##  PDFDevice
diff --git a/pdfminer/pdffont.py b/pdfminer/pdffont.py
index 90216c4..4e74b8c 100644
--- a/pdfminer/pdffont.py
+++ b/pdfminer/pdffont.py
@@ -1,17 +1,33 @@
 #!/usr/bin/env python
 import sys
-from struct import pack, unpack
+from cmap import CMap
+from cmap import CMapDB
+from cmap import CMapParser
+from cmap import FontMetricsDB
+from cmap import EncodingDB
+from struct import pack
+from struct import unpack
+from psparser import PSLiteralTable
+from psparser import PSKeywordTable
+from psparser import PSLiteral
+from psparser import literal_name
+from psparser import keyword_name
+from psparser import STRICT
+from pdftypes import PDFException
+from pdftypes import resolve1
+from pdftypes import int_value
+from pdftypes import float_value
+from pdftypes import num_value
+from pdftypes import str_value
+from pdftypes import list_value
+from pdftypes import dict_value
+from pdftypes import stream_value
+from utils import apply_matrix_norm
+from utils import nunpack
 try:
     from cStringIO import StringIO
 except ImportError:
     from StringIO import StringIO
-from pdfminer.psparser import PSLiteralTable, PSKeywordTable, PSLiteral, \
-     literal_name, keyword_name, STRICT
-from pdfminer.pdftypes import PDFException, \
-     resolve1, int_value, float_value, num_value, \
-     str_value, list_value, dict_value, stream_value
-from pdfminer.cmap import CMap, CMapDB, CMapParser, FontMetricsDB, EncodingDB
-from pdfminer.utils import apply_matrix_norm, nunpack
 
 
 ##  CFFFont
@@ -574,4 +590,5 @@ def main(argv):
         CFFFont(fp)
         fp.close()
     return
+
 if __name__ == '__main__': sys.exit(main(sys.argv))
diff --git a/pdfminer/pdfinterp.py b/pdfminer/pdfinterp.py
index 4966ecc..520df73 100644
--- a/pdfminer/pdfinterp.py
+++ b/pdfminer/pdfinterp.py
@@ -1,23 +1,49 @@
 #!/usr/bin/env python
-import sys, re
-stderr = sys.stderr
+import re
+from sys import stderr
 from struct import pack, unpack
 try:
     from cStringIO import StringIO
 except ImportError:
     from StringIO import StringIO
-from pdfminer.psparser import PSException, PSTypeError, PSEOF, \
-     PSLiteralTable, PSKeywordTable, literal_name, keyword_name, \
-     PSStackParser, PSKeyword, STRICT
-from pdfminer.pdftypes import PDFException, PDFStream, PDFObjRef, \
-     resolve1, int_value, float_value, num_value, \
-     str_value, list_value, dict_value, stream_value
-from pdfminer.utils import choplist, mult_matrix, MATRIX_IDENTITY
-from pdfminer.pdffont import PDFFontError, PDFType1Font, PDFTrueTypeFont, PDFType3Font, PDFCIDFont
-from pdfminer.pdfparser import PDFDocument, PDFParser, PDFPasswordIncorrect
-from pdfminer.pdfcolor import PDFColorSpace, PREDEFINED_COLORSPACE, \
-     LITERAL_DEVICE_GRAY, LITERAL_DEVICE_RGB, LITERAL_DEVICE_CMYK
-from pdfminer.cmap import CMapDB
+from cmap import CMapDB
+from psparser import PSException
+from psparser import PSTypeError
+from psparser import PSEOF
+from psparser import PSLiteralTable
+from psparser import PSKeywordTable
+from psparser import literal_name
+from psparser import keyword_name
+from psparser import PSStackParser
+from psparser import PSKeyword
+from psparser import STRICT
+from pdftypes import PDFException
+from pdftypes import PDFStream
+from pdftypes import PDFObjRef
+from pdftypes import resolve1
+from pdftypes import int_value
+from pdftypes import float_value
+from pdftypes import num_value
+from pdftypes import str_value
+from pdftypes import list_value
+from pdftypes import dict_value
+from pdftypes import stream_value
+from pdffont import PDFFontError
+from pdffont import PDFType1Font
+from pdffont import PDFTrueTypeFont
+from pdffont import PDFType3Font
+from pdffont import PDFCIDFont
+from pdfparser import PDFDocument
+from pdfparser import PDFParser
+from pdfparser import PDFPasswordIncorrect
+from pdfcolor import PDFColorSpace
+from pdfcolor import PREDEFINED_COLORSPACE
+from pdfcolor import LITERAL_DEVICE_GRAY
+from pdfcolor import LITERAL_DEVICE_RGB
+from pdfcolor import LITERAL_DEVICE_CMYK
+from utils import choplist
+from utils import mult_matrix
+from utils import MATRIX_IDENTITY
 
 
 ##  Exceptions
diff --git a/pdfminer/pdfparser.py b/pdfminer/pdfparser.py
index 7c04d42..2e903bf 100644
--- a/pdfminer/pdfparser.py
+++ b/pdfminer/pdfparser.py
@@ -1,19 +1,35 @@
 #!/usr/bin/env python
-
-# pdfparser.py, Yusuke Shinyama
-#  ver 0.1, Dec 24 2004-
-#  ver 0.2, Dec 24 2007
-
-import sys, re
-import md5, struct
-stderr = sys.stderr
-from pdfminer.utils import choplist, nunpack, decode_text
-from pdfminer.arcfour import Arcfour
-from pdfminer.psparser import PSStackParser, PSSyntaxError, PSEOF, \
-     PSLiteralTable, PSKeywordTable, literal_name, keyword_name, STRICT
-from pdfminer.pdftypes import PDFException, PDFTypeError, PDFNotImplementedError, \
-     PDFStream, PDFObjRef, resolve1, decipher_all, \
-     int_value, float_value, num_value, str_value, list_value, dict_value, stream_value
+import sys
+import re
+import md5
+import struct
+from sys import stderr
+from utils import choplist
+from utils import nunpack
+from utils import decode_text
+from arcfour import Arcfour
+from psparser import PSStackParser
+from psparser import PSSyntaxError
+from psparser import PSEOF
+from psparser import PSLiteralTable
+from psparser import PSKeywordTable
+from psparser import literal_name
+from psparser import keyword_name
+from psparser import STRICT
+from pdftypes import PDFException
+from pdftypes import PDFTypeError
+from pdftypes import PDFNotImplementedError
+from pdftypes import PDFStream
+from pdftypes import PDFObjRef
+from pdftypes import resolve1
+from pdftypes import decipher_all
+from pdftypes import int_value
+from pdftypes import float_value
+from pdftypes import num_value
+from pdftypes import str_value
+from pdftypes import list_value
+from pdftypes import dict_value
+from pdftypes import stream_value
 
 
 ##  Exceptions
diff --git a/pdfminer/pdftypes.py b/pdfminer/pdftypes.py
index 5ec737a..129bcd0 100644
--- a/pdfminer/pdftypes.py
+++ b/pdfminer/pdftypes.py
@@ -1,9 +1,16 @@
 #!/usr/bin/env python
-import sys, zlib
-from pdfminer.lzw import LZWDecoder
-from pdfminer.psparser import PSException, PSObject, \
-     PSLiteral, PSKeyword, PSLiteralTable, PSKeywordTable, \
-     literal_name, keyword_name, STRICT
+import sys
+import zlib
+from lzw import LZWDecoder
+from psparser import PSException
+from psparser import PSObject
+from psparser import PSLiteral
+from psparser import PSKeyword
+from psparser import PSLiteralTable
+from psparser import PSKeywordTable
+from psparser import literal_name
+from psparser import keyword_name
+from psparser import STRICT
 
 LITERAL_CRYPT = PSLiteralTable.intern('Crypt')
 LITERALS_FLATE_DECODE = (PSLiteralTable.intern('FlateDecode'), PSLiteralTable.intern('Fl'))
diff --git a/pdfminer/psparser.py b/pdfminer/psparser.py
index 85198ea..aa69192 100644
--- a/pdfminer/psparser.py
+++ b/pdfminer/psparser.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
-import sys, re
-stderr = sys.stderr
-from pdfminer.utils import choplist
+import sys
+import re
+from sys import stderr
+from utils import choplist
 
 STRICT = 0
 
diff --git a/pdfminer/pycdb.py b/pdfminer/pycdb.py
index eec4dbf..9229887 100755
--- a/pdfminer/pycdb.py
+++ b/pdfminer/pycdb.py
@@ -6,8 +6,10 @@
 #   * public domain *
 #
 
-import sys, os
-from struct import pack, unpack
+import sys
+import os
+from struct import pack
+from struct import unpack
 from array import array
 
 
diff --git a/pdfminer/rijndael.py b/pdfminer/rijndael.py
index 0d53334..b12d354 100644
--- a/pdfminer/rijndael.py
+++ b/pdfminer/rijndael.py
@@ -7,7 +7,8 @@
 ##  http://www.efgh.com/software/rijndael.htm
 ##
 import sys
-from struct import pack, unpack
+from struct import pack
+from struct import unpack
 
 def KEYLENGTH(keybits): return (keybits)/8
 def RKLENGTH(keybits): return (keybits)/8+28