diff --git a/ChangeLog b/ChangeLog
index b2debc9..d756e62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-27  Jean-Paul Calderone  <exarkun@twistedmatrix.com>
+
+	* Re-arrange the repository so that the package can be built and
+	  used in-place without requiring installation.
+
 2010-02-27  James Yonan <james@openvpn.net>
 
 	* src/crypto/crypto.c: Added crypto.sign and crypto.verify methods
diff --git a/src/RATIONALE b/OpenSSL/RATIONALE
similarity index 100%
rename from src/RATIONALE
rename to OpenSSL/RATIONALE
diff --git a/__init__.py b/OpenSSL/__init__.py
similarity index 100%
rename from __init__.py
rename to OpenSSL/__init__.py
diff --git a/src/crypto/crl.c b/OpenSSL/crypto/crl.c
similarity index 100%
rename from src/crypto/crl.c
rename to OpenSSL/crypto/crl.c
diff --git a/src/crypto/crl.h b/OpenSSL/crypto/crl.h
similarity index 100%
rename from src/crypto/crl.h
rename to OpenSSL/crypto/crl.h
diff --git a/src/crypto/crypto.c b/OpenSSL/crypto/crypto.c
similarity index 100%
rename from src/crypto/crypto.c
rename to OpenSSL/crypto/crypto.c
diff --git a/src/crypto/crypto.h b/OpenSSL/crypto/crypto.h
similarity index 100%
rename from src/crypto/crypto.h
rename to OpenSSL/crypto/crypto.h
diff --git a/src/crypto/netscape_spki.c b/OpenSSL/crypto/netscape_spki.c
similarity index 100%
rename from src/crypto/netscape_spki.c
rename to OpenSSL/crypto/netscape_spki.c
diff --git a/src/crypto/netscape_spki.h b/OpenSSL/crypto/netscape_spki.h
similarity index 100%
rename from src/crypto/netscape_spki.h
rename to OpenSSL/crypto/netscape_spki.h
diff --git a/src/crypto/pkcs12.c b/OpenSSL/crypto/pkcs12.c
similarity index 100%
rename from src/crypto/pkcs12.c
rename to OpenSSL/crypto/pkcs12.c
diff --git a/src/crypto/pkcs12.h b/OpenSSL/crypto/pkcs12.h
similarity index 100%
rename from src/crypto/pkcs12.h
rename to OpenSSL/crypto/pkcs12.h
diff --git a/src/crypto/pkcs7.c b/OpenSSL/crypto/pkcs7.c
similarity index 100%
rename from src/crypto/pkcs7.c
rename to OpenSSL/crypto/pkcs7.c
diff --git a/src/crypto/pkcs7.h b/OpenSSL/crypto/pkcs7.h
similarity index 100%
rename from src/crypto/pkcs7.h
rename to OpenSSL/crypto/pkcs7.h
diff --git a/src/crypto/pkey.c b/OpenSSL/crypto/pkey.c
similarity index 100%
rename from src/crypto/pkey.c
rename to OpenSSL/crypto/pkey.c
diff --git a/src/crypto/pkey.h b/OpenSSL/crypto/pkey.h
similarity index 100%
rename from src/crypto/pkey.h
rename to OpenSSL/crypto/pkey.h
diff --git a/src/crypto/revoked.c b/OpenSSL/crypto/revoked.c
similarity index 100%
rename from src/crypto/revoked.c
rename to OpenSSL/crypto/revoked.c
diff --git a/src/crypto/revoked.h b/OpenSSL/crypto/revoked.h
similarity index 100%
rename from src/crypto/revoked.h
rename to OpenSSL/crypto/revoked.h
diff --git a/src/crypto/x509.c b/OpenSSL/crypto/x509.c
similarity index 100%
rename from src/crypto/x509.c
rename to OpenSSL/crypto/x509.c
diff --git a/src/crypto/x509.h b/OpenSSL/crypto/x509.h
similarity index 100%
rename from src/crypto/x509.h
rename to OpenSSL/crypto/x509.h
diff --git a/src/crypto/x509ext.c b/OpenSSL/crypto/x509ext.c
similarity index 100%
rename from src/crypto/x509ext.c
rename to OpenSSL/crypto/x509ext.c
diff --git a/src/crypto/x509ext.h b/OpenSSL/crypto/x509ext.h
similarity index 100%
rename from src/crypto/x509ext.h
rename to OpenSSL/crypto/x509ext.h
diff --git a/src/crypto/x509name.c b/OpenSSL/crypto/x509name.c
similarity index 100%
rename from src/crypto/x509name.c
rename to OpenSSL/crypto/x509name.c
diff --git a/src/crypto/x509name.h b/OpenSSL/crypto/x509name.h
similarity index 100%
rename from src/crypto/x509name.h
rename to OpenSSL/crypto/x509name.h
diff --git a/src/crypto/x509req.c b/OpenSSL/crypto/x509req.c
similarity index 100%
rename from src/crypto/x509req.c
rename to OpenSSL/crypto/x509req.c
diff --git a/src/crypto/x509req.h b/OpenSSL/crypto/x509req.h
similarity index 100%
rename from src/crypto/x509req.h
rename to OpenSSL/crypto/x509req.h
diff --git a/src/crypto/x509store.c b/OpenSSL/crypto/x509store.c
similarity index 100%
rename from src/crypto/x509store.c
rename to OpenSSL/crypto/x509store.c
diff --git a/src/crypto/x509store.h b/OpenSSL/crypto/x509store.h
similarity index 100%
rename from src/crypto/x509store.h
rename to OpenSSL/crypto/x509store.h
diff --git a/src/pymemcompat.h b/OpenSSL/pymemcompat.h
similarity index 100%
rename from src/pymemcompat.h
rename to OpenSSL/pymemcompat.h
diff --git a/src/rand/rand.c b/OpenSSL/rand/rand.c
similarity index 100%
rename from src/rand/rand.c
rename to OpenSSL/rand/rand.c
diff --git a/src/ssl/connection.c b/OpenSSL/ssl/connection.c
similarity index 100%
rename from src/ssl/connection.c
rename to OpenSSL/ssl/connection.c
diff --git a/src/ssl/connection.h b/OpenSSL/ssl/connection.h
similarity index 100%
rename from src/ssl/connection.h
rename to OpenSSL/ssl/connection.h
diff --git a/src/ssl/context.c b/OpenSSL/ssl/context.c
similarity index 100%
rename from src/ssl/context.c
rename to OpenSSL/ssl/context.c
diff --git a/src/ssl/context.h b/OpenSSL/ssl/context.h
similarity index 100%
rename from src/ssl/context.h
rename to OpenSSL/ssl/context.h
diff --git a/src/ssl/ssl.c b/OpenSSL/ssl/ssl.c
similarity index 100%
rename from src/ssl/ssl.c
rename to OpenSSL/ssl/ssl.c
diff --git a/src/ssl/ssl.h b/OpenSSL/ssl/ssl.h
similarity index 100%
rename from src/ssl/ssl.h
rename to OpenSSL/ssl/ssl.h
diff --git a/test/README b/OpenSSL/test/README
similarity index 100%
rename from test/README
rename to OpenSSL/test/README
diff --git a/test/__init__.py b/OpenSSL/test/__init__.py
similarity index 100%
rename from test/__init__.py
rename to OpenSSL/test/__init__.py
diff --git a/test/test_crypto.py b/OpenSSL/test/test_crypto.py
similarity index 100%
rename from test/test_crypto.py
rename to OpenSSL/test/test_crypto.py
diff --git a/test/test_rand.py b/OpenSSL/test/test_rand.py
similarity index 100%
rename from test/test_rand.py
rename to OpenSSL/test/test_rand.py
diff --git a/test/test_ssl.py b/OpenSSL/test/test_ssl.py
similarity index 100%
rename from test/test_ssl.py
rename to OpenSSL/test/test_ssl.py
diff --git a/test/util.py b/OpenSSL/test/util.py
similarity index 100%
rename from test/util.py
rename to OpenSSL/test/util.py
diff --git a/tsafe.py b/OpenSSL/tsafe.py
similarity index 100%
rename from tsafe.py
rename to OpenSSL/tsafe.py
diff --git a/src/util.c b/OpenSSL/util.c
similarity index 100%
rename from src/util.c
rename to OpenSSL/util.c
diff --git a/src/util.h b/OpenSSL/util.h
similarity index 100%
rename from src/util.h
rename to OpenSSL/util.h
diff --git a/version.py b/OpenSSL/version.py
similarity index 100%
rename from version.py
rename to OpenSSL/version.py
diff --git a/setup.py b/setup.py
index 9cb4364..215d012 100755
--- a/setup.py
+++ b/setup.py
@@ -19,28 +19,29 @@
 from distutils.errors import DistutilsFileError
 from distutils.command.build_ext import build_ext
 
-from version import __version__
+# XXX Deduplicate this
+__version__ = '0.10'
 
-crypto_src = ['src/crypto/crypto.c', 'src/crypto/x509.c',
-              'src/crypto/x509name.c', 'src/crypto/pkey.c',
-              'src/crypto/x509store.c', 'src/crypto/x509req.c',
-              'src/crypto/x509ext.c', 'src/crypto/pkcs7.c',
-              'src/crypto/pkcs12.c', 'src/crypto/netscape_spki.c',
-              'src/crypto/revoked.c', 'src/crypto/crl.c',
-              'src/util.c']
-crypto_dep = ['src/crypto/crypto.h', 'src/crypto/x509.h',
-              'src/crypto/x509name.h', 'src/crypto/pkey.h',
-              'src/crypto/x509store.h', 'src/crypto/x509req.h',
-              'src/crypto/x509ext.h', 'src/crypto/pkcs7.h',
-              'src/crypto/pkcs12.h', 'src/crypto/netscape_spki.h',
-              'src/crypto/revoked.h', 'src/crypto/crl.h',
-              'src/util.h']
-rand_src = ['src/rand/rand.c', 'src/util.c']
-rand_dep = ['src/util.h']
-ssl_src = ['src/ssl/connection.c', 'src/ssl/context.c', 'src/ssl/ssl.c',
-           'src/util.c']
-ssl_dep = ['src/ssl/connection.h', 'src/ssl/context.h', 'src/ssl/ssl.h',
-           'src/util.h']
+crypto_src = ['OpenSSL/crypto/crypto.c', 'OpenSSL/crypto/x509.c',
+              'OpenSSL/crypto/x509name.c', 'OpenSSL/crypto/pkey.c',
+              'OpenSSL/crypto/x509store.c', 'OpenSSL/crypto/x509req.c',
+              'OpenSSL/crypto/x509ext.c', 'OpenSSL/crypto/pkcs7.c',
+              'OpenSSL/crypto/pkcs12.c', 'OpenSSL/crypto/netscape_spki.c',
+              'OpenSSL/crypto/revoked.c', 'OpenSSL/crypto/crl.c',
+              'OpenSSL/util.c']
+crypto_dep = ['OpenSSL/crypto/crypto.h', 'OpenSSL/crypto/x509.h',
+              'OpenSSL/crypto/x509name.h', 'OpenSSL/crypto/pkey.h',
+              'OpenSSL/crypto/x509store.h', 'OpenSSL/crypto/x509req.h',
+              'OpenSSL/crypto/x509ext.h', 'OpenSSL/crypto/pkcs7.h',
+              'OpenSSL/crypto/pkcs12.h', 'OpenSSL/crypto/netscape_spki.h',
+              'OpenSSL/crypto/revoked.h', 'OpenSSL/crypto/crl.h',
+              'OpenSSL/util.h']
+rand_src = ['OpenSSL/rand/rand.c', 'OpenSSL/util.c']
+rand_dep = ['OpenSSL/util.h']
+ssl_src = ['OpenSSL/ssl/connection.c', 'OpenSSL/ssl/context.c', 'OpenSSL/ssl/ssl.c',
+           'OpenSSL/util.c']
+ssl_dep = ['OpenSSL/ssl/connection.h', 'OpenSSL/ssl/context.h', 'OpenSSL/ssl/ssl.h',
+           'OpenSSL/util.h']
 
 IncludeDirs = None
 LibraryDirs = None
@@ -198,7 +199,7 @@
 
 setup(name='pyOpenSSL', version=__version__,
       packages = ['OpenSSL'],
-      package_dir = {'OpenSSL': '.'},
+      package_dir = {'OpenSSL': 'OpenSSL'},
       ext_modules = [mkExtension('crypto'), mkExtension('rand'),
                      mkExtension('SSL')],
       py_modules  = ['OpenSSL.__init__', 'OpenSSL.tsafe',