diff --git a/crypto/openssl/CHANGES b/CHANGES
similarity index 100%
rename from crypto/openssl/CHANGES
rename to CHANGES
diff --git a/crypto/openssl/CHANGES.SSLeay b/CHANGES.SSLeay
similarity index 100%
rename from crypto/openssl/CHANGES.SSLeay
rename to CHANGES.SSLeay
diff --git a/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head b/ChangeLog.0_9_7-stable_not-in-head
similarity index 100%
rename from crypto/openssl/ChangeLog.0_9_7-stable_not-in-head
rename to ChangeLog.0_9_7-stable_not-in-head
diff --git a/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS b/ChangeLog.0_9_7-stable_not-in-head_FIPS
similarity index 100%
rename from crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS
rename to ChangeLog.0_9_7-stable_not-in-head_FIPS
diff --git a/crypto/openssl/Configure b/Configure
similarity index 100%
rename from crypto/openssl/Configure
rename to Configure
diff --git a/crypto/openssl/FAQ b/FAQ
similarity index 100%
rename from crypto/openssl/FAQ
rename to FAQ
diff --git a/crypto/openssl/INSTALL b/INSTALL
similarity index 100%
rename from crypto/openssl/INSTALL
rename to INSTALL
diff --git a/crypto/openssl/LICENSE b/LICENSE
similarity index 100%
rename from crypto/openssl/LICENSE
rename to LICENSE
diff --git a/crypto/openssl/Makefile b/Makefile
similarity index 100%
rename from crypto/openssl/Makefile
rename to Makefile
diff --git a/crypto/openssl/Makefile.org b/Makefile.org
similarity index 100%
rename from crypto/openssl/Makefile.org
rename to Makefile.org
diff --git a/crypto/openssl/Makefile.shared b/Makefile.shared
similarity index 100%
rename from crypto/openssl/Makefile.shared
rename to Makefile.shared
diff --git a/crypto/openssl/NEWS b/NEWS
similarity index 100%
rename from crypto/openssl/NEWS
rename to NEWS
diff --git a/crypto/openssl/PROBLEMS b/PROBLEMS
similarity index 100%
rename from crypto/openssl/PROBLEMS
rename to PROBLEMS
diff --git a/crypto/openssl/README b/README
similarity index 100%
rename from crypto/openssl/README
rename to README
diff --git a/crypto/openssl/README.ASN1 b/README.ASN1
similarity index 100%
rename from crypto/openssl/README.ASN1
rename to README.ASN1
diff --git a/crypto/openssl/README.ENGINE b/README.ENGINE
similarity index 100%
rename from crypto/openssl/README.ENGINE
rename to README.ENGINE
diff --git a/crypto/openssl/apps/CA.pl b/apps/CA.pl
similarity index 100%
rename from crypto/openssl/apps/CA.pl
rename to apps/CA.pl
diff --git a/crypto/openssl/apps/CA.pl.in b/apps/CA.pl.in
similarity index 100%
rename from crypto/openssl/apps/CA.pl.in
rename to apps/CA.pl.in
diff --git a/crypto/openssl/apps/CA.sh b/apps/CA.sh
similarity index 100%
rename from crypto/openssl/apps/CA.sh
rename to apps/CA.sh
diff --git a/crypto/openssl/apps/Makefile b/apps/Makefile
similarity index 100%
rename from crypto/openssl/apps/Makefile
rename to apps/Makefile
diff --git a/crypto/openssl/apps/app_rand.c b/apps/app_rand.c
similarity index 100%
rename from crypto/openssl/apps/app_rand.c
rename to apps/app_rand.c
diff --git a/crypto/openssl/apps/apps.c b/apps/apps.c
similarity index 100%
rename from crypto/openssl/apps/apps.c
rename to apps/apps.c
diff --git a/crypto/openssl/apps/apps.h b/apps/apps.h
similarity index 100%
rename from crypto/openssl/apps/apps.h
rename to apps/apps.h
diff --git a/crypto/openssl/apps/asn1pars.c b/apps/asn1pars.c
similarity index 100%
rename from crypto/openssl/apps/asn1pars.c
rename to apps/asn1pars.c
diff --git a/crypto/openssl/apps/ca-cert.srl b/apps/ca-cert.srl
similarity index 100%
rename from crypto/openssl/apps/ca-cert.srl
rename to apps/ca-cert.srl
diff --git a/crypto/openssl/apps/ca-key.pem b/apps/ca-key.pem
similarity index 100%
rename from crypto/openssl/apps/ca-key.pem
rename to apps/ca-key.pem
diff --git a/crypto/openssl/apps/ca-req.pem b/apps/ca-req.pem
similarity index 100%
rename from crypto/openssl/apps/ca-req.pem
rename to apps/ca-req.pem
diff --git a/crypto/openssl/apps/ca.c b/apps/ca.c
similarity index 100%
rename from crypto/openssl/apps/ca.c
rename to apps/ca.c
diff --git a/crypto/openssl/apps/cert.pem b/apps/cert.pem
similarity index 100%
rename from crypto/openssl/apps/cert.pem
rename to apps/cert.pem
diff --git a/crypto/openssl/apps/ciphers.c b/apps/ciphers.c
similarity index 100%
rename from crypto/openssl/apps/ciphers.c
rename to apps/ciphers.c
diff --git a/crypto/openssl/apps/client.pem b/apps/client.pem
similarity index 100%
rename from crypto/openssl/apps/client.pem
rename to apps/client.pem
diff --git a/crypto/openssl/apps/crl.c b/apps/crl.c
similarity index 100%
rename from crypto/openssl/apps/crl.c
rename to apps/crl.c
diff --git a/crypto/openssl/apps/crl2p7.c b/apps/crl2p7.c
similarity index 100%
rename from crypto/openssl/apps/crl2p7.c
rename to apps/crl2p7.c
diff --git a/crypto/openssl/apps/demoCA/cacert.pem b/apps/demoCA/cacert.pem
similarity index 100%
rename from crypto/openssl/apps/demoCA/cacert.pem
rename to apps/demoCA/cacert.pem
diff --git a/crypto/openssl/apps/demoCA/index.txt b/apps/demoCA/index.txt
similarity index 100%
rename from crypto/openssl/apps/demoCA/index.txt
rename to apps/demoCA/index.txt
diff --git a/crypto/openssl/apps/demoCA/private/cakey.pem b/apps/demoCA/private/cakey.pem
similarity index 100%
rename from crypto/openssl/apps/demoCA/private/cakey.pem
rename to apps/demoCA/private/cakey.pem
diff --git a/crypto/openssl/apps/demoCA/serial b/apps/demoCA/serial
similarity index 100%
rename from crypto/openssl/apps/demoCA/serial
rename to apps/demoCA/serial
diff --git a/crypto/openssl/apps/der_chop b/apps/der_chop
similarity index 100%
rename from crypto/openssl/apps/der_chop
rename to apps/der_chop
diff --git a/crypto/openssl/apps/der_chop.in b/apps/der_chop.in
similarity index 100%
rename from crypto/openssl/apps/der_chop.in
rename to apps/der_chop.in
diff --git a/crypto/openssl/apps/dgst.c b/apps/dgst.c
similarity index 100%
rename from crypto/openssl/apps/dgst.c
rename to apps/dgst.c
diff --git a/crypto/openssl/apps/dh.c b/apps/dh.c
similarity index 100%
rename from crypto/openssl/apps/dh.c
rename to apps/dh.c
diff --git a/crypto/openssl/apps/dh1024.pem b/apps/dh1024.pem
similarity index 100%
rename from crypto/openssl/apps/dh1024.pem
rename to apps/dh1024.pem
diff --git a/crypto/openssl/apps/dh2048.pem b/apps/dh2048.pem
similarity index 100%
rename from crypto/openssl/apps/dh2048.pem
rename to apps/dh2048.pem
diff --git a/crypto/openssl/apps/dh4096.pem b/apps/dh4096.pem
similarity index 100%
rename from crypto/openssl/apps/dh4096.pem
rename to apps/dh4096.pem
diff --git a/crypto/openssl/apps/dh512.pem b/apps/dh512.pem
similarity index 100%
rename from crypto/openssl/apps/dh512.pem
rename to apps/dh512.pem
diff --git a/crypto/openssl/apps/dhparam.c b/apps/dhparam.c
similarity index 100%
rename from crypto/openssl/apps/dhparam.c
rename to apps/dhparam.c
diff --git a/crypto/openssl/apps/dsa-ca.pem b/apps/dsa-ca.pem
similarity index 100%
rename from crypto/openssl/apps/dsa-ca.pem
rename to apps/dsa-ca.pem
diff --git a/crypto/openssl/apps/dsa-pca.pem b/apps/dsa-pca.pem
similarity index 100%
rename from crypto/openssl/apps/dsa-pca.pem
rename to apps/dsa-pca.pem
diff --git a/crypto/openssl/apps/dsa.c b/apps/dsa.c
similarity index 100%
rename from crypto/openssl/apps/dsa.c
rename to apps/dsa.c
diff --git a/crypto/openssl/apps/dsa1024.pem b/apps/dsa1024.pem
similarity index 100%
rename from crypto/openssl/apps/dsa1024.pem
rename to apps/dsa1024.pem
diff --git a/crypto/openssl/apps/dsa512.pem b/apps/dsa512.pem
similarity index 100%
rename from crypto/openssl/apps/dsa512.pem
rename to apps/dsa512.pem
diff --git a/crypto/openssl/apps/dsap.pem b/apps/dsap.pem
similarity index 100%
rename from crypto/openssl/apps/dsap.pem
rename to apps/dsap.pem
diff --git a/crypto/openssl/apps/dsaparam.c b/apps/dsaparam.c
similarity index 100%
rename from crypto/openssl/apps/dsaparam.c
rename to apps/dsaparam.c
diff --git a/crypto/openssl/apps/ec.c b/apps/ec.c
similarity index 100%
rename from crypto/openssl/apps/ec.c
rename to apps/ec.c
diff --git a/crypto/openssl/apps/ecparam.c b/apps/ecparam.c
similarity index 100%
rename from crypto/openssl/apps/ecparam.c
rename to apps/ecparam.c
diff --git a/crypto/openssl/apps/enc.c b/apps/enc.c
similarity index 100%
rename from crypto/openssl/apps/enc.c
rename to apps/enc.c
diff --git a/crypto/openssl/apps/engine.c b/apps/engine.c
similarity index 100%
rename from crypto/openssl/apps/engine.c
rename to apps/engine.c
diff --git a/crypto/openssl/apps/errstr.c b/apps/errstr.c
similarity index 100%
rename from crypto/openssl/apps/errstr.c
rename to apps/errstr.c
diff --git a/crypto/openssl/apps/gendh.c b/apps/gendh.c
similarity index 100%
rename from crypto/openssl/apps/gendh.c
rename to apps/gendh.c
diff --git a/crypto/openssl/apps/gendsa.c b/apps/gendsa.c
similarity index 100%
rename from crypto/openssl/apps/gendsa.c
rename to apps/gendsa.c
diff --git a/crypto/openssl/apps/genrsa.c b/apps/genrsa.c
similarity index 100%
rename from crypto/openssl/apps/genrsa.c
rename to apps/genrsa.c
diff --git a/crypto/openssl/apps/nseq.c b/apps/nseq.c
similarity index 100%
rename from crypto/openssl/apps/nseq.c
rename to apps/nseq.c
diff --git a/crypto/openssl/apps/ocsp.c b/apps/ocsp.c
similarity index 100%
rename from crypto/openssl/apps/ocsp.c
rename to apps/ocsp.c
diff --git a/crypto/openssl/apps/oid.cnf b/apps/oid.cnf
similarity index 100%
rename from crypto/openssl/apps/oid.cnf
rename to apps/oid.cnf
diff --git a/crypto/openssl/apps/openssl.c b/apps/openssl.c
similarity index 100%
rename from crypto/openssl/apps/openssl.c
rename to apps/openssl.c
diff --git a/crypto/openssl/apps/openssl.cnf b/apps/openssl.cnf
similarity index 100%
rename from crypto/openssl/apps/openssl.cnf
rename to apps/openssl.cnf
diff --git a/crypto/openssl/apps/passwd.c b/apps/passwd.c
similarity index 100%
rename from crypto/openssl/apps/passwd.c
rename to apps/passwd.c
diff --git a/crypto/openssl/apps/pca-cert.srl b/apps/pca-cert.srl
similarity index 100%
rename from crypto/openssl/apps/pca-cert.srl
rename to apps/pca-cert.srl
diff --git a/crypto/openssl/apps/pca-key.pem b/apps/pca-key.pem
similarity index 100%
rename from crypto/openssl/apps/pca-key.pem
rename to apps/pca-key.pem
diff --git a/crypto/openssl/apps/pca-req.pem b/apps/pca-req.pem
similarity index 100%
rename from crypto/openssl/apps/pca-req.pem
rename to apps/pca-req.pem
diff --git a/crypto/openssl/apps/pkcs12.c b/apps/pkcs12.c
similarity index 100%
rename from crypto/openssl/apps/pkcs12.c
rename to apps/pkcs12.c
diff --git a/crypto/openssl/apps/pkcs7.c b/apps/pkcs7.c
similarity index 100%
rename from crypto/openssl/apps/pkcs7.c
rename to apps/pkcs7.c
diff --git a/crypto/openssl/apps/pkcs8.c b/apps/pkcs8.c
similarity index 100%
rename from crypto/openssl/apps/pkcs8.c
rename to apps/pkcs8.c
diff --git a/crypto/openssl/apps/prime.c b/apps/prime.c
similarity index 100%
rename from crypto/openssl/apps/prime.c
rename to apps/prime.c
diff --git a/crypto/openssl/apps/privkey.pem b/apps/privkey.pem
similarity index 100%
rename from crypto/openssl/apps/privkey.pem
rename to apps/privkey.pem
diff --git a/crypto/openssl/apps/progs.h b/apps/progs.h
similarity index 100%
rename from crypto/openssl/apps/progs.h
rename to apps/progs.h
diff --git a/crypto/openssl/apps/progs.pl b/apps/progs.pl
similarity index 100%
rename from crypto/openssl/apps/progs.pl
rename to apps/progs.pl
diff --git a/crypto/openssl/apps/rand.c b/apps/rand.c
similarity index 100%
rename from crypto/openssl/apps/rand.c
rename to apps/rand.c
diff --git a/crypto/openssl/apps/req.c b/apps/req.c
similarity index 100%
rename from crypto/openssl/apps/req.c
rename to apps/req.c
diff --git a/crypto/openssl/apps/req.pem b/apps/req.pem
similarity index 100%
rename from crypto/openssl/apps/req.pem
rename to apps/req.pem
diff --git a/crypto/openssl/apps/rsa.c b/apps/rsa.c
similarity index 100%
rename from crypto/openssl/apps/rsa.c
rename to apps/rsa.c
diff --git a/crypto/openssl/apps/rsa8192.pem b/apps/rsa8192.pem
similarity index 100%
rename from crypto/openssl/apps/rsa8192.pem
rename to apps/rsa8192.pem
diff --git a/crypto/openssl/apps/rsautl.c b/apps/rsautl.c
similarity index 100%
rename from crypto/openssl/apps/rsautl.c
rename to apps/rsautl.c
diff --git a/crypto/openssl/apps/s1024key.pem b/apps/s1024key.pem
similarity index 100%
rename from crypto/openssl/apps/s1024key.pem
rename to apps/s1024key.pem
diff --git a/crypto/openssl/apps/s1024req.pem b/apps/s1024req.pem
similarity index 100%
rename from crypto/openssl/apps/s1024req.pem
rename to apps/s1024req.pem
diff --git a/crypto/openssl/apps/s512-key.pem b/apps/s512-key.pem
similarity index 100%
rename from crypto/openssl/apps/s512-key.pem
rename to apps/s512-key.pem
diff --git a/crypto/openssl/apps/s512-req.pem b/apps/s512-req.pem
similarity index 100%
rename from crypto/openssl/apps/s512-req.pem
rename to apps/s512-req.pem
diff --git a/crypto/openssl/apps/s_apps.h b/apps/s_apps.h
similarity index 100%
rename from crypto/openssl/apps/s_apps.h
rename to apps/s_apps.h
diff --git a/crypto/openssl/apps/s_cb.c b/apps/s_cb.c
similarity index 100%
rename from crypto/openssl/apps/s_cb.c
rename to apps/s_cb.c
diff --git a/crypto/openssl/apps/s_client.c b/apps/s_client.c
similarity index 100%
rename from crypto/openssl/apps/s_client.c
rename to apps/s_client.c
diff --git a/crypto/openssl/apps/s_server.c b/apps/s_server.c
similarity index 100%
rename from crypto/openssl/apps/s_server.c
rename to apps/s_server.c
diff --git a/crypto/openssl/apps/s_socket.c b/apps/s_socket.c
similarity index 100%
rename from crypto/openssl/apps/s_socket.c
rename to apps/s_socket.c
diff --git a/crypto/openssl/apps/s_time.c b/apps/s_time.c
similarity index 100%
rename from crypto/openssl/apps/s_time.c
rename to apps/s_time.c
diff --git a/crypto/openssl/apps/server.pem b/apps/server.pem
similarity index 100%
rename from crypto/openssl/apps/server.pem
rename to apps/server.pem
diff --git a/crypto/openssl/apps/server.srl b/apps/server.srl
similarity index 100%
rename from crypto/openssl/apps/server.srl
rename to apps/server.srl
diff --git a/crypto/openssl/apps/server2.pem b/apps/server2.pem
similarity index 100%
rename from crypto/openssl/apps/server2.pem
rename to apps/server2.pem
diff --git a/crypto/openssl/apps/sess_id.c b/apps/sess_id.c
similarity index 100%
rename from crypto/openssl/apps/sess_id.c
rename to apps/sess_id.c
diff --git a/crypto/openssl/apps/set/set-g-ca.pem b/apps/set/set-g-ca.pem
similarity index 100%
rename from crypto/openssl/apps/set/set-g-ca.pem
rename to apps/set/set-g-ca.pem
diff --git a/crypto/openssl/apps/set/set-m-ca.pem b/apps/set/set-m-ca.pem
similarity index 100%
rename from crypto/openssl/apps/set/set-m-ca.pem
rename to apps/set/set-m-ca.pem
diff --git a/crypto/openssl/apps/set/set_b_ca.pem b/apps/set/set_b_ca.pem
similarity index 100%
rename from crypto/openssl/apps/set/set_b_ca.pem
rename to apps/set/set_b_ca.pem
diff --git a/crypto/openssl/apps/set/set_c_ca.pem b/apps/set/set_c_ca.pem
similarity index 100%
rename from crypto/openssl/apps/set/set_c_ca.pem
rename to apps/set/set_c_ca.pem
diff --git a/crypto/openssl/apps/set/set_d_ct.pem b/apps/set/set_d_ct.pem
similarity index 100%
rename from crypto/openssl/apps/set/set_d_ct.pem
rename to apps/set/set_d_ct.pem
diff --git a/crypto/openssl/apps/set/set_root.pem b/apps/set/set_root.pem
similarity index 100%
rename from crypto/openssl/apps/set/set_root.pem
rename to apps/set/set_root.pem
diff --git a/crypto/openssl/apps/smime.c b/apps/smime.c
similarity index 100%
rename from crypto/openssl/apps/smime.c
rename to apps/smime.c
diff --git a/crypto/openssl/apps/speed.c b/apps/speed.c
similarity index 100%
rename from crypto/openssl/apps/speed.c
rename to apps/speed.c
diff --git a/crypto/openssl/apps/spkac.c b/apps/spkac.c
similarity index 100%
rename from crypto/openssl/apps/spkac.c
rename to apps/spkac.c
diff --git a/crypto/openssl/apps/testCA.pem b/apps/testCA.pem
similarity index 100%
rename from crypto/openssl/apps/testCA.pem
rename to apps/testCA.pem
diff --git a/crypto/openssl/apps/testdsa.h b/apps/testdsa.h
similarity index 100%
rename from crypto/openssl/apps/testdsa.h
rename to apps/testdsa.h
diff --git a/crypto/openssl/apps/testrsa.h b/apps/testrsa.h
similarity index 100%
rename from crypto/openssl/apps/testrsa.h
rename to apps/testrsa.h
diff --git a/crypto/openssl/apps/timeouts.h b/apps/timeouts.h
similarity index 100%
rename from crypto/openssl/apps/timeouts.h
rename to apps/timeouts.h
diff --git a/crypto/openssl/apps/verify.c b/apps/verify.c
similarity index 100%
rename from crypto/openssl/apps/verify.c
rename to apps/verify.c
diff --git a/crypto/openssl/apps/version.c b/apps/version.c
similarity index 100%
rename from crypto/openssl/apps/version.c
rename to apps/version.c
diff --git a/crypto/openssl/apps/winrand.c b/apps/winrand.c
similarity index 100%
rename from crypto/openssl/apps/winrand.c
rename to apps/winrand.c
diff --git a/crypto/openssl/apps/x509.c b/apps/x509.c
similarity index 100%
rename from crypto/openssl/apps/x509.c
rename to apps/x509.c
diff --git a/crypto/openssl/bugs/MS b/bugs/MS
similarity index 100%
rename from crypto/openssl/bugs/MS
rename to bugs/MS
diff --git a/crypto/openssl/bugs/SSLv3 b/bugs/SSLv3
similarity index 100%
rename from crypto/openssl/bugs/SSLv3
rename to bugs/SSLv3
diff --git a/crypto/openssl/bugs/VC16.bug b/bugs/VC16.bug
similarity index 100%
rename from crypto/openssl/bugs/VC16.bug
rename to bugs/VC16.bug
diff --git a/crypto/openssl/bugs/alpha.c b/bugs/alpha.c
similarity index 100%
rename from crypto/openssl/bugs/alpha.c
rename to bugs/alpha.c
diff --git a/crypto/openssl/bugs/dggccbug.c b/bugs/dggccbug.c
similarity index 100%
rename from crypto/openssl/bugs/dggccbug.c
rename to bugs/dggccbug.c
diff --git a/crypto/openssl/bugs/sgiccbug.c b/bugs/sgiccbug.c
similarity index 100%
rename from crypto/openssl/bugs/sgiccbug.c
rename to bugs/sgiccbug.c
diff --git a/crypto/openssl/bugs/sslref.dif b/bugs/sslref.dif
similarity index 100%
rename from crypto/openssl/bugs/sslref.dif
rename to bugs/sslref.dif
diff --git a/crypto/openssl/bugs/stream.c b/bugs/stream.c
similarity index 100%
rename from crypto/openssl/bugs/stream.c
rename to bugs/stream.c
diff --git a/crypto/openssl/bugs/ultrixcc.c b/bugs/ultrixcc.c
similarity index 100%
rename from crypto/openssl/bugs/ultrixcc.c
rename to bugs/ultrixcc.c
diff --git a/crypto/openssl/certs/ICE-CA.pem b/certs/ICE-CA.pem
similarity index 100%
rename from crypto/openssl/certs/ICE-CA.pem
rename to certs/ICE-CA.pem
diff --git a/crypto/openssl/certs/ICE-root.pem b/certs/ICE-root.pem
similarity index 100%
rename from crypto/openssl/certs/ICE-root.pem
rename to certs/ICE-root.pem
diff --git a/crypto/openssl/certs/ICE-user.pem b/certs/ICE-user.pem
similarity index 100%
rename from crypto/openssl/certs/ICE-user.pem
rename to certs/ICE-user.pem
diff --git a/crypto/openssl/certs/ICE.crl b/certs/ICE.crl
similarity index 100%
rename from crypto/openssl/certs/ICE.crl
rename to certs/ICE.crl
diff --git a/crypto/openssl/certs/RegTP-4R.pem b/certs/RegTP-4R.pem
similarity index 100%
rename from crypto/openssl/certs/RegTP-4R.pem
rename to certs/RegTP-4R.pem
diff --git a/crypto/openssl/certs/RegTP-5R.pem b/certs/RegTP-5R.pem
similarity index 100%
rename from crypto/openssl/certs/RegTP-5R.pem
rename to certs/RegTP-5R.pem
diff --git a/crypto/openssl/certs/RegTP-6R.pem b/certs/RegTP-6R.pem
similarity index 100%
rename from crypto/openssl/certs/RegTP-6R.pem
rename to certs/RegTP-6R.pem
diff --git a/crypto/openssl/certs/aol1.pem b/certs/aol1.pem
similarity index 100%
rename from crypto/openssl/certs/aol1.pem
rename to certs/aol1.pem
diff --git a/crypto/openssl/certs/aol2.pem b/certs/aol2.pem
similarity index 100%
rename from crypto/openssl/certs/aol2.pem
rename to certs/aol2.pem
diff --git a/crypto/openssl/certs/aoltw1.pem b/certs/aoltw1.pem
similarity index 100%
rename from crypto/openssl/certs/aoltw1.pem
rename to certs/aoltw1.pem
diff --git a/crypto/openssl/certs/aoltw2.pem b/certs/aoltw2.pem
similarity index 100%
rename from crypto/openssl/certs/aoltw2.pem
rename to certs/aoltw2.pem
diff --git a/crypto/openssl/certs/argena.pem b/certs/argena.pem
similarity index 100%
rename from crypto/openssl/certs/argena.pem
rename to certs/argena.pem
diff --git a/crypto/openssl/certs/argeng.pem b/certs/argeng.pem
similarity index 100%
rename from crypto/openssl/certs/argeng.pem
rename to certs/argeng.pem
diff --git a/crypto/openssl/certs/ca-cert.pem b/certs/ca-cert.pem
similarity index 100%
rename from crypto/openssl/certs/ca-cert.pem
rename to certs/ca-cert.pem
diff --git a/crypto/openssl/certs/demo/ca-cert.pem b/certs/demo/ca-cert.pem
similarity index 100%
rename from crypto/openssl/certs/demo/ca-cert.pem
rename to certs/demo/ca-cert.pem
diff --git a/crypto/openssl/certs/demo/dsa-ca.pem b/certs/demo/dsa-ca.pem
similarity index 100%
rename from crypto/openssl/certs/demo/dsa-ca.pem
rename to certs/demo/dsa-ca.pem
diff --git a/crypto/openssl/certs/demo/dsa-pca.pem b/certs/demo/dsa-pca.pem
similarity index 100%
rename from crypto/openssl/certs/demo/dsa-pca.pem
rename to certs/demo/dsa-pca.pem
diff --git a/crypto/openssl/certs/demo/nortelCA.pem b/certs/demo/nortelCA.pem
similarity index 100%
rename from crypto/openssl/certs/demo/nortelCA.pem
rename to certs/demo/nortelCA.pem
diff --git a/crypto/openssl/certs/demo/pca-cert.pem b/certs/demo/pca-cert.pem
similarity index 100%
rename from crypto/openssl/certs/demo/pca-cert.pem
rename to certs/demo/pca-cert.pem
diff --git a/crypto/openssl/certs/demo/timCA.pem b/certs/demo/timCA.pem
similarity index 100%
rename from crypto/openssl/certs/demo/timCA.pem
rename to certs/demo/timCA.pem
diff --git a/crypto/openssl/certs/demo/tjhCA.pem b/certs/demo/tjhCA.pem
similarity index 100%
rename from crypto/openssl/certs/demo/tjhCA.pem
rename to certs/demo/tjhCA.pem
diff --git a/crypto/openssl/certs/demo/vsigntca.pem b/certs/demo/vsigntca.pem
similarity index 100%
rename from crypto/openssl/certs/demo/vsigntca.pem
rename to certs/demo/vsigntca.pem
diff --git a/crypto/openssl/certs/dsa-ca.pem b/certs/dsa-ca.pem
similarity index 100%
rename from crypto/openssl/certs/dsa-ca.pem
rename to certs/dsa-ca.pem
diff --git a/crypto/openssl/certs/dsa-pca.pem b/certs/dsa-pca.pem
similarity index 100%
rename from crypto/openssl/certs/dsa-pca.pem
rename to certs/dsa-pca.pem
diff --git a/crypto/openssl/certs/eng1.pem b/certs/eng1.pem
similarity index 100%
rename from crypto/openssl/certs/eng1.pem
rename to certs/eng1.pem
diff --git a/crypto/openssl/certs/eng2.pem b/certs/eng2.pem
similarity index 100%
rename from crypto/openssl/certs/eng2.pem
rename to certs/eng2.pem
diff --git a/crypto/openssl/certs/eng3.pem b/certs/eng3.pem
similarity index 100%
rename from crypto/openssl/certs/eng3.pem
rename to certs/eng3.pem
diff --git a/crypto/openssl/certs/eng4.pem b/certs/eng4.pem
similarity index 100%
rename from crypto/openssl/certs/eng4.pem
rename to certs/eng4.pem
diff --git a/crypto/openssl/certs/eng5.pem b/certs/eng5.pem
similarity index 100%
rename from crypto/openssl/certs/eng5.pem
rename to certs/eng5.pem
diff --git a/crypto/openssl/certs/expired/ICE-CA.pem b/certs/expired/ICE-CA.pem
similarity index 100%
rename from crypto/openssl/certs/expired/ICE-CA.pem
rename to certs/expired/ICE-CA.pem
diff --git a/crypto/openssl/certs/expired/ICE-root.pem b/certs/expired/ICE-root.pem
similarity index 100%
rename from crypto/openssl/certs/expired/ICE-root.pem
rename to certs/expired/ICE-root.pem
diff --git a/crypto/openssl/certs/expired/ICE-user.pem b/certs/expired/ICE-user.pem
similarity index 100%
rename from crypto/openssl/certs/expired/ICE-user.pem
rename to certs/expired/ICE-user.pem
diff --git a/crypto/openssl/certs/expired/ICE.crl b/certs/expired/ICE.crl
similarity index 100%
rename from crypto/openssl/certs/expired/ICE.crl
rename to certs/expired/ICE.crl
diff --git a/crypto/openssl/certs/expired/RegTP-4R.pem b/certs/expired/RegTP-4R.pem
similarity index 100%
rename from crypto/openssl/certs/expired/RegTP-4R.pem
rename to certs/expired/RegTP-4R.pem
diff --git a/crypto/openssl/certs/expired/factory.pem b/certs/expired/factory.pem
similarity index 100%
rename from crypto/openssl/certs/expired/factory.pem
rename to certs/expired/factory.pem
diff --git a/crypto/openssl/certs/expired/rsa-cca.pem b/certs/expired/rsa-cca.pem
similarity index 100%
rename from crypto/openssl/certs/expired/rsa-cca.pem
rename to certs/expired/rsa-cca.pem
diff --git a/crypto/openssl/certs/expired/rsa-ssca.pem b/certs/expired/rsa-ssca.pem
similarity index 100%
rename from crypto/openssl/certs/expired/rsa-ssca.pem
rename to certs/expired/rsa-ssca.pem
diff --git a/crypto/openssl/certs/expired/vsign2.pem b/certs/expired/vsign2.pem
similarity index 100%
rename from crypto/openssl/certs/expired/vsign2.pem
rename to certs/expired/vsign2.pem
diff --git a/crypto/openssl/certs/expired/vsign3.pem b/certs/expired/vsign3.pem
similarity index 100%
rename from crypto/openssl/certs/expired/vsign3.pem
rename to certs/expired/vsign3.pem
diff --git a/crypto/openssl/certs/factory.pem b/certs/factory.pem
similarity index 100%
rename from crypto/openssl/certs/factory.pem
rename to certs/factory.pem
diff --git a/crypto/openssl/certs/nortelCA.pem b/certs/nortelCA.pem
similarity index 100%
rename from crypto/openssl/certs/nortelCA.pem
rename to certs/nortelCA.pem
diff --git a/crypto/openssl/certs/pca-cert.pem b/certs/pca-cert.pem
similarity index 100%
rename from crypto/openssl/certs/pca-cert.pem
rename to certs/pca-cert.pem
diff --git a/crypto/openssl/certs/rsa-cca.pem b/certs/rsa-cca.pem
similarity index 100%
rename from crypto/openssl/certs/rsa-cca.pem
rename to certs/rsa-cca.pem
diff --git a/crypto/openssl/certs/thawteCb.pem b/certs/thawteCb.pem
similarity index 100%
rename from crypto/openssl/certs/thawteCb.pem
rename to certs/thawteCb.pem
diff --git a/crypto/openssl/certs/thawteCp.pem b/certs/thawteCp.pem
similarity index 100%
rename from crypto/openssl/certs/thawteCp.pem
rename to certs/thawteCp.pem
diff --git a/crypto/openssl/certs/timCA.pem b/certs/timCA.pem
similarity index 100%
rename from crypto/openssl/certs/timCA.pem
rename to certs/timCA.pem
diff --git a/crypto/openssl/certs/tjhCA.pem b/certs/tjhCA.pem
similarity index 100%
rename from crypto/openssl/certs/tjhCA.pem
rename to certs/tjhCA.pem
diff --git a/crypto/openssl/certs/vsign1.pem b/certs/vsign1.pem
similarity index 100%
rename from crypto/openssl/certs/vsign1.pem
rename to certs/vsign1.pem
diff --git a/crypto/openssl/certs/vsign2.pem b/certs/vsign2.pem
similarity index 100%
rename from crypto/openssl/certs/vsign2.pem
rename to certs/vsign2.pem
diff --git a/crypto/openssl/certs/vsign3.pem b/certs/vsign3.pem
similarity index 100%
rename from crypto/openssl/certs/vsign3.pem
rename to certs/vsign3.pem
diff --git a/crypto/openssl/certs/vsignss.pem b/certs/vsignss.pem
similarity index 100%
rename from crypto/openssl/certs/vsignss.pem
rename to certs/vsignss.pem
diff --git a/crypto/openssl/certs/vsigntca.pem b/certs/vsigntca.pem
similarity index 100%
rename from crypto/openssl/certs/vsigntca.pem
rename to certs/vsigntca.pem
diff --git a/crypto/openssl/certs/wellsfgo.pem b/certs/wellsfgo.pem
similarity index 100%
rename from crypto/openssl/certs/wellsfgo.pem
rename to certs/wellsfgo.pem
diff --git a/crypto/openssl/comm.txt b/comm.txt
similarity index 100%
rename from crypto/openssl/comm.txt
rename to comm.txt
diff --git a/crypto/openssl/comms.txt b/comms.txt
similarity index 100%
rename from crypto/openssl/comms.txt
rename to comms.txt
diff --git a/crypto/openssl/config b/config
similarity index 100%
rename from crypto/openssl/config
rename to config
diff --git a/crypto/openssl/crypto/LPdir_nyi.c b/crypto/LPdir_nyi.c
similarity index 100%
rename from crypto/openssl/crypto/LPdir_nyi.c
rename to crypto/LPdir_nyi.c
diff --git a/crypto/openssl/crypto/LPdir_unix.c b/crypto/LPdir_unix.c
similarity index 100%
rename from crypto/openssl/crypto/LPdir_unix.c
rename to crypto/LPdir_unix.c
diff --git a/crypto/openssl/crypto/LPdir_vms.c b/crypto/LPdir_vms.c
similarity index 100%
rename from crypto/openssl/crypto/LPdir_vms.c
rename to crypto/LPdir_vms.c
diff --git a/crypto/openssl/crypto/LPdir_win.c b/crypto/LPdir_win.c
similarity index 100%
rename from crypto/openssl/crypto/LPdir_win.c
rename to crypto/LPdir_win.c
diff --git a/crypto/openssl/crypto/LPdir_win32.c b/crypto/LPdir_win32.c
similarity index 100%
rename from crypto/openssl/crypto/LPdir_win32.c
rename to crypto/LPdir_win32.c
diff --git a/crypto/openssl/crypto/LPdir_wince.c b/crypto/LPdir_wince.c
similarity index 100%
rename from crypto/openssl/crypto/LPdir_wince.c
rename to crypto/LPdir_wince.c
diff --git a/crypto/openssl/crypto/Makefile b/crypto/Makefile
similarity index 100%
rename from crypto/openssl/crypto/Makefile
rename to crypto/Makefile
diff --git a/crypto/openssl/crypto/aes/Makefile b/crypto/aes/Makefile
similarity index 100%
rename from crypto/openssl/crypto/aes/Makefile
rename to crypto/aes/Makefile
diff --git a/crypto/openssl/crypto/aes/README b/crypto/aes/README
similarity index 100%
rename from crypto/openssl/crypto/aes/README
rename to crypto/aes/README
diff --git a/crypto/openssl/crypto/aes/aes.h b/crypto/aes/aes.h
similarity index 100%
rename from crypto/openssl/crypto/aes/aes.h
rename to crypto/aes/aes.h
diff --git a/crypto/openssl/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c
similarity index 100%
rename from crypto/openssl/crypto/aes/aes_cbc.c
rename to crypto/aes/aes_cbc.c
diff --git a/crypto/openssl/crypto/aes/aes_cfb.c b/crypto/aes/aes_cfb.c
similarity index 100%
rename from crypto/openssl/crypto/aes/aes_cfb.c
rename to crypto/aes/aes_cfb.c
diff --git a/crypto/openssl/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
similarity index 100%
rename from crypto/openssl/crypto/aes/aes_core.c
rename to crypto/aes/aes_core.c
diff --git a/crypto/openssl/crypto/aes/aes_ctr.c b/crypto/aes/aes_ctr.c
similarity index 100%
rename from crypto/openssl/crypto/aes/aes_ctr.c
rename to crypto/aes/aes_ctr.c
diff --git a/crypto/openssl/crypto/aes/aes_ecb.c b/crypto/aes/aes_ecb.c
similarity index 100%
rename from crypto/openssl/crypto/aes/aes_ecb.c
rename to crypto/aes/aes_ecb.c
diff --git a/crypto/openssl/crypto/aes/aes_ige.c b/crypto/aes/aes_ige.c
similarity index 100%
rename from crypto/openssl/crypto/aes/aes_ige.c
rename to crypto/aes/aes_ige.c
diff --git a/crypto/openssl/crypto/aes/aes_locl.h b/crypto/aes/aes_locl.h
similarity index 100%
rename from crypto/openssl/crypto/aes/aes_locl.h
rename to crypto/aes/aes_locl.h
diff --git a/crypto/openssl/crypto/aes/aes_misc.c b/crypto/aes/aes_misc.c
similarity index 100%
rename from crypto/openssl/crypto/aes/aes_misc.c
rename to crypto/aes/aes_misc.c
diff --git a/crypto/openssl/crypto/aes/aes_ofb.c b/crypto/aes/aes_ofb.c
similarity index 100%
rename from crypto/openssl/crypto/aes/aes_ofb.c
rename to crypto/aes/aes_ofb.c
diff --git a/crypto/openssl/crypto/aes/asm/aes-586.pl b/crypto/aes/asm/aes-586.pl
similarity index 100%
rename from crypto/openssl/crypto/aes/asm/aes-586.pl
rename to crypto/aes/asm/aes-586.pl
diff --git a/crypto/openssl/crypto/aes/asm/aes-ia64.S b/crypto/aes/asm/aes-ia64.S
similarity index 100%
rename from crypto/openssl/crypto/aes/asm/aes-ia64.S
rename to crypto/aes/asm/aes-ia64.S
diff --git a/crypto/openssl/crypto/asn1/Makefile b/crypto/asn1/Makefile
similarity index 100%
rename from crypto/openssl/crypto/asn1/Makefile
rename to crypto/asn1/Makefile
diff --git a/crypto/openssl/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_bitstr.c
rename to crypto/asn1/a_bitstr.c
diff --git a/crypto/openssl/crypto/asn1/a_bool.c b/crypto/asn1/a_bool.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_bool.c
rename to crypto/asn1/a_bool.c
diff --git a/crypto/openssl/crypto/asn1/a_bytes.c b/crypto/asn1/a_bytes.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_bytes.c
rename to crypto/asn1/a_bytes.c
diff --git a/crypto/openssl/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_d2i_fp.c
rename to crypto/asn1/a_d2i_fp.c
diff --git a/crypto/openssl/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_digest.c
rename to crypto/asn1/a_digest.c
diff --git a/crypto/openssl/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_dup.c
rename to crypto/asn1/a_dup.c
diff --git a/crypto/openssl/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_enum.c
rename to crypto/asn1/a_enum.c
diff --git a/crypto/openssl/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_gentm.c
rename to crypto/asn1/a_gentm.c
diff --git a/crypto/openssl/crypto/asn1/a_hdr.c b/crypto/asn1/a_hdr.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_hdr.c
rename to crypto/asn1/a_hdr.c
diff --git a/crypto/openssl/crypto/asn1/a_i2d_fp.c b/crypto/asn1/a_i2d_fp.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_i2d_fp.c
rename to crypto/asn1/a_i2d_fp.c
diff --git a/crypto/openssl/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_int.c
rename to crypto/asn1/a_int.c
diff --git a/crypto/openssl/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_mbstr.c
rename to crypto/asn1/a_mbstr.c
diff --git a/crypto/openssl/crypto/asn1/a_meth.c b/crypto/asn1/a_meth.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_meth.c
rename to crypto/asn1/a_meth.c
diff --git a/crypto/openssl/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_object.c
rename to crypto/asn1/a_object.c
diff --git a/crypto/openssl/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_octet.c
rename to crypto/asn1/a_octet.c
diff --git a/crypto/openssl/crypto/asn1/a_print.c b/crypto/asn1/a_print.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_print.c
rename to crypto/asn1/a_print.c
diff --git a/crypto/openssl/crypto/asn1/a_set.c b/crypto/asn1/a_set.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_set.c
rename to crypto/asn1/a_set.c
diff --git a/crypto/openssl/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_sign.c
rename to crypto/asn1/a_sign.c
diff --git a/crypto/openssl/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_strex.c
rename to crypto/asn1/a_strex.c
diff --git a/crypto/openssl/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_strnid.c
rename to crypto/asn1/a_strnid.c
diff --git a/crypto/openssl/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_time.c
rename to crypto/asn1/a_time.c
diff --git a/crypto/openssl/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_type.c
rename to crypto/asn1/a_type.c
diff --git a/crypto/openssl/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_utctm.c
rename to crypto/asn1/a_utctm.c
diff --git a/crypto/openssl/crypto/asn1/a_utf8.c b/crypto/asn1/a_utf8.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_utf8.c
rename to crypto/asn1/a_utf8.c
diff --git a/crypto/openssl/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/a_verify.c
rename to crypto/asn1/a_verify.c
diff --git a/crypto/openssl/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
similarity index 100%
rename from crypto/openssl/crypto/asn1/asn1.h
rename to crypto/asn1/asn1.h
diff --git a/crypto/openssl/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/asn1_err.c
rename to crypto/asn1/asn1_err.c
diff --git a/crypto/openssl/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/asn1_gen.c
rename to crypto/asn1/asn1_gen.c
diff --git a/crypto/openssl/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/asn1_lib.c
rename to crypto/asn1/asn1_lib.c
diff --git a/crypto/openssl/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h
similarity index 100%
rename from crypto/openssl/crypto/asn1/asn1_mac.h
rename to crypto/asn1/asn1_mac.h
diff --git a/crypto/openssl/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/asn1_par.c
rename to crypto/asn1/asn1_par.c
diff --git a/crypto/openssl/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h
similarity index 100%
rename from crypto/openssl/crypto/asn1/asn1t.h
rename to crypto/asn1/asn1t.h
diff --git a/crypto/openssl/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/asn_moid.c
rename to crypto/asn1/asn_moid.c
diff --git a/crypto/openssl/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/asn_pack.c
rename to crypto/asn1/asn_pack.c
diff --git a/crypto/openssl/crypto/asn1/charmap.h b/crypto/asn1/charmap.h
similarity index 100%
rename from crypto/openssl/crypto/asn1/charmap.h
rename to crypto/asn1/charmap.h
diff --git a/crypto/openssl/crypto/asn1/charmap.pl b/crypto/asn1/charmap.pl
similarity index 100%
rename from crypto/openssl/crypto/asn1/charmap.pl
rename to crypto/asn1/charmap.pl
diff --git a/crypto/openssl/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/d2i_pr.c
rename to crypto/asn1/d2i_pr.c
diff --git a/crypto/openssl/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/d2i_pu.c
rename to crypto/asn1/d2i_pu.c
diff --git a/crypto/openssl/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/evp_asn1.c
rename to crypto/asn1/evp_asn1.c
diff --git a/crypto/openssl/crypto/asn1/f_enum.c b/crypto/asn1/f_enum.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/f_enum.c
rename to crypto/asn1/f_enum.c
diff --git a/crypto/openssl/crypto/asn1/f_int.c b/crypto/asn1/f_int.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/f_int.c
rename to crypto/asn1/f_int.c
diff --git a/crypto/openssl/crypto/asn1/f_string.c b/crypto/asn1/f_string.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/f_string.c
rename to crypto/asn1/f_string.c
diff --git a/crypto/openssl/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/i2d_pr.c
rename to crypto/asn1/i2d_pr.c
diff --git a/crypto/openssl/crypto/asn1/i2d_pu.c b/crypto/asn1/i2d_pu.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/i2d_pu.c
rename to crypto/asn1/i2d_pu.c
diff --git a/crypto/openssl/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/n_pkey.c
rename to crypto/asn1/n_pkey.c
diff --git a/crypto/openssl/crypto/asn1/nsseq.c b/crypto/asn1/nsseq.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/nsseq.c
rename to crypto/asn1/nsseq.c
diff --git a/crypto/openssl/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/p5_pbe.c
rename to crypto/asn1/p5_pbe.c
diff --git a/crypto/openssl/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/p5_pbev2.c
rename to crypto/asn1/p5_pbev2.c
diff --git a/crypto/openssl/crypto/asn1/p8_key.c b/crypto/asn1/p8_key.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/p8_key.c
rename to crypto/asn1/p8_key.c
diff --git a/crypto/openssl/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/p8_pkey.c
rename to crypto/asn1/p8_pkey.c
diff --git a/crypto/openssl/crypto/asn1/t_bitst.c b/crypto/asn1/t_bitst.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/t_bitst.c
rename to crypto/asn1/t_bitst.c
diff --git a/crypto/openssl/crypto/asn1/t_crl.c b/crypto/asn1/t_crl.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/t_crl.c
rename to crypto/asn1/t_crl.c
diff --git a/crypto/openssl/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/t_pkey.c
rename to crypto/asn1/t_pkey.c
diff --git a/crypto/openssl/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/t_req.c
rename to crypto/asn1/t_req.c
diff --git a/crypto/openssl/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/t_spki.c
rename to crypto/asn1/t_spki.c
diff --git a/crypto/openssl/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/t_x509.c
rename to crypto/asn1/t_x509.c
diff --git a/crypto/openssl/crypto/asn1/t_x509a.c b/crypto/asn1/t_x509a.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/t_x509a.c
rename to crypto/asn1/t_x509a.c
diff --git a/crypto/openssl/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/tasn_dec.c
rename to crypto/asn1/tasn_dec.c
diff --git a/crypto/openssl/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/tasn_enc.c
rename to crypto/asn1/tasn_enc.c
diff --git a/crypto/openssl/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/tasn_fre.c
rename to crypto/asn1/tasn_fre.c
diff --git a/crypto/openssl/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/tasn_new.c
rename to crypto/asn1/tasn_new.c
diff --git a/crypto/openssl/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/tasn_prn.c
rename to crypto/asn1/tasn_prn.c
diff --git a/crypto/openssl/crypto/asn1/tasn_typ.c b/crypto/asn1/tasn_typ.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/tasn_typ.c
rename to crypto/asn1/tasn_typ.c
diff --git a/crypto/openssl/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/tasn_utl.c
rename to crypto/asn1/tasn_utl.c
diff --git a/crypto/openssl/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_algor.c
rename to crypto/asn1/x_algor.c
diff --git a/crypto/openssl/crypto/asn1/x_attrib.c b/crypto/asn1/x_attrib.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_attrib.c
rename to crypto/asn1/x_attrib.c
diff --git a/crypto/openssl/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_bignum.c
rename to crypto/asn1/x_bignum.c
diff --git a/crypto/openssl/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_crl.c
rename to crypto/asn1/x_crl.c
diff --git a/crypto/openssl/crypto/asn1/x_exten.c b/crypto/asn1/x_exten.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_exten.c
rename to crypto/asn1/x_exten.c
diff --git a/crypto/openssl/crypto/asn1/x_info.c b/crypto/asn1/x_info.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_info.c
rename to crypto/asn1/x_info.c
diff --git a/crypto/openssl/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_long.c
rename to crypto/asn1/x_long.c
diff --git a/crypto/openssl/crypto/asn1/x_name.c b/crypto/asn1/x_name.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_name.c
rename to crypto/asn1/x_name.c
diff --git a/crypto/openssl/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_pkey.c
rename to crypto/asn1/x_pkey.c
diff --git a/crypto/openssl/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_pubkey.c
rename to crypto/asn1/x_pubkey.c
diff --git a/crypto/openssl/crypto/asn1/x_req.c b/crypto/asn1/x_req.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_req.c
rename to crypto/asn1/x_req.c
diff --git a/crypto/openssl/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_sig.c
rename to crypto/asn1/x_sig.c
diff --git a/crypto/openssl/crypto/asn1/x_spki.c b/crypto/asn1/x_spki.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_spki.c
rename to crypto/asn1/x_spki.c
diff --git a/crypto/openssl/crypto/asn1/x_val.c b/crypto/asn1/x_val.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_val.c
rename to crypto/asn1/x_val.c
diff --git a/crypto/openssl/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_x509.c
rename to crypto/asn1/x_x509.c
diff --git a/crypto/openssl/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c
similarity index 100%
rename from crypto/openssl/crypto/asn1/x_x509a.c
rename to crypto/asn1/x_x509a.c
diff --git a/crypto/openssl/crypto/bf/COPYRIGHT b/crypto/bf/COPYRIGHT
similarity index 100%
rename from crypto/openssl/crypto/bf/COPYRIGHT
rename to crypto/bf/COPYRIGHT
diff --git a/crypto/openssl/crypto/bf/INSTALL b/crypto/bf/INSTALL
similarity index 100%
rename from crypto/openssl/crypto/bf/INSTALL
rename to crypto/bf/INSTALL
diff --git a/crypto/openssl/crypto/bf/Makefile b/crypto/bf/Makefile
similarity index 100%
rename from crypto/openssl/crypto/bf/Makefile
rename to crypto/bf/Makefile
diff --git a/crypto/openssl/crypto/bf/README b/crypto/bf/README
similarity index 100%
rename from crypto/openssl/crypto/bf/README
rename to crypto/bf/README
diff --git a/crypto/openssl/crypto/bf/VERSION b/crypto/bf/VERSION
similarity index 100%
rename from crypto/openssl/crypto/bf/VERSION
rename to crypto/bf/VERSION
diff --git a/crypto/openssl/crypto/bf/asm/bf-586.pl b/crypto/bf/asm/bf-586.pl
similarity index 100%
rename from crypto/openssl/crypto/bf/asm/bf-586.pl
rename to crypto/bf/asm/bf-586.pl
diff --git a/crypto/openssl/crypto/bf/asm/bf-686.pl b/crypto/bf/asm/bf-686.pl
similarity index 100%
rename from crypto/openssl/crypto/bf/asm/bf-686.pl
rename to crypto/bf/asm/bf-686.pl
diff --git a/crypto/openssl/crypto/bf/asm/readme b/crypto/bf/asm/readme
similarity index 100%
rename from crypto/openssl/crypto/bf/asm/readme
rename to crypto/bf/asm/readme
diff --git a/crypto/openssl/crypto/bf/bf_cbc.c b/crypto/bf/bf_cbc.c
similarity index 100%
rename from crypto/openssl/crypto/bf/bf_cbc.c
rename to crypto/bf/bf_cbc.c
diff --git a/crypto/openssl/crypto/bf/bf_cfb64.c b/crypto/bf/bf_cfb64.c
similarity index 100%
rename from crypto/openssl/crypto/bf/bf_cfb64.c
rename to crypto/bf/bf_cfb64.c
diff --git a/crypto/openssl/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c
similarity index 100%
rename from crypto/openssl/crypto/bf/bf_ecb.c
rename to crypto/bf/bf_ecb.c
diff --git a/crypto/openssl/crypto/bf/bf_enc.c b/crypto/bf/bf_enc.c
similarity index 100%
rename from crypto/openssl/crypto/bf/bf_enc.c
rename to crypto/bf/bf_enc.c
diff --git a/crypto/openssl/crypto/bf/bf_locl.h b/crypto/bf/bf_locl.h
similarity index 100%
rename from crypto/openssl/crypto/bf/bf_locl.h
rename to crypto/bf/bf_locl.h
diff --git a/crypto/openssl/crypto/bf/bf_ofb64.c b/crypto/bf/bf_ofb64.c
similarity index 100%
rename from crypto/openssl/crypto/bf/bf_ofb64.c
rename to crypto/bf/bf_ofb64.c
diff --git a/crypto/openssl/crypto/bf/bf_opts.c b/crypto/bf/bf_opts.c
similarity index 100%
rename from crypto/openssl/crypto/bf/bf_opts.c
rename to crypto/bf/bf_opts.c
diff --git a/crypto/openssl/crypto/bf/bf_pi.h b/crypto/bf/bf_pi.h
similarity index 100%
rename from crypto/openssl/crypto/bf/bf_pi.h
rename to crypto/bf/bf_pi.h
diff --git a/crypto/openssl/crypto/bf/bf_skey.c b/crypto/bf/bf_skey.c
similarity index 100%
rename from crypto/openssl/crypto/bf/bf_skey.c
rename to crypto/bf/bf_skey.c
diff --git a/crypto/openssl/crypto/bf/bfs.cpp b/crypto/bf/bfs.cpp
similarity index 100%
rename from crypto/openssl/crypto/bf/bfs.cpp
rename to crypto/bf/bfs.cpp
diff --git a/crypto/openssl/crypto/bf/bfspeed.c b/crypto/bf/bfspeed.c
similarity index 100%
rename from crypto/openssl/crypto/bf/bfspeed.c
rename to crypto/bf/bfspeed.c
diff --git a/crypto/openssl/crypto/bf/bftest.c b/crypto/bf/bftest.c
similarity index 100%
rename from crypto/openssl/crypto/bf/bftest.c
rename to crypto/bf/bftest.c
diff --git a/crypto/openssl/crypto/bf/blowfish.h b/crypto/bf/blowfish.h
similarity index 100%
rename from crypto/openssl/crypto/bf/blowfish.h
rename to crypto/bf/blowfish.h
diff --git a/crypto/openssl/crypto/bio/Makefile b/crypto/bio/Makefile
similarity index 100%
rename from crypto/openssl/crypto/bio/Makefile
rename to crypto/bio/Makefile
diff --git a/crypto/openssl/crypto/bio/b_dump.c b/crypto/bio/b_dump.c
similarity index 100%
rename from crypto/openssl/crypto/bio/b_dump.c
rename to crypto/bio/b_dump.c
diff --git a/crypto/openssl/crypto/bio/b_print.c b/crypto/bio/b_print.c
similarity index 100%
rename from crypto/openssl/crypto/bio/b_print.c
rename to crypto/bio/b_print.c
diff --git a/crypto/openssl/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
similarity index 100%
rename from crypto/openssl/crypto/bio/b_sock.c
rename to crypto/bio/b_sock.c
diff --git a/crypto/openssl/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bf_buff.c
rename to crypto/bio/bf_buff.c
diff --git a/crypto/openssl/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bf_lbuf.c
rename to crypto/bio/bf_lbuf.c
diff --git a/crypto/openssl/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bf_nbio.c
rename to crypto/bio/bf_nbio.c
diff --git a/crypto/openssl/crypto/bio/bf_null.c b/crypto/bio/bf_null.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bf_null.c
rename to crypto/bio/bf_null.c
diff --git a/crypto/openssl/crypto/bio/bio.h b/crypto/bio/bio.h
similarity index 100%
rename from crypto/openssl/crypto/bio/bio.h
rename to crypto/bio/bio.h
diff --git a/crypto/openssl/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bio_cb.c
rename to crypto/bio/bio_cb.c
diff --git a/crypto/openssl/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bio_err.c
rename to crypto/bio/bio_err.c
diff --git a/crypto/openssl/crypto/bio/bio_lcl.h b/crypto/bio/bio_lcl.h
similarity index 100%
rename from crypto/openssl/crypto/bio/bio_lcl.h
rename to crypto/bio/bio_lcl.h
diff --git a/crypto/openssl/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bio_lib.c
rename to crypto/bio/bio_lib.c
diff --git a/crypto/openssl/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_acpt.c
rename to crypto/bio/bss_acpt.c
diff --git a/crypto/openssl/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_bio.c
rename to crypto/bio/bss_bio.c
diff --git a/crypto/openssl/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_conn.c
rename to crypto/bio/bss_conn.c
diff --git a/crypto/openssl/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_dgram.c
rename to crypto/bio/bss_dgram.c
diff --git a/crypto/openssl/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_fd.c
rename to crypto/bio/bss_fd.c
diff --git a/crypto/openssl/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_file.c
rename to crypto/bio/bss_file.c
diff --git a/crypto/openssl/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_log.c
rename to crypto/bio/bss_log.c
diff --git a/crypto/openssl/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_mem.c
rename to crypto/bio/bss_mem.c
diff --git a/crypto/openssl/crypto/bio/bss_null.c b/crypto/bio/bss_null.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_null.c
rename to crypto/bio/bss_null.c
diff --git a/crypto/openssl/crypto/bio/bss_rtcp.c b/crypto/bio/bss_rtcp.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_rtcp.c
rename to crypto/bio/bss_rtcp.c
diff --git a/crypto/openssl/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
similarity index 100%
rename from crypto/openssl/crypto/bio/bss_sock.c
rename to crypto/bio/bss_sock.c
diff --git a/crypto/openssl/crypto/bn/Makefile b/crypto/bn/Makefile
similarity index 100%
rename from crypto/openssl/crypto/bn/Makefile
rename to crypto/bn/Makefile
diff --git a/crypto/openssl/crypto/bn/asm/README b/crypto/bn/asm/README
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/README
rename to crypto/bn/asm/README
diff --git a/crypto/openssl/crypto/bn/asm/alpha.s b/crypto/bn/asm/alpha.s
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.s
rename to crypto/bn/asm/alpha.s
diff --git a/crypto/openssl/crypto/bn/asm/alpha.s.works b/crypto/bn/asm/alpha.s.works
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.s.works
rename to crypto/bn/asm/alpha.s.works
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/add.pl b/crypto/bn/asm/alpha.works/add.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/add.pl
rename to crypto/bn/asm/alpha.works/add.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/div.pl b/crypto/bn/asm/alpha.works/div.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/div.pl
rename to crypto/bn/asm/alpha.works/div.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl b/crypto/bn/asm/alpha.works/mul.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/mul.pl
rename to crypto/bn/asm/alpha.works/mul.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl b/crypto/bn/asm/alpha.works/mul_add.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl
rename to crypto/bn/asm/alpha.works/mul_add.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl b/crypto/bn/asm/alpha.works/mul_c4.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl
rename to crypto/bn/asm/alpha.works/mul_c4.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl b/crypto/bn/asm/alpha.works/mul_c4.works.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl
rename to crypto/bn/asm/alpha.works/mul_c4.works.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl b/crypto/bn/asm/alpha.works/mul_c8.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl
rename to crypto/bn/asm/alpha.works/mul_c8.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl b/crypto/bn/asm/alpha.works/sqr.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl
rename to crypto/bn/asm/alpha.works/sqr.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl b/crypto/bn/asm/alpha.works/sqr_c4.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl
rename to crypto/bn/asm/alpha.works/sqr_c4.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl b/crypto/bn/asm/alpha.works/sqr_c8.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl
rename to crypto/bn/asm/alpha.works/sqr_c8.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl b/crypto/bn/asm/alpha.works/sub.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha.works/sub.pl
rename to crypto/bn/asm/alpha.works/sub.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/add.pl b/crypto/bn/asm/alpha/add.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/add.pl
rename to crypto/bn/asm/alpha/add.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/div.pl b/crypto/bn/asm/alpha/div.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/div.pl
rename to crypto/bn/asm/alpha/div.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/mul.pl b/crypto/bn/asm/alpha/mul.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/mul.pl
rename to crypto/bn/asm/alpha/mul.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl b/crypto/bn/asm/alpha/mul_add.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/mul_add.pl
rename to crypto/bn/asm/alpha/mul_add.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl b/crypto/bn/asm/alpha/mul_c4.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl
rename to crypto/bn/asm/alpha/mul_c4.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl b/crypto/bn/asm/alpha/mul_c4.works.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl
rename to crypto/bn/asm/alpha/mul_c4.works.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl b/crypto/bn/asm/alpha/mul_c8.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl
rename to crypto/bn/asm/alpha/mul_c8.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/sqr.pl b/crypto/bn/asm/alpha/sqr.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/sqr.pl
rename to crypto/bn/asm/alpha/sqr.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl b/crypto/bn/asm/alpha/sqr_c4.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl
rename to crypto/bn/asm/alpha/sqr_c4.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl b/crypto/bn/asm/alpha/sqr_c8.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl
rename to crypto/bn/asm/alpha/sqr_c8.pl
diff --git a/crypto/openssl/crypto/bn/asm/alpha/sub.pl b/crypto/bn/asm/alpha/sub.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/alpha/sub.pl
rename to crypto/bn/asm/alpha/sub.pl
diff --git a/crypto/openssl/crypto/bn/asm/bn-586.pl b/crypto/bn/asm/bn-586.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/bn-586.pl
rename to crypto/bn/asm/bn-586.pl
diff --git a/crypto/openssl/crypto/bn/asm/bn-alpha.pl b/crypto/bn/asm/bn-alpha.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/bn-alpha.pl
rename to crypto/bn/asm/bn-alpha.pl
diff --git a/crypto/openssl/crypto/bn/asm/ca.pl b/crypto/bn/asm/ca.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/ca.pl
rename to crypto/bn/asm/ca.pl
diff --git a/crypto/openssl/crypto/bn/asm/co-586.pl b/crypto/bn/asm/co-586.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/co-586.pl
rename to crypto/bn/asm/co-586.pl
diff --git a/crypto/openssl/crypto/bn/asm/co-alpha.pl b/crypto/bn/asm/co-alpha.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/co-alpha.pl
rename to crypto/bn/asm/co-alpha.pl
diff --git a/crypto/openssl/crypto/bn/asm/ia64.S b/crypto/bn/asm/ia64.S
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/ia64.S
rename to crypto/bn/asm/ia64.S
diff --git a/crypto/openssl/crypto/bn/asm/mips1.s b/crypto/bn/asm/mips1.s
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/mips1.s
rename to crypto/bn/asm/mips1.s
diff --git a/crypto/openssl/crypto/bn/asm/mips3.s b/crypto/bn/asm/mips3.s
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/mips3.s
rename to crypto/bn/asm/mips3.s
diff --git a/crypto/openssl/crypto/bn/asm/pa-risc.s b/crypto/bn/asm/pa-risc.s
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/pa-risc.s
rename to crypto/bn/asm/pa-risc.s
diff --git a/crypto/openssl/crypto/bn/asm/pa-risc2.s b/crypto/bn/asm/pa-risc2.s
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/pa-risc2.s
rename to crypto/bn/asm/pa-risc2.s
diff --git a/crypto/openssl/crypto/bn/asm/pa-risc2W.s b/crypto/bn/asm/pa-risc2W.s
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/pa-risc2W.s
rename to crypto/bn/asm/pa-risc2W.s
diff --git a/crypto/openssl/crypto/bn/asm/ppc.pl b/crypto/bn/asm/ppc.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/ppc.pl
rename to crypto/bn/asm/ppc.pl
diff --git a/crypto/openssl/crypto/bn/asm/r3000.s b/crypto/bn/asm/r3000.s
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/r3000.s
rename to crypto/bn/asm/r3000.s
diff --git a/crypto/openssl/crypto/bn/asm/sparcv8.S b/crypto/bn/asm/sparcv8.S
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/sparcv8.S
rename to crypto/bn/asm/sparcv8.S
diff --git a/crypto/openssl/crypto/bn/asm/sparcv8plus.S b/crypto/bn/asm/sparcv8plus.S
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/sparcv8plus.S
rename to crypto/bn/asm/sparcv8plus.S
diff --git a/crypto/openssl/crypto/bn/asm/x86.pl b/crypto/bn/asm/x86.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86.pl
rename to crypto/bn/asm/x86.pl
diff --git a/crypto/openssl/crypto/bn/asm/x86/add.pl b/crypto/bn/asm/x86/add.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86/add.pl
rename to crypto/bn/asm/x86/add.pl
diff --git a/crypto/openssl/crypto/bn/asm/x86/comba.pl b/crypto/bn/asm/x86/comba.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86/comba.pl
rename to crypto/bn/asm/x86/comba.pl
diff --git a/crypto/openssl/crypto/bn/asm/x86/div.pl b/crypto/bn/asm/x86/div.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86/div.pl
rename to crypto/bn/asm/x86/div.pl
diff --git a/crypto/openssl/crypto/bn/asm/x86/f b/crypto/bn/asm/x86/f
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86/f
rename to crypto/bn/asm/x86/f
diff --git a/crypto/openssl/crypto/bn/asm/x86/mul.pl b/crypto/bn/asm/x86/mul.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86/mul.pl
rename to crypto/bn/asm/x86/mul.pl
diff --git a/crypto/openssl/crypto/bn/asm/x86/mul_add.pl b/crypto/bn/asm/x86/mul_add.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86/mul_add.pl
rename to crypto/bn/asm/x86/mul_add.pl
diff --git a/crypto/openssl/crypto/bn/asm/x86/sqr.pl b/crypto/bn/asm/x86/sqr.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86/sqr.pl
rename to crypto/bn/asm/x86/sqr.pl
diff --git a/crypto/openssl/crypto/bn/asm/x86/sub.pl b/crypto/bn/asm/x86/sub.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86/sub.pl
rename to crypto/bn/asm/x86/sub.pl
diff --git a/crypto/openssl/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
similarity index 100%
rename from crypto/openssl/crypto/bn/asm/x86_64-gcc.c
rename to crypto/bn/asm/x86_64-gcc.c
diff --git a/crypto/openssl/crypto/bn/bn.h b/crypto/bn/bn.h
similarity index 100%
rename from crypto/openssl/crypto/bn/bn.h
rename to crypto/bn/bn.h
diff --git a/crypto/openssl/crypto/bn/bn.mul b/crypto/bn/bn.mul
similarity index 100%
rename from crypto/openssl/crypto/bn/bn.mul
rename to crypto/bn/bn.mul
diff --git a/crypto/openssl/crypto/bn/bn_add.c b/crypto/bn/bn_add.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_add.c
rename to crypto/bn/bn_add.c
diff --git a/crypto/openssl/crypto/bn/bn_asm.c b/crypto/bn/bn_asm.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_asm.c
rename to crypto/bn/bn_asm.c
diff --git a/crypto/openssl/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_blind.c
rename to crypto/bn/bn_blind.c
diff --git a/crypto/openssl/crypto/bn/bn_const.c b/crypto/bn/bn_const.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_const.c
rename to crypto/bn/bn_const.c
diff --git a/crypto/openssl/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_ctx.c
rename to crypto/bn/bn_ctx.c
diff --git a/crypto/openssl/crypto/bn/bn_depr.c b/crypto/bn/bn_depr.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_depr.c
rename to crypto/bn/bn_depr.c
diff --git a/crypto/openssl/crypto/bn/bn_div.c b/crypto/bn/bn_div.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_div.c
rename to crypto/bn/bn_div.c
diff --git a/crypto/openssl/crypto/bn/bn_err.c b/crypto/bn/bn_err.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_err.c
rename to crypto/bn/bn_err.c
diff --git a/crypto/openssl/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_exp.c
rename to crypto/bn/bn_exp.c
diff --git a/crypto/openssl/crypto/bn/bn_exp2.c b/crypto/bn/bn_exp2.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_exp2.c
rename to crypto/bn/bn_exp2.c
diff --git a/crypto/openssl/crypto/bn/bn_gcd.c b/crypto/bn/bn_gcd.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_gcd.c
rename to crypto/bn/bn_gcd.c
diff --git a/crypto/openssl/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_gf2m.c
rename to crypto/bn/bn_gf2m.c
diff --git a/crypto/openssl/crypto/bn/bn_kron.c b/crypto/bn/bn_kron.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_kron.c
rename to crypto/bn/bn_kron.c
diff --git a/crypto/openssl/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_lcl.h
rename to crypto/bn/bn_lcl.h
diff --git a/crypto/openssl/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_lib.c
rename to crypto/bn/bn_lib.c
diff --git a/crypto/openssl/crypto/bn/bn_mod.c b/crypto/bn/bn_mod.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_mod.c
rename to crypto/bn/bn_mod.c
diff --git a/crypto/openssl/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_mont.c
rename to crypto/bn/bn_mont.c
diff --git a/crypto/openssl/crypto/bn/bn_mpi.c b/crypto/bn/bn_mpi.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_mpi.c
rename to crypto/bn/bn_mpi.c
diff --git a/crypto/openssl/crypto/bn/bn_mul.c b/crypto/bn/bn_mul.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_mul.c
rename to crypto/bn/bn_mul.c
diff --git a/crypto/openssl/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_nist.c
rename to crypto/bn/bn_nist.c
diff --git a/crypto/openssl/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_prime.c
rename to crypto/bn/bn_prime.c
diff --git a/crypto/openssl/crypto/bn/bn_prime.h b/crypto/bn/bn_prime.h
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_prime.h
rename to crypto/bn/bn_prime.h
diff --git a/crypto/openssl/crypto/bn/bn_prime.pl b/crypto/bn/bn_prime.pl
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_prime.pl
rename to crypto/bn/bn_prime.pl
diff --git a/crypto/openssl/crypto/bn/bn_print.c b/crypto/bn/bn_print.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_print.c
rename to crypto/bn/bn_print.c
diff --git a/crypto/openssl/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_rand.c
rename to crypto/bn/bn_rand.c
diff --git a/crypto/openssl/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_recp.c
rename to crypto/bn/bn_recp.c
diff --git a/crypto/openssl/crypto/bn/bn_shift.c b/crypto/bn/bn_shift.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_shift.c
rename to crypto/bn/bn_shift.c
diff --git a/crypto/openssl/crypto/bn/bn_sqr.c b/crypto/bn/bn_sqr.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_sqr.c
rename to crypto/bn/bn_sqr.c
diff --git a/crypto/openssl/crypto/bn/bn_sqrt.c b/crypto/bn/bn_sqrt.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_sqrt.c
rename to crypto/bn/bn_sqrt.c
diff --git a/crypto/openssl/crypto/bn/bn_word.c b/crypto/bn/bn_word.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bn_word.c
rename to crypto/bn/bn_word.c
diff --git a/crypto/openssl/crypto/bn/bnspeed.c b/crypto/bn/bnspeed.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bnspeed.c
rename to crypto/bn/bnspeed.c
diff --git a/crypto/openssl/crypto/bn/bntest.c b/crypto/bn/bntest.c
similarity index 100%
rename from crypto/openssl/crypto/bn/bntest.c
rename to crypto/bn/bntest.c
diff --git a/crypto/openssl/crypto/bn/divtest.c b/crypto/bn/divtest.c
similarity index 100%
rename from crypto/openssl/crypto/bn/divtest.c
rename to crypto/bn/divtest.c
diff --git a/crypto/openssl/crypto/bn/exp.c b/crypto/bn/exp.c
similarity index 100%
rename from crypto/openssl/crypto/bn/exp.c
rename to crypto/bn/exp.c
diff --git a/crypto/openssl/crypto/bn/expspeed.c b/crypto/bn/expspeed.c
similarity index 100%
rename from crypto/openssl/crypto/bn/expspeed.c
rename to crypto/bn/expspeed.c
diff --git a/crypto/openssl/crypto/bn/exptest.c b/crypto/bn/exptest.c
similarity index 100%
rename from crypto/openssl/crypto/bn/exptest.c
rename to crypto/bn/exptest.c
diff --git a/crypto/openssl/crypto/bn/todo b/crypto/bn/todo
similarity index 100%
rename from crypto/openssl/crypto/bn/todo
rename to crypto/bn/todo
diff --git a/crypto/openssl/crypto/buffer/Makefile b/crypto/buffer/Makefile
similarity index 100%
rename from crypto/openssl/crypto/buffer/Makefile
rename to crypto/buffer/Makefile
diff --git a/crypto/openssl/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c
similarity index 100%
rename from crypto/openssl/crypto/buffer/buf_err.c
rename to crypto/buffer/buf_err.c
diff --git a/crypto/openssl/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
similarity index 100%
rename from crypto/openssl/crypto/buffer/buffer.c
rename to crypto/buffer/buffer.c
diff --git a/crypto/openssl/crypto/buffer/buffer.h b/crypto/buffer/buffer.h
similarity index 100%
rename from crypto/openssl/crypto/buffer/buffer.h
rename to crypto/buffer/buffer.h
diff --git a/crypto/openssl/crypto/camellia/Makefile b/crypto/camellia/Makefile
similarity index 100%
rename from crypto/openssl/crypto/camellia/Makefile
rename to crypto/camellia/Makefile
diff --git a/crypto/openssl/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
similarity index 100%
rename from crypto/openssl/crypto/camellia/camellia.c
rename to crypto/camellia/camellia.c
diff --git a/crypto/openssl/crypto/camellia/camellia.h b/crypto/camellia/camellia.h
similarity index 100%
rename from crypto/openssl/crypto/camellia/camellia.h
rename to crypto/camellia/camellia.h
diff --git a/crypto/openssl/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c
similarity index 100%
rename from crypto/openssl/crypto/camellia/cmll_cbc.c
rename to crypto/camellia/cmll_cbc.c
diff --git a/crypto/openssl/crypto/camellia/cmll_cfb.c b/crypto/camellia/cmll_cfb.c
similarity index 100%
rename from crypto/openssl/crypto/camellia/cmll_cfb.c
rename to crypto/camellia/cmll_cfb.c
diff --git a/crypto/openssl/crypto/camellia/cmll_ctr.c b/crypto/camellia/cmll_ctr.c
similarity index 100%
rename from crypto/openssl/crypto/camellia/cmll_ctr.c
rename to crypto/camellia/cmll_ctr.c
diff --git a/crypto/openssl/crypto/camellia/cmll_ecb.c b/crypto/camellia/cmll_ecb.c
similarity index 100%
rename from crypto/openssl/crypto/camellia/cmll_ecb.c
rename to crypto/camellia/cmll_ecb.c
diff --git a/crypto/openssl/crypto/camellia/cmll_locl.h b/crypto/camellia/cmll_locl.h
similarity index 100%
rename from crypto/openssl/crypto/camellia/cmll_locl.h
rename to crypto/camellia/cmll_locl.h
diff --git a/crypto/openssl/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c
similarity index 100%
rename from crypto/openssl/crypto/camellia/cmll_misc.c
rename to crypto/camellia/cmll_misc.c
diff --git a/crypto/openssl/crypto/camellia/cmll_ofb.c b/crypto/camellia/cmll_ofb.c
similarity index 100%
rename from crypto/openssl/crypto/camellia/cmll_ofb.c
rename to crypto/camellia/cmll_ofb.c
diff --git a/crypto/openssl/crypto/cast/Makefile b/crypto/cast/Makefile
similarity index 100%
rename from crypto/openssl/crypto/cast/Makefile
rename to crypto/cast/Makefile
diff --git a/crypto/openssl/crypto/cast/asm/cast-586.pl b/crypto/cast/asm/cast-586.pl
similarity index 100%
rename from crypto/openssl/crypto/cast/asm/cast-586.pl
rename to crypto/cast/asm/cast-586.pl
diff --git a/crypto/openssl/crypto/cast/asm/readme b/crypto/cast/asm/readme
similarity index 100%
rename from crypto/openssl/crypto/cast/asm/readme
rename to crypto/cast/asm/readme
diff --git a/crypto/openssl/crypto/cast/c_cfb64.c b/crypto/cast/c_cfb64.c
similarity index 100%
rename from crypto/openssl/crypto/cast/c_cfb64.c
rename to crypto/cast/c_cfb64.c
diff --git a/crypto/openssl/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c
similarity index 100%
rename from crypto/openssl/crypto/cast/c_ecb.c
rename to crypto/cast/c_ecb.c
diff --git a/crypto/openssl/crypto/cast/c_enc.c b/crypto/cast/c_enc.c
similarity index 100%
rename from crypto/openssl/crypto/cast/c_enc.c
rename to crypto/cast/c_enc.c
diff --git a/crypto/openssl/crypto/cast/c_ofb64.c b/crypto/cast/c_ofb64.c
similarity index 100%
rename from crypto/openssl/crypto/cast/c_ofb64.c
rename to crypto/cast/c_ofb64.c
diff --git a/crypto/openssl/crypto/cast/c_skey.c b/crypto/cast/c_skey.c
similarity index 100%
rename from crypto/openssl/crypto/cast/c_skey.c
rename to crypto/cast/c_skey.c
diff --git a/crypto/openssl/crypto/cast/cast.h b/crypto/cast/cast.h
similarity index 100%
rename from crypto/openssl/crypto/cast/cast.h
rename to crypto/cast/cast.h
diff --git a/crypto/openssl/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h
similarity index 100%
rename from crypto/openssl/crypto/cast/cast_lcl.h
rename to crypto/cast/cast_lcl.h
diff --git a/crypto/openssl/crypto/cast/cast_s.h b/crypto/cast/cast_s.h
similarity index 100%
rename from crypto/openssl/crypto/cast/cast_s.h
rename to crypto/cast/cast_s.h
diff --git a/crypto/openssl/crypto/cast/cast_spd.c b/crypto/cast/cast_spd.c
similarity index 100%
rename from crypto/openssl/crypto/cast/cast_spd.c
rename to crypto/cast/cast_spd.c
diff --git a/crypto/openssl/crypto/cast/castopts.c b/crypto/cast/castopts.c
similarity index 100%
rename from crypto/openssl/crypto/cast/castopts.c
rename to crypto/cast/castopts.c
diff --git a/crypto/openssl/crypto/cast/casts.cpp b/crypto/cast/casts.cpp
similarity index 100%
rename from crypto/openssl/crypto/cast/casts.cpp
rename to crypto/cast/casts.cpp
diff --git a/crypto/openssl/crypto/cast/casttest.c b/crypto/cast/casttest.c
similarity index 100%
rename from crypto/openssl/crypto/cast/casttest.c
rename to crypto/cast/casttest.c
diff --git a/crypto/openssl/crypto/comp/Makefile b/crypto/comp/Makefile
similarity index 100%
rename from crypto/openssl/crypto/comp/Makefile
rename to crypto/comp/Makefile
diff --git a/crypto/openssl/crypto/comp/c_rle.c b/crypto/comp/c_rle.c
similarity index 100%
rename from crypto/openssl/crypto/comp/c_rle.c
rename to crypto/comp/c_rle.c
diff --git a/crypto/openssl/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
similarity index 100%
rename from crypto/openssl/crypto/comp/c_zlib.c
rename to crypto/comp/c_zlib.c
diff --git a/crypto/openssl/crypto/comp/comp.h b/crypto/comp/comp.h
similarity index 100%
rename from crypto/openssl/crypto/comp/comp.h
rename to crypto/comp/comp.h
diff --git a/crypto/openssl/crypto/comp/comp_err.c b/crypto/comp/comp_err.c
similarity index 100%
rename from crypto/openssl/crypto/comp/comp_err.c
rename to crypto/comp/comp_err.c
diff --git a/crypto/openssl/crypto/comp/comp_lib.c b/crypto/comp/comp_lib.c
similarity index 100%
rename from crypto/openssl/crypto/comp/comp_lib.c
rename to crypto/comp/comp_lib.c
diff --git a/crypto/openssl/crypto/conf/Makefile b/crypto/conf/Makefile
similarity index 100%
rename from crypto/openssl/crypto/conf/Makefile
rename to crypto/conf/Makefile
diff --git a/crypto/openssl/crypto/conf/README b/crypto/conf/README
similarity index 100%
rename from crypto/openssl/crypto/conf/README
rename to crypto/conf/README
diff --git a/crypto/openssl/crypto/conf/cnf_save.c b/crypto/conf/cnf_save.c
similarity index 100%
rename from crypto/openssl/crypto/conf/cnf_save.c
rename to crypto/conf/cnf_save.c
diff --git a/crypto/openssl/crypto/conf/conf.h b/crypto/conf/conf.h
similarity index 100%
rename from crypto/openssl/crypto/conf/conf.h
rename to crypto/conf/conf.h
diff --git a/crypto/openssl/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
similarity index 100%
rename from crypto/openssl/crypto/conf/conf_api.c
rename to crypto/conf/conf_api.c
diff --git a/crypto/openssl/crypto/conf/conf_api.h b/crypto/conf/conf_api.h
similarity index 100%
rename from crypto/openssl/crypto/conf/conf_api.h
rename to crypto/conf/conf_api.h
diff --git a/crypto/openssl/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
similarity index 100%
rename from crypto/openssl/crypto/conf/conf_def.c
rename to crypto/conf/conf_def.c
diff --git a/crypto/openssl/crypto/conf/conf_def.h b/crypto/conf/conf_def.h
similarity index 100%
rename from crypto/openssl/crypto/conf/conf_def.h
rename to crypto/conf/conf_def.h
diff --git a/crypto/openssl/crypto/conf/conf_err.c b/crypto/conf/conf_err.c
similarity index 100%
rename from crypto/openssl/crypto/conf/conf_err.c
rename to crypto/conf/conf_err.c
diff --git a/crypto/openssl/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
similarity index 100%
rename from crypto/openssl/crypto/conf/conf_lib.c
rename to crypto/conf/conf_lib.c
diff --git a/crypto/openssl/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
similarity index 100%
rename from crypto/openssl/crypto/conf/conf_mall.c
rename to crypto/conf/conf_mall.c
diff --git a/crypto/openssl/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
similarity index 100%
rename from crypto/openssl/crypto/conf/conf_mod.c
rename to crypto/conf/conf_mod.c
diff --git a/crypto/openssl/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
similarity index 100%
rename from crypto/openssl/crypto/conf/conf_sap.c
rename to crypto/conf/conf_sap.c
diff --git a/crypto/openssl/crypto/conf/keysets.pl b/crypto/conf/keysets.pl
similarity index 100%
rename from crypto/openssl/crypto/conf/keysets.pl
rename to crypto/conf/keysets.pl
diff --git a/crypto/openssl/crypto/conf/ssleay.cnf b/crypto/conf/ssleay.cnf
similarity index 100%
rename from crypto/openssl/crypto/conf/ssleay.cnf
rename to crypto/conf/ssleay.cnf
diff --git a/crypto/openssl/crypto/conf/test.c b/crypto/conf/test.c
similarity index 100%
rename from crypto/openssl/crypto/conf/test.c
rename to crypto/conf/test.c
diff --git a/crypto/openssl/crypto/cpt_err.c b/crypto/cpt_err.c
similarity index 100%
rename from crypto/openssl/crypto/cpt_err.c
rename to crypto/cpt_err.c
diff --git a/crypto/openssl/crypto/cryptlib.c b/crypto/cryptlib.c
similarity index 100%
rename from crypto/openssl/crypto/cryptlib.c
rename to crypto/cryptlib.c
diff --git a/crypto/openssl/crypto/cryptlib.h b/crypto/cryptlib.h
similarity index 100%
rename from crypto/openssl/crypto/cryptlib.h
rename to crypto/cryptlib.h
diff --git a/crypto/openssl/crypto/crypto.h b/crypto/crypto.h
similarity index 100%
rename from crypto/openssl/crypto/crypto.h
rename to crypto/crypto.h
diff --git a/crypto/openssl/crypto/cversion.c b/crypto/cversion.c
similarity index 100%
rename from crypto/openssl/crypto/cversion.c
rename to crypto/cversion.c
diff --git a/crypto/openssl/crypto/des/COPYRIGHT b/crypto/des/COPYRIGHT
similarity index 100%
rename from crypto/openssl/crypto/des/COPYRIGHT
rename to crypto/des/COPYRIGHT
diff --git a/crypto/openssl/crypto/des/DES.pm b/crypto/des/DES.pm
similarity index 100%
rename from crypto/openssl/crypto/des/DES.pm
rename to crypto/des/DES.pm
diff --git a/crypto/openssl/crypto/des/DES.xs b/crypto/des/DES.xs
similarity index 100%
rename from crypto/openssl/crypto/des/DES.xs
rename to crypto/des/DES.xs
diff --git a/crypto/openssl/crypto/des/FILES0 b/crypto/des/FILES0
similarity index 100%
rename from crypto/openssl/crypto/des/FILES0
rename to crypto/des/FILES0
diff --git a/crypto/openssl/crypto/des/INSTALL b/crypto/des/INSTALL
similarity index 100%
rename from crypto/openssl/crypto/des/INSTALL
rename to crypto/des/INSTALL
diff --git a/crypto/openssl/crypto/des/Imakefile b/crypto/des/Imakefile
similarity index 100%
rename from crypto/openssl/crypto/des/Imakefile
rename to crypto/des/Imakefile
diff --git a/crypto/openssl/crypto/des/KERBEROS b/crypto/des/KERBEROS
similarity index 100%
rename from crypto/openssl/crypto/des/KERBEROS
rename to crypto/des/KERBEROS
diff --git a/crypto/openssl/crypto/des/Makefile b/crypto/des/Makefile
similarity index 100%
rename from crypto/openssl/crypto/des/Makefile
rename to crypto/des/Makefile
diff --git a/crypto/openssl/crypto/des/README b/crypto/des/README
similarity index 100%
rename from crypto/openssl/crypto/des/README
rename to crypto/des/README
diff --git a/crypto/openssl/crypto/des/VERSION b/crypto/des/VERSION
similarity index 100%
rename from crypto/openssl/crypto/des/VERSION
rename to crypto/des/VERSION
diff --git a/crypto/openssl/crypto/des/asm/crypt586.pl b/crypto/des/asm/crypt586.pl
similarity index 100%
rename from crypto/openssl/crypto/des/asm/crypt586.pl
rename to crypto/des/asm/crypt586.pl
diff --git a/crypto/openssl/crypto/des/asm/des-586.pl b/crypto/des/asm/des-586.pl
similarity index 100%
rename from crypto/openssl/crypto/des/asm/des-586.pl
rename to crypto/des/asm/des-586.pl
diff --git a/crypto/openssl/crypto/des/asm/des686.pl b/crypto/des/asm/des686.pl
similarity index 100%
rename from crypto/openssl/crypto/des/asm/des686.pl
rename to crypto/des/asm/des686.pl
diff --git a/crypto/openssl/crypto/des/asm/des_enc.m4 b/crypto/des/asm/des_enc.m4
similarity index 100%
rename from crypto/openssl/crypto/des/asm/des_enc.m4
rename to crypto/des/asm/des_enc.m4
diff --git a/crypto/openssl/crypto/des/asm/desboth.pl b/crypto/des/asm/desboth.pl
similarity index 100%
rename from crypto/openssl/crypto/des/asm/desboth.pl
rename to crypto/des/asm/desboth.pl
diff --git a/crypto/openssl/crypto/des/asm/readme b/crypto/des/asm/readme
similarity index 100%
rename from crypto/openssl/crypto/des/asm/readme
rename to crypto/des/asm/readme
diff --git a/crypto/openssl/crypto/des/cbc3_enc.c b/crypto/des/cbc3_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/cbc3_enc.c
rename to crypto/des/cbc3_enc.c
diff --git a/crypto/openssl/crypto/des/cbc_cksm.c b/crypto/des/cbc_cksm.c
similarity index 100%
rename from crypto/openssl/crypto/des/cbc_cksm.c
rename to crypto/des/cbc_cksm.c
diff --git a/crypto/openssl/crypto/des/cbc_enc.c b/crypto/des/cbc_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/cbc_enc.c
rename to crypto/des/cbc_enc.c
diff --git a/crypto/openssl/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c
similarity index 100%
rename from crypto/openssl/crypto/des/cfb64ede.c
rename to crypto/des/cfb64ede.c
diff --git a/crypto/openssl/crypto/des/cfb64enc.c b/crypto/des/cfb64enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/cfb64enc.c
rename to crypto/des/cfb64enc.c
diff --git a/crypto/openssl/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/cfb_enc.c
rename to crypto/des/cfb_enc.c
diff --git a/crypto/openssl/crypto/des/des.c b/crypto/des/des.c
similarity index 100%
rename from crypto/openssl/crypto/des/des.c
rename to crypto/des/des.c
diff --git a/crypto/openssl/crypto/des/des.h b/crypto/des/des.h
similarity index 100%
rename from crypto/openssl/crypto/des/des.h
rename to crypto/des/des.h
diff --git a/crypto/openssl/crypto/des/des.pod b/crypto/des/des.pod
similarity index 100%
rename from crypto/openssl/crypto/des/des.pod
rename to crypto/des/des.pod
diff --git a/crypto/openssl/crypto/des/des3s.cpp b/crypto/des/des3s.cpp
similarity index 100%
rename from crypto/openssl/crypto/des/des3s.cpp
rename to crypto/des/des3s.cpp
diff --git a/crypto/openssl/crypto/des/des_enc.c b/crypto/des/des_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/des_enc.c
rename to crypto/des/des_enc.c
diff --git a/crypto/openssl/crypto/des/des_locl.h b/crypto/des/des_locl.h
similarity index 100%
rename from crypto/openssl/crypto/des/des_locl.h
rename to crypto/des/des_locl.h
diff --git a/crypto/openssl/crypto/des/des_old.c b/crypto/des/des_old.c
similarity index 100%
rename from crypto/openssl/crypto/des/des_old.c
rename to crypto/des/des_old.c
diff --git a/crypto/openssl/crypto/des/des_old.h b/crypto/des/des_old.h
similarity index 100%
rename from crypto/openssl/crypto/des/des_old.h
rename to crypto/des/des_old.h
diff --git a/crypto/openssl/crypto/des/des_old2.c b/crypto/des/des_old2.c
similarity index 100%
rename from crypto/openssl/crypto/des/des_old2.c
rename to crypto/des/des_old2.c
diff --git a/crypto/openssl/crypto/des/des_opts.c b/crypto/des/des_opts.c
similarity index 100%
rename from crypto/openssl/crypto/des/des_opts.c
rename to crypto/des/des_opts.c
diff --git a/crypto/openssl/crypto/des/des_ver.h b/crypto/des/des_ver.h
similarity index 100%
rename from crypto/openssl/crypto/des/des_ver.h
rename to crypto/des/des_ver.h
diff --git a/crypto/openssl/crypto/des/dess.cpp b/crypto/des/dess.cpp
similarity index 100%
rename from crypto/openssl/crypto/des/dess.cpp
rename to crypto/des/dess.cpp
diff --git a/crypto/openssl/crypto/des/destest.c b/crypto/des/destest.c
similarity index 100%
rename from crypto/openssl/crypto/des/destest.c
rename to crypto/des/destest.c
diff --git a/crypto/openssl/crypto/des/ecb3_enc.c b/crypto/des/ecb3_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/ecb3_enc.c
rename to crypto/des/ecb3_enc.c
diff --git a/crypto/openssl/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/ecb_enc.c
rename to crypto/des/ecb_enc.c
diff --git a/crypto/openssl/crypto/des/ede_cbcm_enc.c b/crypto/des/ede_cbcm_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/ede_cbcm_enc.c
rename to crypto/des/ede_cbcm_enc.c
diff --git a/crypto/openssl/crypto/des/enc_read.c b/crypto/des/enc_read.c
similarity index 100%
rename from crypto/openssl/crypto/des/enc_read.c
rename to crypto/des/enc_read.c
diff --git a/crypto/openssl/crypto/des/enc_writ.c b/crypto/des/enc_writ.c
similarity index 100%
rename from crypto/openssl/crypto/des/enc_writ.c
rename to crypto/des/enc_writ.c
diff --git a/crypto/openssl/crypto/des/fcrypt.c b/crypto/des/fcrypt.c
similarity index 100%
rename from crypto/openssl/crypto/des/fcrypt.c
rename to crypto/des/fcrypt.c
diff --git a/crypto/openssl/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c
similarity index 100%
rename from crypto/openssl/crypto/des/fcrypt_b.c
rename to crypto/des/fcrypt_b.c
diff --git a/crypto/openssl/crypto/des/makefile.bc b/crypto/des/makefile.bc
similarity index 100%
rename from crypto/openssl/crypto/des/makefile.bc
rename to crypto/des/makefile.bc
diff --git a/crypto/openssl/crypto/des/ncbc_enc.c b/crypto/des/ncbc_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/ncbc_enc.c
rename to crypto/des/ncbc_enc.c
diff --git a/crypto/openssl/crypto/des/ofb64ede.c b/crypto/des/ofb64ede.c
similarity index 100%
rename from crypto/openssl/crypto/des/ofb64ede.c
rename to crypto/des/ofb64ede.c
diff --git a/crypto/openssl/crypto/des/ofb64enc.c b/crypto/des/ofb64enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/ofb64enc.c
rename to crypto/des/ofb64enc.c
diff --git a/crypto/openssl/crypto/des/ofb_enc.c b/crypto/des/ofb_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/ofb_enc.c
rename to crypto/des/ofb_enc.c
diff --git a/crypto/openssl/crypto/des/options.txt b/crypto/des/options.txt
similarity index 100%
rename from crypto/openssl/crypto/des/options.txt
rename to crypto/des/options.txt
diff --git a/crypto/openssl/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/pcbc_enc.c
rename to crypto/des/pcbc_enc.c
diff --git a/crypto/openssl/crypto/des/qud_cksm.c b/crypto/des/qud_cksm.c
similarity index 100%
rename from crypto/openssl/crypto/des/qud_cksm.c
rename to crypto/des/qud_cksm.c
diff --git a/crypto/openssl/crypto/des/rand_key.c b/crypto/des/rand_key.c
similarity index 100%
rename from crypto/openssl/crypto/des/rand_key.c
rename to crypto/des/rand_key.c
diff --git a/crypto/openssl/crypto/des/read2pwd.c b/crypto/des/read2pwd.c
similarity index 100%
rename from crypto/openssl/crypto/des/read2pwd.c
rename to crypto/des/read2pwd.c
diff --git a/crypto/openssl/crypto/des/read_pwd.c b/crypto/des/read_pwd.c
similarity index 100%
rename from crypto/openssl/crypto/des/read_pwd.c
rename to crypto/des/read_pwd.c
diff --git a/crypto/openssl/crypto/des/rpc_des.h b/crypto/des/rpc_des.h
similarity index 100%
rename from crypto/openssl/crypto/des/rpc_des.h
rename to crypto/des/rpc_des.h
diff --git a/crypto/openssl/crypto/des/rpc_enc.c b/crypto/des/rpc_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/rpc_enc.c
rename to crypto/des/rpc_enc.c
diff --git a/crypto/openssl/crypto/des/rpw.c b/crypto/des/rpw.c
similarity index 100%
rename from crypto/openssl/crypto/des/rpw.c
rename to crypto/des/rpw.c
diff --git a/crypto/openssl/crypto/des/set_key.c b/crypto/des/set_key.c
similarity index 100%
rename from crypto/openssl/crypto/des/set_key.c
rename to crypto/des/set_key.c
diff --git a/crypto/openssl/crypto/des/speed.c b/crypto/des/speed.c
similarity index 100%
rename from crypto/openssl/crypto/des/speed.c
rename to crypto/des/speed.c
diff --git a/crypto/openssl/crypto/des/spr.h b/crypto/des/spr.h
similarity index 100%
rename from crypto/openssl/crypto/des/spr.h
rename to crypto/des/spr.h
diff --git a/crypto/openssl/crypto/des/str2key.c b/crypto/des/str2key.c
similarity index 100%
rename from crypto/openssl/crypto/des/str2key.c
rename to crypto/des/str2key.c
diff --git a/crypto/openssl/crypto/des/t/test b/crypto/des/t/test
similarity index 100%
rename from crypto/openssl/crypto/des/t/test
rename to crypto/des/t/test
diff --git a/crypto/openssl/crypto/des/times/486-50.sol b/crypto/des/times/486-50.sol
similarity index 100%
rename from crypto/openssl/crypto/des/times/486-50.sol
rename to crypto/des/times/486-50.sol
diff --git a/crypto/openssl/crypto/des/times/586-100.lnx b/crypto/des/times/586-100.lnx
similarity index 100%
rename from crypto/openssl/crypto/des/times/586-100.lnx
rename to crypto/des/times/586-100.lnx
diff --git a/crypto/openssl/crypto/des/times/686-200.fre b/crypto/des/times/686-200.fre
similarity index 100%
rename from crypto/openssl/crypto/des/times/686-200.fre
rename to crypto/des/times/686-200.fre
diff --git a/crypto/openssl/crypto/des/times/aix.cc b/crypto/des/times/aix.cc
similarity index 100%
rename from crypto/openssl/crypto/des/times/aix.cc
rename to crypto/des/times/aix.cc
diff --git a/crypto/openssl/crypto/des/times/alpha.cc b/crypto/des/times/alpha.cc
similarity index 100%
rename from crypto/openssl/crypto/des/times/alpha.cc
rename to crypto/des/times/alpha.cc
diff --git a/crypto/openssl/crypto/des/times/hpux.cc b/crypto/des/times/hpux.cc
similarity index 100%
rename from crypto/openssl/crypto/des/times/hpux.cc
rename to crypto/des/times/hpux.cc
diff --git a/crypto/openssl/crypto/des/times/sparc.gcc b/crypto/des/times/sparc.gcc
similarity index 100%
rename from crypto/openssl/crypto/des/times/sparc.gcc
rename to crypto/des/times/sparc.gcc
diff --git a/crypto/openssl/crypto/des/times/usparc.cc b/crypto/des/times/usparc.cc
similarity index 100%
rename from crypto/openssl/crypto/des/times/usparc.cc
rename to crypto/des/times/usparc.cc
diff --git a/crypto/openssl/crypto/des/typemap b/crypto/des/typemap
similarity index 100%
rename from crypto/openssl/crypto/des/typemap
rename to crypto/des/typemap
diff --git a/crypto/openssl/crypto/des/xcbc_enc.c b/crypto/des/xcbc_enc.c
similarity index 100%
rename from crypto/openssl/crypto/des/xcbc_enc.c
rename to crypto/des/xcbc_enc.c
diff --git a/crypto/openssl/crypto/dh/Makefile b/crypto/dh/Makefile
similarity index 100%
rename from crypto/openssl/crypto/dh/Makefile
rename to crypto/dh/Makefile
diff --git a/crypto/openssl/crypto/dh/dh.h b/crypto/dh/dh.h
similarity index 100%
rename from crypto/openssl/crypto/dh/dh.h
rename to crypto/dh/dh.h
diff --git a/crypto/openssl/crypto/dh/dh1024.pem b/crypto/dh/dh1024.pem
similarity index 100%
rename from crypto/openssl/crypto/dh/dh1024.pem
rename to crypto/dh/dh1024.pem
diff --git a/crypto/openssl/crypto/dh/dh192.pem b/crypto/dh/dh192.pem
similarity index 100%
rename from crypto/openssl/crypto/dh/dh192.pem
rename to crypto/dh/dh192.pem
diff --git a/crypto/openssl/crypto/dh/dh2048.pem b/crypto/dh/dh2048.pem
similarity index 100%
rename from crypto/openssl/crypto/dh/dh2048.pem
rename to crypto/dh/dh2048.pem
diff --git a/crypto/openssl/crypto/dh/dh4096.pem b/crypto/dh/dh4096.pem
similarity index 100%
rename from crypto/openssl/crypto/dh/dh4096.pem
rename to crypto/dh/dh4096.pem
diff --git a/crypto/openssl/crypto/dh/dh512.pem b/crypto/dh/dh512.pem
similarity index 100%
rename from crypto/openssl/crypto/dh/dh512.pem
rename to crypto/dh/dh512.pem
diff --git a/crypto/openssl/crypto/dh/dh_asn1.c b/crypto/dh/dh_asn1.c
similarity index 100%
rename from crypto/openssl/crypto/dh/dh_asn1.c
rename to crypto/dh/dh_asn1.c
diff --git a/crypto/openssl/crypto/dh/dh_check.c b/crypto/dh/dh_check.c
similarity index 100%
rename from crypto/openssl/crypto/dh/dh_check.c
rename to crypto/dh/dh_check.c
diff --git a/crypto/openssl/crypto/dh/dh_depr.c b/crypto/dh/dh_depr.c
similarity index 100%
rename from crypto/openssl/crypto/dh/dh_depr.c
rename to crypto/dh/dh_depr.c
diff --git a/crypto/openssl/crypto/dh/dh_err.c b/crypto/dh/dh_err.c
similarity index 100%
rename from crypto/openssl/crypto/dh/dh_err.c
rename to crypto/dh/dh_err.c
diff --git a/crypto/openssl/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c
similarity index 100%
rename from crypto/openssl/crypto/dh/dh_gen.c
rename to crypto/dh/dh_gen.c
diff --git a/crypto/openssl/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
similarity index 100%
rename from crypto/openssl/crypto/dh/dh_key.c
rename to crypto/dh/dh_key.c
diff --git a/crypto/openssl/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
similarity index 100%
rename from crypto/openssl/crypto/dh/dh_lib.c
rename to crypto/dh/dh_lib.c
diff --git a/crypto/openssl/crypto/dh/dhtest.c b/crypto/dh/dhtest.c
similarity index 100%
rename from crypto/openssl/crypto/dh/dhtest.c
rename to crypto/dh/dhtest.c
diff --git a/crypto/openssl/crypto/dh/example b/crypto/dh/example
similarity index 100%
rename from crypto/openssl/crypto/dh/example
rename to crypto/dh/example
diff --git a/crypto/openssl/crypto/dh/generate b/crypto/dh/generate
similarity index 100%
rename from crypto/openssl/crypto/dh/generate
rename to crypto/dh/generate
diff --git a/crypto/openssl/crypto/dh/p1024.c b/crypto/dh/p1024.c
similarity index 100%
rename from crypto/openssl/crypto/dh/p1024.c
rename to crypto/dh/p1024.c
diff --git a/crypto/openssl/crypto/dh/p192.c b/crypto/dh/p192.c
similarity index 100%
rename from crypto/openssl/crypto/dh/p192.c
rename to crypto/dh/p192.c
diff --git a/crypto/openssl/crypto/dh/p512.c b/crypto/dh/p512.c
similarity index 100%
rename from crypto/openssl/crypto/dh/p512.c
rename to crypto/dh/p512.c
diff --git a/crypto/openssl/crypto/dsa/Makefile b/crypto/dsa/Makefile
similarity index 100%
rename from crypto/openssl/crypto/dsa/Makefile
rename to crypto/dsa/Makefile
diff --git a/crypto/openssl/crypto/dsa/README b/crypto/dsa/README
similarity index 100%
rename from crypto/openssl/crypto/dsa/README
rename to crypto/dsa/README
diff --git a/crypto/openssl/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa.h
rename to crypto/dsa/dsa.h
diff --git a/crypto/openssl/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa_asn1.c
rename to crypto/dsa/dsa_asn1.c
diff --git a/crypto/openssl/crypto/dsa/dsa_depr.c b/crypto/dsa/dsa_depr.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa_depr.c
rename to crypto/dsa/dsa_depr.c
diff --git a/crypto/openssl/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa_err.c
rename to crypto/dsa/dsa_err.c
diff --git a/crypto/openssl/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa_gen.c
rename to crypto/dsa/dsa_gen.c
diff --git a/crypto/openssl/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa_key.c
rename to crypto/dsa/dsa_key.c
diff --git a/crypto/openssl/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa_lib.c
rename to crypto/dsa/dsa_lib.c
diff --git a/crypto/openssl/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa_ossl.c
rename to crypto/dsa/dsa_ossl.c
diff --git a/crypto/openssl/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa_sign.c
rename to crypto/dsa/dsa_sign.c
diff --git a/crypto/openssl/crypto/dsa/dsa_vrf.c b/crypto/dsa/dsa_vrf.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsa_vrf.c
rename to crypto/dsa/dsa_vrf.c
diff --git a/crypto/openssl/crypto/dsa/dsagen.c b/crypto/dsa/dsagen.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsagen.c
rename to crypto/dsa/dsagen.c
diff --git a/crypto/openssl/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c
similarity index 100%
rename from crypto/openssl/crypto/dsa/dsatest.c
rename to crypto/dsa/dsatest.c
diff --git a/crypto/openssl/crypto/dsa/fips186a.txt b/crypto/dsa/fips186a.txt
similarity index 100%
rename from crypto/openssl/crypto/dsa/fips186a.txt
rename to crypto/dsa/fips186a.txt
diff --git a/crypto/openssl/crypto/dso/Makefile b/crypto/dso/Makefile
similarity index 100%
rename from crypto/openssl/crypto/dso/Makefile
rename to crypto/dso/Makefile
diff --git a/crypto/openssl/crypto/dso/README b/crypto/dso/README
similarity index 100%
rename from crypto/openssl/crypto/dso/README
rename to crypto/dso/README
diff --git a/crypto/openssl/crypto/dso/dso.h b/crypto/dso/dso.h
similarity index 100%
rename from crypto/openssl/crypto/dso/dso.h
rename to crypto/dso/dso.h
diff --git a/crypto/openssl/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
similarity index 100%
rename from crypto/openssl/crypto/dso/dso_dl.c
rename to crypto/dso/dso_dl.c
diff --git a/crypto/openssl/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
similarity index 100%
rename from crypto/openssl/crypto/dso/dso_dlfcn.c
rename to crypto/dso/dso_dlfcn.c
diff --git a/crypto/openssl/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
similarity index 100%
rename from crypto/openssl/crypto/dso/dso_err.c
rename to crypto/dso/dso_err.c
diff --git a/crypto/openssl/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
similarity index 100%
rename from crypto/openssl/crypto/dso/dso_lib.c
rename to crypto/dso/dso_lib.c
diff --git a/crypto/openssl/crypto/dso/dso_null.c b/crypto/dso/dso_null.c
similarity index 100%
rename from crypto/openssl/crypto/dso/dso_null.c
rename to crypto/dso/dso_null.c
diff --git a/crypto/openssl/crypto/dso/dso_openssl.c b/crypto/dso/dso_openssl.c
similarity index 100%
rename from crypto/openssl/crypto/dso/dso_openssl.c
rename to crypto/dso/dso_openssl.c
diff --git a/crypto/openssl/crypto/ebcdic.c b/crypto/ebcdic.c
similarity index 100%
rename from crypto/openssl/crypto/ebcdic.c
rename to crypto/ebcdic.c
diff --git a/crypto/openssl/crypto/ebcdic.h b/crypto/ebcdic.h
similarity index 100%
rename from crypto/openssl/crypto/ebcdic.h
rename to crypto/ebcdic.h
diff --git a/crypto/openssl/crypto/ec/Makefile b/crypto/ec/Makefile
similarity index 100%
rename from crypto/openssl/crypto/ec/Makefile
rename to crypto/ec/Makefile
diff --git a/crypto/openssl/crypto/ec/ec.h b/crypto/ec/ec.h
similarity index 100%
rename from crypto/openssl/crypto/ec/ec.h
rename to crypto/ec/ec.h
diff --git a/crypto/openssl/crypto/ec/ec2_mult.c b/crypto/ec/ec2_mult.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec2_mult.c
rename to crypto/ec/ec2_mult.c
diff --git a/crypto/openssl/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec2_smpl.c
rename to crypto/ec/ec2_smpl.c
diff --git a/crypto/openssl/crypto/ec/ec2_smpt.c b/crypto/ec/ec2_smpt.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec2_smpt.c
rename to crypto/ec/ec2_smpt.c
diff --git a/crypto/openssl/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_asn1.c
rename to crypto/ec/ec_asn1.c
diff --git a/crypto/openssl/crypto/ec/ec_check.c b/crypto/ec/ec_check.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_check.c
rename to crypto/ec/ec_check.c
diff --git a/crypto/openssl/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_curve.c
rename to crypto/ec/ec_curve.c
diff --git a/crypto/openssl/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_cvt.c
rename to crypto/ec/ec_cvt.c
diff --git a/crypto/openssl/crypto/ec/ec_err.c b/crypto/ec/ec_err.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_err.c
rename to crypto/ec/ec_err.c
diff --git a/crypto/openssl/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_key.c
rename to crypto/ec/ec_key.c
diff --git a/crypto/openssl/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_lcl.h
rename to crypto/ec/ec_lcl.h
diff --git a/crypto/openssl/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_lib.c
rename to crypto/ec/ec_lib.c
diff --git a/crypto/openssl/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_mult.c
rename to crypto/ec/ec_mult.c
diff --git a/crypto/openssl/crypto/ec/ec_print.c b/crypto/ec/ec_print.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ec_print.c
rename to crypto/ec/ec_print.c
diff --git a/crypto/openssl/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ecp_mont.c
rename to crypto/ec/ecp_mont.c
diff --git a/crypto/openssl/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ecp_nist.c
rename to crypto/ec/ecp_nist.c
diff --git a/crypto/openssl/crypto/ec/ecp_recp.c b/crypto/ec/ecp_recp.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ecp_recp.c
rename to crypto/ec/ecp_recp.c
diff --git a/crypto/openssl/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ecp_smpl.c
rename to crypto/ec/ecp_smpl.c
diff --git a/crypto/openssl/crypto/ec/ectest.c b/crypto/ec/ectest.c
similarity index 100%
rename from crypto/openssl/crypto/ec/ectest.c
rename to crypto/ec/ectest.c
diff --git a/crypto/openssl/crypto/ecdh/Makefile b/crypto/ecdh/Makefile
similarity index 100%
rename from crypto/openssl/crypto/ecdh/Makefile
rename to crypto/ecdh/Makefile
diff --git a/crypto/openssl/crypto/ecdh/ecdh.h b/crypto/ecdh/ecdh.h
similarity index 100%
rename from crypto/openssl/crypto/ecdh/ecdh.h
rename to crypto/ecdh/ecdh.h
diff --git a/crypto/openssl/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c
similarity index 100%
rename from crypto/openssl/crypto/ecdh/ecdhtest.c
rename to crypto/ecdh/ecdhtest.c
diff --git a/crypto/openssl/crypto/ecdh/ech_err.c b/crypto/ecdh/ech_err.c
similarity index 100%
rename from crypto/openssl/crypto/ecdh/ech_err.c
rename to crypto/ecdh/ech_err.c
diff --git a/crypto/openssl/crypto/ecdh/ech_key.c b/crypto/ecdh/ech_key.c
similarity index 100%
rename from crypto/openssl/crypto/ecdh/ech_key.c
rename to crypto/ecdh/ech_key.c
diff --git a/crypto/openssl/crypto/ecdh/ech_lib.c b/crypto/ecdh/ech_lib.c
similarity index 100%
rename from crypto/openssl/crypto/ecdh/ech_lib.c
rename to crypto/ecdh/ech_lib.c
diff --git a/crypto/openssl/crypto/ecdh/ech_locl.h b/crypto/ecdh/ech_locl.h
similarity index 100%
rename from crypto/openssl/crypto/ecdh/ech_locl.h
rename to crypto/ecdh/ech_locl.h
diff --git a/crypto/openssl/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
similarity index 100%
rename from crypto/openssl/crypto/ecdh/ech_ossl.c
rename to crypto/ecdh/ech_ossl.c
diff --git a/crypto/openssl/crypto/ecdsa/Makefile b/crypto/ecdsa/Makefile
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/Makefile
rename to crypto/ecdsa/Makefile
diff --git a/crypto/openssl/crypto/ecdsa/ecdsa.h b/crypto/ecdsa/ecdsa.h
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/ecdsa.h
rename to crypto/ecdsa/ecdsa.h
diff --git a/crypto/openssl/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/ecdsatest.c
rename to crypto/ecdsa/ecdsatest.c
diff --git a/crypto/openssl/crypto/ecdsa/ecs_asn1.c b/crypto/ecdsa/ecs_asn1.c
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/ecs_asn1.c
rename to crypto/ecdsa/ecs_asn1.c
diff --git a/crypto/openssl/crypto/ecdsa/ecs_err.c b/crypto/ecdsa/ecs_err.c
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/ecs_err.c
rename to crypto/ecdsa/ecs_err.c
diff --git a/crypto/openssl/crypto/ecdsa/ecs_lib.c b/crypto/ecdsa/ecs_lib.c
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/ecs_lib.c
rename to crypto/ecdsa/ecs_lib.c
diff --git a/crypto/openssl/crypto/ecdsa/ecs_locl.h b/crypto/ecdsa/ecs_locl.h
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/ecs_locl.h
rename to crypto/ecdsa/ecs_locl.h
diff --git a/crypto/openssl/crypto/ecdsa/ecs_ossl.c b/crypto/ecdsa/ecs_ossl.c
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/ecs_ossl.c
rename to crypto/ecdsa/ecs_ossl.c
diff --git a/crypto/openssl/crypto/ecdsa/ecs_sign.c b/crypto/ecdsa/ecs_sign.c
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/ecs_sign.c
rename to crypto/ecdsa/ecs_sign.c
diff --git a/crypto/openssl/crypto/ecdsa/ecs_vrf.c b/crypto/ecdsa/ecs_vrf.c
similarity index 100%
rename from crypto/openssl/crypto/ecdsa/ecs_vrf.c
rename to crypto/ecdsa/ecs_vrf.c
diff --git a/crypto/openssl/crypto/engine/Makefile b/crypto/engine/Makefile
similarity index 100%
rename from crypto/openssl/crypto/engine/Makefile
rename to crypto/engine/Makefile
diff --git a/crypto/openssl/crypto/engine/README b/crypto/engine/README
similarity index 100%
rename from crypto/openssl/crypto/engine/README
rename to crypto/engine/README
diff --git a/crypto/openssl/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_all.c
rename to crypto/engine/eng_all.c
diff --git a/crypto/openssl/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_cnf.c
rename to crypto/engine/eng_cnf.c
diff --git a/crypto/openssl/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_cryptodev.c
rename to crypto/engine/eng_cryptodev.c
diff --git a/crypto/openssl/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_ctrl.c
rename to crypto/engine/eng_ctrl.c
diff --git a/crypto/openssl/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_dyn.c
rename to crypto/engine/eng_dyn.c
diff --git a/crypto/openssl/crypto/engine/eng_err.c b/crypto/engine/eng_err.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_err.c
rename to crypto/engine/eng_err.c
diff --git a/crypto/openssl/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_fat.c
rename to crypto/engine/eng_fat.c
diff --git a/crypto/openssl/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_init.c
rename to crypto/engine/eng_init.c
diff --git a/crypto/openssl/crypto/engine/eng_int.h b/crypto/engine/eng_int.h
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_int.h
rename to crypto/engine/eng_int.h
diff --git a/crypto/openssl/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_lib.c
rename to crypto/engine/eng_lib.c
diff --git a/crypto/openssl/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_list.c
rename to crypto/engine/eng_list.c
diff --git a/crypto/openssl/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_openssl.c
rename to crypto/engine/eng_openssl.c
diff --git a/crypto/openssl/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_padlock.c
rename to crypto/engine/eng_padlock.c
diff --git a/crypto/openssl/crypto/engine/eng_pkey.c b/crypto/engine/eng_pkey.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_pkey.c
rename to crypto/engine/eng_pkey.c
diff --git a/crypto/openssl/crypto/engine/eng_table.c b/crypto/engine/eng_table.c
similarity index 100%
rename from crypto/openssl/crypto/engine/eng_table.c
rename to crypto/engine/eng_table.c
diff --git a/crypto/openssl/crypto/engine/engine.h b/crypto/engine/engine.h
similarity index 100%
rename from crypto/openssl/crypto/engine/engine.h
rename to crypto/engine/engine.h
diff --git a/crypto/openssl/crypto/engine/enginetest.c b/crypto/engine/enginetest.c
similarity index 100%
rename from crypto/openssl/crypto/engine/enginetest.c
rename to crypto/engine/enginetest.c
diff --git a/crypto/openssl/crypto/engine/hw.ec b/crypto/engine/hw.ec
similarity index 100%
rename from crypto/openssl/crypto/engine/hw.ec
rename to crypto/engine/hw.ec
diff --git a/crypto/openssl/crypto/engine/hw_4758_cca.c b/crypto/engine/hw_4758_cca.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_4758_cca.c
rename to crypto/engine/hw_4758_cca.c
diff --git a/crypto/openssl/crypto/engine/hw_4758_cca_err.c b/crypto/engine/hw_4758_cca_err.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_4758_cca_err.c
rename to crypto/engine/hw_4758_cca_err.c
diff --git a/crypto/openssl/crypto/engine/hw_4758_cca_err.h b/crypto/engine/hw_4758_cca_err.h
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_4758_cca_err.h
rename to crypto/engine/hw_4758_cca_err.h
diff --git a/crypto/openssl/crypto/engine/hw_aep.c b/crypto/engine/hw_aep.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_aep.c
rename to crypto/engine/hw_aep.c
diff --git a/crypto/openssl/crypto/engine/hw_aep_err.c b/crypto/engine/hw_aep_err.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_aep_err.c
rename to crypto/engine/hw_aep_err.c
diff --git a/crypto/openssl/crypto/engine/hw_aep_err.h b/crypto/engine/hw_aep_err.h
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_aep_err.h
rename to crypto/engine/hw_aep_err.h
diff --git a/crypto/openssl/crypto/engine/hw_atalla.c b/crypto/engine/hw_atalla.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_atalla.c
rename to crypto/engine/hw_atalla.c
diff --git a/crypto/openssl/crypto/engine/hw_atalla_err.c b/crypto/engine/hw_atalla_err.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_atalla_err.c
rename to crypto/engine/hw_atalla_err.c
diff --git a/crypto/openssl/crypto/engine/hw_atalla_err.h b/crypto/engine/hw_atalla_err.h
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_atalla_err.h
rename to crypto/engine/hw_atalla_err.h
diff --git a/crypto/openssl/crypto/engine/hw_cryptodev.c b/crypto/engine/hw_cryptodev.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_cryptodev.c
rename to crypto/engine/hw_cryptodev.c
diff --git a/crypto/openssl/crypto/engine/hw_cswift.c b/crypto/engine/hw_cswift.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_cswift.c
rename to crypto/engine/hw_cswift.c
diff --git a/crypto/openssl/crypto/engine/hw_cswift_err.c b/crypto/engine/hw_cswift_err.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_cswift_err.c
rename to crypto/engine/hw_cswift_err.c
diff --git a/crypto/openssl/crypto/engine/hw_cswift_err.h b/crypto/engine/hw_cswift_err.h
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_cswift_err.h
rename to crypto/engine/hw_cswift_err.h
diff --git a/crypto/openssl/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_ncipher.c
rename to crypto/engine/hw_ncipher.c
diff --git a/crypto/openssl/crypto/engine/hw_ncipher_err.c b/crypto/engine/hw_ncipher_err.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_ncipher_err.c
rename to crypto/engine/hw_ncipher_err.c
diff --git a/crypto/openssl/crypto/engine/hw_ncipher_err.h b/crypto/engine/hw_ncipher_err.h
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_ncipher_err.h
rename to crypto/engine/hw_ncipher_err.h
diff --git a/crypto/openssl/crypto/engine/hw_nuron.c b/crypto/engine/hw_nuron.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_nuron.c
rename to crypto/engine/hw_nuron.c
diff --git a/crypto/openssl/crypto/engine/hw_nuron_err.c b/crypto/engine/hw_nuron_err.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_nuron_err.c
rename to crypto/engine/hw_nuron_err.c
diff --git a/crypto/openssl/crypto/engine/hw_nuron_err.h b/crypto/engine/hw_nuron_err.h
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_nuron_err.h
rename to crypto/engine/hw_nuron_err.h
diff --git a/crypto/openssl/crypto/engine/hw_sureware.c b/crypto/engine/hw_sureware.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_sureware.c
rename to crypto/engine/hw_sureware.c
diff --git a/crypto/openssl/crypto/engine/hw_sureware_err.c b/crypto/engine/hw_sureware_err.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_sureware_err.c
rename to crypto/engine/hw_sureware_err.c
diff --git a/crypto/openssl/crypto/engine/hw_sureware_err.h b/crypto/engine/hw_sureware_err.h
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_sureware_err.h
rename to crypto/engine/hw_sureware_err.h
diff --git a/crypto/openssl/crypto/engine/hw_ubsec.c b/crypto/engine/hw_ubsec.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_ubsec.c
rename to crypto/engine/hw_ubsec.c
diff --git a/crypto/openssl/crypto/engine/hw_ubsec_err.c b/crypto/engine/hw_ubsec_err.c
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_ubsec_err.c
rename to crypto/engine/hw_ubsec_err.c
diff --git a/crypto/openssl/crypto/engine/hw_ubsec_err.h b/crypto/engine/hw_ubsec_err.h
similarity index 100%
rename from crypto/openssl/crypto/engine/hw_ubsec_err.h
rename to crypto/engine/hw_ubsec_err.h
diff --git a/crypto/openssl/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c
similarity index 100%
rename from crypto/openssl/crypto/engine/tb_cipher.c
rename to crypto/engine/tb_cipher.c
diff --git a/crypto/openssl/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c
similarity index 100%
rename from crypto/openssl/crypto/engine/tb_dh.c
rename to crypto/engine/tb_dh.c
diff --git a/crypto/openssl/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c
similarity index 100%
rename from crypto/openssl/crypto/engine/tb_digest.c
rename to crypto/engine/tb_digest.c
diff --git a/crypto/openssl/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c
similarity index 100%
rename from crypto/openssl/crypto/engine/tb_dsa.c
rename to crypto/engine/tb_dsa.c
diff --git a/crypto/openssl/crypto/engine/tb_ecdh.c b/crypto/engine/tb_ecdh.c
similarity index 100%
rename from crypto/openssl/crypto/engine/tb_ecdh.c
rename to crypto/engine/tb_ecdh.c
diff --git a/crypto/openssl/crypto/engine/tb_ecdsa.c b/crypto/engine/tb_ecdsa.c
similarity index 100%
rename from crypto/openssl/crypto/engine/tb_ecdsa.c
rename to crypto/engine/tb_ecdsa.c
diff --git a/crypto/openssl/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c
similarity index 100%
rename from crypto/openssl/crypto/engine/tb_rand.c
rename to crypto/engine/tb_rand.c
diff --git a/crypto/openssl/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c
similarity index 100%
rename from crypto/openssl/crypto/engine/tb_rsa.c
rename to crypto/engine/tb_rsa.c
diff --git a/crypto/openssl/crypto/engine/tb_store.c b/crypto/engine/tb_store.c
similarity index 100%
rename from crypto/openssl/crypto/engine/tb_store.c
rename to crypto/engine/tb_store.c
diff --git a/crypto/openssl/crypto/engine/vendor_defns/aep.h b/crypto/engine/vendor_defns/aep.h
similarity index 100%
rename from crypto/openssl/crypto/engine/vendor_defns/aep.h
rename to crypto/engine/vendor_defns/aep.h
diff --git a/crypto/openssl/crypto/engine/vendor_defns/atalla.h b/crypto/engine/vendor_defns/atalla.h
similarity index 100%
rename from crypto/openssl/crypto/engine/vendor_defns/atalla.h
rename to crypto/engine/vendor_defns/atalla.h
diff --git a/crypto/openssl/crypto/engine/vendor_defns/cswift.h b/crypto/engine/vendor_defns/cswift.h
similarity index 100%
rename from crypto/openssl/crypto/engine/vendor_defns/cswift.h
rename to crypto/engine/vendor_defns/cswift.h
diff --git a/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h b/crypto/engine/vendor_defns/hw_4758_cca.h
similarity index 100%
rename from crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h
rename to crypto/engine/vendor_defns/hw_4758_cca.h
diff --git a/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h b/crypto/engine/vendor_defns/hw_ubsec.h
similarity index 100%
rename from crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h
rename to crypto/engine/vendor_defns/hw_ubsec.h
diff --git a/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h b/crypto/engine/vendor_defns/hwcryptohook.h
similarity index 100%
rename from crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h
rename to crypto/engine/vendor_defns/hwcryptohook.h
diff --git a/crypto/openssl/crypto/engine/vendor_defns/sureware.h b/crypto/engine/vendor_defns/sureware.h
similarity index 100%
rename from crypto/openssl/crypto/engine/vendor_defns/sureware.h
rename to crypto/engine/vendor_defns/sureware.h
diff --git a/crypto/openssl/crypto/err/Makefile b/crypto/err/Makefile
similarity index 100%
rename from crypto/openssl/crypto/err/Makefile
rename to crypto/err/Makefile
diff --git a/crypto/openssl/crypto/err/err.c b/crypto/err/err.c
similarity index 100%
rename from crypto/openssl/crypto/err/err.c
rename to crypto/err/err.c
diff --git a/crypto/openssl/crypto/err/err.h b/crypto/err/err.h
similarity index 100%
rename from crypto/openssl/crypto/err/err.h
rename to crypto/err/err.h
diff --git a/crypto/openssl/crypto/err/err_all.c b/crypto/err/err_all.c
similarity index 100%
rename from crypto/openssl/crypto/err/err_all.c
rename to crypto/err/err_all.c
diff --git a/crypto/openssl/crypto/err/err_prn.c b/crypto/err/err_prn.c
similarity index 100%
rename from crypto/openssl/crypto/err/err_prn.c
rename to crypto/err/err_prn.c
diff --git a/crypto/openssl/crypto/err/openssl.ec b/crypto/err/openssl.ec
similarity index 100%
rename from crypto/openssl/crypto/err/openssl.ec
rename to crypto/err/openssl.ec
diff --git a/crypto/openssl/crypto/evp/Makefile b/crypto/evp/Makefile
similarity index 100%
rename from crypto/openssl/crypto/evp/Makefile
rename to crypto/evp/Makefile
diff --git a/crypto/openssl/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c
similarity index 100%
rename from crypto/openssl/crypto/evp/bio_b64.c
rename to crypto/evp/bio_b64.c
diff --git a/crypto/openssl/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
similarity index 100%
rename from crypto/openssl/crypto/evp/bio_enc.c
rename to crypto/evp/bio_enc.c
diff --git a/crypto/openssl/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
similarity index 100%
rename from crypto/openssl/crypto/evp/bio_md.c
rename to crypto/evp/bio_md.c
diff --git a/crypto/openssl/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
similarity index 100%
rename from crypto/openssl/crypto/evp/bio_ok.c
rename to crypto/evp/bio_ok.c
diff --git a/crypto/openssl/crypto/evp/c_all.c b/crypto/evp/c_all.c
similarity index 100%
rename from crypto/openssl/crypto/evp/c_all.c
rename to crypto/evp/c_all.c
diff --git a/crypto/openssl/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
similarity index 100%
rename from crypto/openssl/crypto/evp/c_allc.c
rename to crypto/evp/c_allc.c
diff --git a/crypto/openssl/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
similarity index 100%
rename from crypto/openssl/crypto/evp/c_alld.c
rename to crypto/evp/c_alld.c
diff --git a/crypto/openssl/crypto/evp/digest.c b/crypto/evp/digest.c
similarity index 100%
rename from crypto/openssl/crypto/evp/digest.c
rename to crypto/evp/digest.c
diff --git a/crypto/openssl/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_aes.c
rename to crypto/evp/e_aes.c
diff --git a/crypto/openssl/crypto/evp/e_bf.c b/crypto/evp/e_bf.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_bf.c
rename to crypto/evp/e_bf.c
diff --git a/crypto/openssl/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_camellia.c
rename to crypto/evp/e_camellia.c
diff --git a/crypto/openssl/crypto/evp/e_cast.c b/crypto/evp/e_cast.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_cast.c
rename to crypto/evp/e_cast.c
diff --git a/crypto/openssl/crypto/evp/e_des.c b/crypto/evp/e_des.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_des.c
rename to crypto/evp/e_des.c
diff --git a/crypto/openssl/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_des3.c
rename to crypto/evp/e_des3.c
diff --git a/crypto/openssl/crypto/evp/e_dsa.c b/crypto/evp/e_dsa.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_dsa.c
rename to crypto/evp/e_dsa.c
diff --git a/crypto/openssl/crypto/evp/e_idea.c b/crypto/evp/e_idea.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_idea.c
rename to crypto/evp/e_idea.c
diff --git a/crypto/openssl/crypto/evp/e_null.c b/crypto/evp/e_null.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_null.c
rename to crypto/evp/e_null.c
diff --git a/crypto/openssl/crypto/evp/e_old.c b/crypto/evp/e_old.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_old.c
rename to crypto/evp/e_old.c
diff --git a/crypto/openssl/crypto/evp/e_rc2.c b/crypto/evp/e_rc2.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_rc2.c
rename to crypto/evp/e_rc2.c
diff --git a/crypto/openssl/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_rc4.c
rename to crypto/evp/e_rc4.c
diff --git a/crypto/openssl/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_rc5.c
rename to crypto/evp/e_rc5.c
diff --git a/crypto/openssl/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c
similarity index 100%
rename from crypto/openssl/crypto/evp/e_xcbc_d.c
rename to crypto/evp/e_xcbc_d.c
diff --git a/crypto/openssl/crypto/evp/encode.c b/crypto/evp/encode.c
similarity index 100%
rename from crypto/openssl/crypto/evp/encode.c
rename to crypto/evp/encode.c
diff --git a/crypto/openssl/crypto/evp/evp.h b/crypto/evp/evp.h
similarity index 100%
rename from crypto/openssl/crypto/evp/evp.h
rename to crypto/evp/evp.h
diff --git a/crypto/openssl/crypto/evp/evp_acnf.c b/crypto/evp/evp_acnf.c
similarity index 100%
rename from crypto/openssl/crypto/evp/evp_acnf.c
rename to crypto/evp/evp_acnf.c
diff --git a/crypto/openssl/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
similarity index 100%
rename from crypto/openssl/crypto/evp/evp_enc.c
rename to crypto/evp/evp_enc.c
diff --git a/crypto/openssl/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
similarity index 100%
rename from crypto/openssl/crypto/evp/evp_err.c
rename to crypto/evp/evp_err.c
diff --git a/crypto/openssl/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
similarity index 100%
rename from crypto/openssl/crypto/evp/evp_key.c
rename to crypto/evp/evp_key.c
diff --git a/crypto/openssl/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
similarity index 100%
rename from crypto/openssl/crypto/evp/evp_lib.c
rename to crypto/evp/evp_lib.c
diff --git a/crypto/openssl/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h
similarity index 100%
rename from crypto/openssl/crypto/evp/evp_locl.h
rename to crypto/evp/evp_locl.h
diff --git a/crypto/openssl/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
similarity index 100%
rename from crypto/openssl/crypto/evp/evp_pbe.c
rename to crypto/evp/evp_pbe.c
diff --git a/crypto/openssl/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
similarity index 100%
rename from crypto/openssl/crypto/evp/evp_pkey.c
rename to crypto/evp/evp_pkey.c
diff --git a/crypto/openssl/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
similarity index 100%
rename from crypto/openssl/crypto/evp/evp_test.c
rename to crypto/evp/evp_test.c
diff --git a/crypto/openssl/crypto/evp/evptests.txt b/crypto/evp/evptests.txt
similarity index 100%
rename from crypto/openssl/crypto/evp/evptests.txt
rename to crypto/evp/evptests.txt
diff --git a/crypto/openssl/crypto/evp/m_dss.c b/crypto/evp/m_dss.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_dss.c
rename to crypto/evp/m_dss.c
diff --git a/crypto/openssl/crypto/evp/m_dss1.c b/crypto/evp/m_dss1.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_dss1.c
rename to crypto/evp/m_dss1.c
diff --git a/crypto/openssl/crypto/evp/m_ecdsa.c b/crypto/evp/m_ecdsa.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_ecdsa.c
rename to crypto/evp/m_ecdsa.c
diff --git a/crypto/openssl/crypto/evp/m_md2.c b/crypto/evp/m_md2.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_md2.c
rename to crypto/evp/m_md2.c
diff --git a/crypto/openssl/crypto/evp/m_md4.c b/crypto/evp/m_md4.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_md4.c
rename to crypto/evp/m_md4.c
diff --git a/crypto/openssl/crypto/evp/m_md5.c b/crypto/evp/m_md5.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_md5.c
rename to crypto/evp/m_md5.c
diff --git a/crypto/openssl/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_mdc2.c
rename to crypto/evp/m_mdc2.c
diff --git a/crypto/openssl/crypto/evp/m_null.c b/crypto/evp/m_null.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_null.c
rename to crypto/evp/m_null.c
diff --git a/crypto/openssl/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_ripemd.c
rename to crypto/evp/m_ripemd.c
diff --git a/crypto/openssl/crypto/evp/m_sha.c b/crypto/evp/m_sha.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_sha.c
rename to crypto/evp/m_sha.c
diff --git a/crypto/openssl/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c
similarity index 100%
rename from crypto/openssl/crypto/evp/m_sha1.c
rename to crypto/evp/m_sha1.c
diff --git a/crypto/openssl/crypto/evp/names.c b/crypto/evp/names.c
similarity index 100%
rename from crypto/openssl/crypto/evp/names.c
rename to crypto/evp/names.c
diff --git a/crypto/openssl/crypto/evp/openbsd_hw.c b/crypto/evp/openbsd_hw.c
similarity index 100%
rename from crypto/openssl/crypto/evp/openbsd_hw.c
rename to crypto/evp/openbsd_hw.c
diff --git a/crypto/openssl/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c
similarity index 100%
rename from crypto/openssl/crypto/evp/p5_crpt.c
rename to crypto/evp/p5_crpt.c
diff --git a/crypto/openssl/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
similarity index 100%
rename from crypto/openssl/crypto/evp/p5_crpt2.c
rename to crypto/evp/p5_crpt2.c
diff --git a/crypto/openssl/crypto/evp/p_dec.c b/crypto/evp/p_dec.c
similarity index 100%
rename from crypto/openssl/crypto/evp/p_dec.c
rename to crypto/evp/p_dec.c
diff --git a/crypto/openssl/crypto/evp/p_enc.c b/crypto/evp/p_enc.c
similarity index 100%
rename from crypto/openssl/crypto/evp/p_enc.c
rename to crypto/evp/p_enc.c
diff --git a/crypto/openssl/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
similarity index 100%
rename from crypto/openssl/crypto/evp/p_lib.c
rename to crypto/evp/p_lib.c
diff --git a/crypto/openssl/crypto/evp/p_open.c b/crypto/evp/p_open.c
similarity index 100%
rename from crypto/openssl/crypto/evp/p_open.c
rename to crypto/evp/p_open.c
diff --git a/crypto/openssl/crypto/evp/p_seal.c b/crypto/evp/p_seal.c
similarity index 100%
rename from crypto/openssl/crypto/evp/p_seal.c
rename to crypto/evp/p_seal.c
diff --git a/crypto/openssl/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
similarity index 100%
rename from crypto/openssl/crypto/evp/p_sign.c
rename to crypto/evp/p_sign.c
diff --git a/crypto/openssl/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
similarity index 100%
rename from crypto/openssl/crypto/evp/p_verify.c
rename to crypto/evp/p_verify.c
diff --git a/crypto/openssl/crypto/ex_data.c b/crypto/ex_data.c
similarity index 100%
rename from crypto/openssl/crypto/ex_data.c
rename to crypto/ex_data.c
diff --git a/crypto/openssl/crypto/hmac/Makefile b/crypto/hmac/Makefile
similarity index 100%
rename from crypto/openssl/crypto/hmac/Makefile
rename to crypto/hmac/Makefile
diff --git a/crypto/openssl/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
similarity index 100%
rename from crypto/openssl/crypto/hmac/hmac.c
rename to crypto/hmac/hmac.c
diff --git a/crypto/openssl/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
similarity index 100%
rename from crypto/openssl/crypto/hmac/hmac.h
rename to crypto/hmac/hmac.h
diff --git a/crypto/openssl/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c
similarity index 100%
rename from crypto/openssl/crypto/hmac/hmactest.c
rename to crypto/hmac/hmactest.c
diff --git a/crypto/openssl/crypto/ia64cpuid.S b/crypto/ia64cpuid.S
similarity index 100%
rename from crypto/openssl/crypto/ia64cpuid.S
rename to crypto/ia64cpuid.S
diff --git a/crypto/openssl/crypto/idea/Makefile b/crypto/idea/Makefile
similarity index 100%
rename from crypto/openssl/crypto/idea/Makefile
rename to crypto/idea/Makefile
diff --git a/crypto/openssl/crypto/idea/i_cbc.c b/crypto/idea/i_cbc.c
similarity index 100%
rename from crypto/openssl/crypto/idea/i_cbc.c
rename to crypto/idea/i_cbc.c
diff --git a/crypto/openssl/crypto/idea/i_cfb64.c b/crypto/idea/i_cfb64.c
similarity index 100%
rename from crypto/openssl/crypto/idea/i_cfb64.c
rename to crypto/idea/i_cfb64.c
diff --git a/crypto/openssl/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c
similarity index 100%
rename from crypto/openssl/crypto/idea/i_ecb.c
rename to crypto/idea/i_ecb.c
diff --git a/crypto/openssl/crypto/idea/i_ofb64.c b/crypto/idea/i_ofb64.c
similarity index 100%
rename from crypto/openssl/crypto/idea/i_ofb64.c
rename to crypto/idea/i_ofb64.c
diff --git a/crypto/openssl/crypto/idea/i_skey.c b/crypto/idea/i_skey.c
similarity index 100%
rename from crypto/openssl/crypto/idea/i_skey.c
rename to crypto/idea/i_skey.c
diff --git a/crypto/openssl/crypto/idea/idea.h b/crypto/idea/idea.h
similarity index 100%
rename from crypto/openssl/crypto/idea/idea.h
rename to crypto/idea/idea.h
diff --git a/crypto/openssl/crypto/idea/idea_lcl.h b/crypto/idea/idea_lcl.h
similarity index 100%
rename from crypto/openssl/crypto/idea/idea_lcl.h
rename to crypto/idea/idea_lcl.h
diff --git a/crypto/openssl/crypto/idea/idea_spd.c b/crypto/idea/idea_spd.c
similarity index 100%
rename from crypto/openssl/crypto/idea/idea_spd.c
rename to crypto/idea/idea_spd.c
diff --git a/crypto/openssl/crypto/idea/ideatest.c b/crypto/idea/ideatest.c
similarity index 100%
rename from crypto/openssl/crypto/idea/ideatest.c
rename to crypto/idea/ideatest.c
diff --git a/crypto/openssl/crypto/idea/version b/crypto/idea/version
similarity index 100%
rename from crypto/openssl/crypto/idea/version
rename to crypto/idea/version
diff --git a/crypto/openssl/crypto/krb5/Makefile b/crypto/krb5/Makefile
similarity index 100%
rename from crypto/openssl/crypto/krb5/Makefile
rename to crypto/krb5/Makefile
diff --git a/crypto/openssl/crypto/krb5/krb5_asn.c b/crypto/krb5/krb5_asn.c
similarity index 100%
rename from crypto/openssl/crypto/krb5/krb5_asn.c
rename to crypto/krb5/krb5_asn.c
diff --git a/crypto/openssl/crypto/krb5/krb5_asn.h b/crypto/krb5/krb5_asn.h
similarity index 100%
rename from crypto/openssl/crypto/krb5/krb5_asn.h
rename to crypto/krb5/krb5_asn.h
diff --git a/crypto/openssl/crypto/lhash/Makefile b/crypto/lhash/Makefile
similarity index 100%
rename from crypto/openssl/crypto/lhash/Makefile
rename to crypto/lhash/Makefile
diff --git a/crypto/openssl/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c
similarity index 100%
rename from crypto/openssl/crypto/lhash/lh_stats.c
rename to crypto/lhash/lh_stats.c
diff --git a/crypto/openssl/crypto/lhash/lh_test.c b/crypto/lhash/lh_test.c
similarity index 100%
rename from crypto/openssl/crypto/lhash/lh_test.c
rename to crypto/lhash/lh_test.c
diff --git a/crypto/openssl/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
similarity index 100%
rename from crypto/openssl/crypto/lhash/lhash.c
rename to crypto/lhash/lhash.c
diff --git a/crypto/openssl/crypto/lhash/lhash.h b/crypto/lhash/lhash.h
similarity index 100%
rename from crypto/openssl/crypto/lhash/lhash.h
rename to crypto/lhash/lhash.h
diff --git a/crypto/openssl/crypto/lhash/num.pl b/crypto/lhash/num.pl
similarity index 100%
rename from crypto/openssl/crypto/lhash/num.pl
rename to crypto/lhash/num.pl
diff --git a/crypto/openssl/crypto/md2/Makefile b/crypto/md2/Makefile
similarity index 100%
rename from crypto/openssl/crypto/md2/Makefile
rename to crypto/md2/Makefile
diff --git a/crypto/openssl/crypto/md2/md2.c b/crypto/md2/md2.c
similarity index 100%
rename from crypto/openssl/crypto/md2/md2.c
rename to crypto/md2/md2.c
diff --git a/crypto/openssl/crypto/md2/md2.h b/crypto/md2/md2.h
similarity index 100%
rename from crypto/openssl/crypto/md2/md2.h
rename to crypto/md2/md2.h
diff --git a/crypto/openssl/crypto/md2/md2_dgst.c b/crypto/md2/md2_dgst.c
similarity index 100%
rename from crypto/openssl/crypto/md2/md2_dgst.c
rename to crypto/md2/md2_dgst.c
diff --git a/crypto/openssl/crypto/md2/md2_one.c b/crypto/md2/md2_one.c
similarity index 100%
rename from crypto/openssl/crypto/md2/md2_one.c
rename to crypto/md2/md2_one.c
diff --git a/crypto/openssl/crypto/md2/md2test.c b/crypto/md2/md2test.c
similarity index 100%
rename from crypto/openssl/crypto/md2/md2test.c
rename to crypto/md2/md2test.c
diff --git a/crypto/openssl/crypto/md32_common.h b/crypto/md32_common.h
similarity index 100%
rename from crypto/openssl/crypto/md32_common.h
rename to crypto/md32_common.h
diff --git a/crypto/openssl/crypto/md4/Makefile b/crypto/md4/Makefile
similarity index 100%
rename from crypto/openssl/crypto/md4/Makefile
rename to crypto/md4/Makefile
diff --git a/crypto/openssl/crypto/md4/md4.c b/crypto/md4/md4.c
similarity index 100%
rename from crypto/openssl/crypto/md4/md4.c
rename to crypto/md4/md4.c
diff --git a/crypto/openssl/crypto/md4/md4.h b/crypto/md4/md4.h
similarity index 100%
rename from crypto/openssl/crypto/md4/md4.h
rename to crypto/md4/md4.h
diff --git a/crypto/openssl/crypto/md4/md4_dgst.c b/crypto/md4/md4_dgst.c
similarity index 100%
rename from crypto/openssl/crypto/md4/md4_dgst.c
rename to crypto/md4/md4_dgst.c
diff --git a/crypto/openssl/crypto/md4/md4_locl.h b/crypto/md4/md4_locl.h
similarity index 100%
rename from crypto/openssl/crypto/md4/md4_locl.h
rename to crypto/md4/md4_locl.h
diff --git a/crypto/openssl/crypto/md4/md4_one.c b/crypto/md4/md4_one.c
similarity index 100%
rename from crypto/openssl/crypto/md4/md4_one.c
rename to crypto/md4/md4_one.c
diff --git a/crypto/openssl/crypto/md4/md4s.cpp b/crypto/md4/md4s.cpp
similarity index 100%
rename from crypto/openssl/crypto/md4/md4s.cpp
rename to crypto/md4/md4s.cpp
diff --git a/crypto/openssl/crypto/md4/md4test.c b/crypto/md4/md4test.c
similarity index 100%
rename from crypto/openssl/crypto/md4/md4test.c
rename to crypto/md4/md4test.c
diff --git a/crypto/openssl/crypto/md5/Makefile b/crypto/md5/Makefile
similarity index 100%
rename from crypto/openssl/crypto/md5/Makefile
rename to crypto/md5/Makefile
diff --git a/crypto/openssl/crypto/md5/asm/md5-586.pl b/crypto/md5/asm/md5-586.pl
similarity index 100%
rename from crypto/openssl/crypto/md5/asm/md5-586.pl
rename to crypto/md5/asm/md5-586.pl
diff --git a/crypto/openssl/crypto/md5/asm/md5-sparcv9.S b/crypto/md5/asm/md5-sparcv9.S
similarity index 100%
rename from crypto/openssl/crypto/md5/asm/md5-sparcv9.S
rename to crypto/md5/asm/md5-sparcv9.S
diff --git a/crypto/openssl/crypto/md5/asm/md5-x86_64.pl b/crypto/md5/asm/md5-x86_64.pl
similarity index 100%
rename from crypto/openssl/crypto/md5/asm/md5-x86_64.pl
rename to crypto/md5/asm/md5-x86_64.pl
diff --git a/crypto/openssl/crypto/md5/md5.c b/crypto/md5/md5.c
similarity index 100%
rename from crypto/openssl/crypto/md5/md5.c
rename to crypto/md5/md5.c
diff --git a/crypto/openssl/crypto/md5/md5.h b/crypto/md5/md5.h
similarity index 100%
rename from crypto/openssl/crypto/md5/md5.h
rename to crypto/md5/md5.h
diff --git a/crypto/openssl/crypto/md5/md5_dgst.c b/crypto/md5/md5_dgst.c
similarity index 100%
rename from crypto/openssl/crypto/md5/md5_dgst.c
rename to crypto/md5/md5_dgst.c
diff --git a/crypto/openssl/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h
similarity index 100%
rename from crypto/openssl/crypto/md5/md5_locl.h
rename to crypto/md5/md5_locl.h
diff --git a/crypto/openssl/crypto/md5/md5_one.c b/crypto/md5/md5_one.c
similarity index 100%
rename from crypto/openssl/crypto/md5/md5_one.c
rename to crypto/md5/md5_one.c
diff --git a/crypto/openssl/crypto/md5/md5s.cpp b/crypto/md5/md5s.cpp
similarity index 100%
rename from crypto/openssl/crypto/md5/md5s.cpp
rename to crypto/md5/md5s.cpp
diff --git a/crypto/openssl/crypto/md5/md5test.c b/crypto/md5/md5test.c
similarity index 100%
rename from crypto/openssl/crypto/md5/md5test.c
rename to crypto/md5/md5test.c
diff --git a/crypto/openssl/crypto/mdc2/Makefile b/crypto/mdc2/Makefile
similarity index 100%
rename from crypto/openssl/crypto/mdc2/Makefile
rename to crypto/mdc2/Makefile
diff --git a/crypto/openssl/crypto/mdc2/mdc2.h b/crypto/mdc2/mdc2.h
similarity index 100%
rename from crypto/openssl/crypto/mdc2/mdc2.h
rename to crypto/mdc2/mdc2.h
diff --git a/crypto/openssl/crypto/mdc2/mdc2_one.c b/crypto/mdc2/mdc2_one.c
similarity index 100%
rename from crypto/openssl/crypto/mdc2/mdc2_one.c
rename to crypto/mdc2/mdc2_one.c
diff --git a/crypto/openssl/crypto/mdc2/mdc2dgst.c b/crypto/mdc2/mdc2dgst.c
similarity index 100%
rename from crypto/openssl/crypto/mdc2/mdc2dgst.c
rename to crypto/mdc2/mdc2dgst.c
diff --git a/crypto/openssl/crypto/mdc2/mdc2test.c b/crypto/mdc2/mdc2test.c
similarity index 100%
rename from crypto/openssl/crypto/mdc2/mdc2test.c
rename to crypto/mdc2/mdc2test.c
diff --git a/crypto/openssl/crypto/mem.c b/crypto/mem.c
similarity index 100%
rename from crypto/openssl/crypto/mem.c
rename to crypto/mem.c
diff --git a/crypto/openssl/crypto/mem_clr.c b/crypto/mem_clr.c
similarity index 100%
rename from crypto/openssl/crypto/mem_clr.c
rename to crypto/mem_clr.c
diff --git a/crypto/openssl/crypto/mem_dbg.c b/crypto/mem_dbg.c
similarity index 100%
rename from crypto/openssl/crypto/mem_dbg.c
rename to crypto/mem_dbg.c
diff --git a/crypto/openssl/crypto/o_dir.c b/crypto/o_dir.c
similarity index 100%
rename from crypto/openssl/crypto/o_dir.c
rename to crypto/o_dir.c
diff --git a/crypto/openssl/crypto/o_dir.h b/crypto/o_dir.h
similarity index 100%
rename from crypto/openssl/crypto/o_dir.h
rename to crypto/o_dir.h
diff --git a/crypto/openssl/crypto/o_dir_test.c b/crypto/o_dir_test.c
similarity index 100%
rename from crypto/openssl/crypto/o_dir_test.c
rename to crypto/o_dir_test.c
diff --git a/crypto/openssl/crypto/o_str.c b/crypto/o_str.c
similarity index 100%
rename from crypto/openssl/crypto/o_str.c
rename to crypto/o_str.c
diff --git a/crypto/openssl/crypto/o_str.h b/crypto/o_str.h
similarity index 100%
rename from crypto/openssl/crypto/o_str.h
rename to crypto/o_str.h
diff --git a/crypto/openssl/crypto/o_time.c b/crypto/o_time.c
similarity index 100%
rename from crypto/openssl/crypto/o_time.c
rename to crypto/o_time.c
diff --git a/crypto/openssl/crypto/o_time.h b/crypto/o_time.h
similarity index 100%
rename from crypto/openssl/crypto/o_time.h
rename to crypto/o_time.h
diff --git a/crypto/openssl/crypto/objects/Makefile b/crypto/objects/Makefile
similarity index 100%
rename from crypto/openssl/crypto/objects/Makefile
rename to crypto/objects/Makefile
diff --git a/crypto/openssl/crypto/objects/o_names.c b/crypto/objects/o_names.c
similarity index 100%
rename from crypto/openssl/crypto/objects/o_names.c
rename to crypto/objects/o_names.c
diff --git a/crypto/openssl/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
similarity index 100%
rename from crypto/openssl/crypto/objects/obj_dat.c
rename to crypto/objects/obj_dat.c
diff --git a/crypto/openssl/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
similarity index 100%
rename from crypto/openssl/crypto/objects/obj_dat.h
rename to crypto/objects/obj_dat.h
diff --git a/crypto/openssl/crypto/objects/obj_dat.pl b/crypto/objects/obj_dat.pl
similarity index 100%
rename from crypto/openssl/crypto/objects/obj_dat.pl
rename to crypto/objects/obj_dat.pl
diff --git a/crypto/openssl/crypto/objects/obj_err.c b/crypto/objects/obj_err.c
similarity index 100%
rename from crypto/openssl/crypto/objects/obj_err.c
rename to crypto/objects/obj_err.c
diff --git a/crypto/openssl/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
similarity index 100%
rename from crypto/openssl/crypto/objects/obj_lib.c
rename to crypto/objects/obj_lib.c
diff --git a/crypto/openssl/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
similarity index 100%
rename from crypto/openssl/crypto/objects/obj_mac.h
rename to crypto/objects/obj_mac.h
diff --git a/crypto/openssl/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
similarity index 100%
rename from crypto/openssl/crypto/objects/obj_mac.num
rename to crypto/objects/obj_mac.num
diff --git a/crypto/openssl/crypto/objects/objects.README b/crypto/objects/objects.README
similarity index 100%
rename from crypto/openssl/crypto/objects/objects.README
rename to crypto/objects/objects.README
diff --git a/crypto/openssl/crypto/objects/objects.h b/crypto/objects/objects.h
similarity index 100%
rename from crypto/openssl/crypto/objects/objects.h
rename to crypto/objects/objects.h
diff --git a/crypto/openssl/crypto/objects/objects.pl b/crypto/objects/objects.pl
similarity index 100%
rename from crypto/openssl/crypto/objects/objects.pl
rename to crypto/objects/objects.pl
diff --git a/crypto/openssl/crypto/objects/objects.txt b/crypto/objects/objects.txt
similarity index 100%
rename from crypto/openssl/crypto/objects/objects.txt
rename to crypto/objects/objects.txt
diff --git a/crypto/openssl/crypto/ocsp/Makefile b/crypto/ocsp/Makefile
similarity index 100%
rename from crypto/openssl/crypto/ocsp/Makefile
rename to crypto/ocsp/Makefile
diff --git a/crypto/openssl/crypto/ocsp/ocsp.h b/crypto/ocsp/ocsp.h
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp.h
rename to crypto/ocsp/ocsp.h
diff --git a/crypto/openssl/crypto/ocsp/ocsp_asn.c b/crypto/ocsp/ocsp_asn.c
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp_asn.c
rename to crypto/ocsp/ocsp_asn.c
diff --git a/crypto/openssl/crypto/ocsp/ocsp_cl.c b/crypto/ocsp/ocsp_cl.c
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp_cl.c
rename to crypto/ocsp/ocsp_cl.c
diff --git a/crypto/openssl/crypto/ocsp/ocsp_err.c b/crypto/ocsp/ocsp_err.c
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp_err.c
rename to crypto/ocsp/ocsp_err.c
diff --git a/crypto/openssl/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp_ext.c
rename to crypto/ocsp/ocsp_ext.c
diff --git a/crypto/openssl/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp_ht.c
rename to crypto/ocsp/ocsp_ht.c
diff --git a/crypto/openssl/crypto/ocsp/ocsp_lib.c b/crypto/ocsp/ocsp_lib.c
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp_lib.c
rename to crypto/ocsp/ocsp_lib.c
diff --git a/crypto/openssl/crypto/ocsp/ocsp_prn.c b/crypto/ocsp/ocsp_prn.c
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp_prn.c
rename to crypto/ocsp/ocsp_prn.c
diff --git a/crypto/openssl/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp_srv.c
rename to crypto/ocsp/ocsp_srv.c
diff --git a/crypto/openssl/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
similarity index 100%
rename from crypto/openssl/crypto/ocsp/ocsp_vfy.c
rename to crypto/ocsp/ocsp_vfy.c
diff --git a/crypto/openssl/crypto/opensslconf.h b/crypto/opensslconf.h
similarity index 100%
rename from crypto/openssl/crypto/opensslconf.h
rename to crypto/opensslconf.h
diff --git a/crypto/openssl/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
similarity index 100%
rename from crypto/openssl/crypto/opensslconf.h.in
rename to crypto/opensslconf.h.in
diff --git a/crypto/openssl/crypto/opensslv.h b/crypto/opensslv.h
similarity index 100%
rename from crypto/openssl/crypto/opensslv.h
rename to crypto/opensslv.h
diff --git a/crypto/openssl/crypto/ossl_typ.h b/crypto/ossl_typ.h
similarity index 100%
rename from crypto/openssl/crypto/ossl_typ.h
rename to crypto/ossl_typ.h
diff --git a/crypto/openssl/crypto/pem/Makefile b/crypto/pem/Makefile
similarity index 100%
rename from crypto/openssl/crypto/pem/Makefile
rename to crypto/pem/Makefile
diff --git a/crypto/openssl/crypto/pem/message b/crypto/pem/message
similarity index 100%
rename from crypto/openssl/crypto/pem/message
rename to crypto/pem/message
diff --git a/crypto/openssl/crypto/pem/pem.h b/crypto/pem/pem.h
similarity index 100%
rename from crypto/openssl/crypto/pem/pem.h
rename to crypto/pem/pem.h
diff --git a/crypto/openssl/crypto/pem/pem2.h b/crypto/pem/pem2.h
similarity index 100%
rename from crypto/openssl/crypto/pem/pem2.h
rename to crypto/pem/pem2.h
diff --git a/crypto/openssl/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_all.c
rename to crypto/pem/pem_all.c
diff --git a/crypto/openssl/crypto/pem/pem_err.c b/crypto/pem/pem_err.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_err.c
rename to crypto/pem/pem_err.c
diff --git a/crypto/openssl/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_info.c
rename to crypto/pem/pem_info.c
diff --git a/crypto/openssl/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_lib.c
rename to crypto/pem/pem_lib.c
diff --git a/crypto/openssl/crypto/pem/pem_oth.c b/crypto/pem/pem_oth.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_oth.c
rename to crypto/pem/pem_oth.c
diff --git a/crypto/openssl/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_pk8.c
rename to crypto/pem/pem_pk8.c
diff --git a/crypto/openssl/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_pkey.c
rename to crypto/pem/pem_pkey.c
diff --git a/crypto/openssl/crypto/pem/pem_seal.c b/crypto/pem/pem_seal.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_seal.c
rename to crypto/pem/pem_seal.c
diff --git a/crypto/openssl/crypto/pem/pem_sign.c b/crypto/pem/pem_sign.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_sign.c
rename to crypto/pem/pem_sign.c
diff --git a/crypto/openssl/crypto/pem/pem_x509.c b/crypto/pem/pem_x509.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_x509.c
rename to crypto/pem/pem_x509.c
diff --git a/crypto/openssl/crypto/pem/pem_xaux.c b/crypto/pem/pem_xaux.c
similarity index 100%
rename from crypto/openssl/crypto/pem/pem_xaux.c
rename to crypto/pem/pem_xaux.c
diff --git a/crypto/openssl/crypto/pem/pkcs7.lis b/crypto/pem/pkcs7.lis
similarity index 100%
rename from crypto/openssl/crypto/pem/pkcs7.lis
rename to crypto/pem/pkcs7.lis
diff --git a/crypto/openssl/crypto/perlasm/alpha.pl b/crypto/perlasm/alpha.pl
similarity index 100%
rename from crypto/openssl/crypto/perlasm/alpha.pl
rename to crypto/perlasm/alpha.pl
diff --git a/crypto/openssl/crypto/perlasm/cbc.pl b/crypto/perlasm/cbc.pl
similarity index 100%
rename from crypto/openssl/crypto/perlasm/cbc.pl
rename to crypto/perlasm/cbc.pl
diff --git a/crypto/openssl/crypto/perlasm/readme b/crypto/perlasm/readme
similarity index 100%
rename from crypto/openssl/crypto/perlasm/readme
rename to crypto/perlasm/readme
diff --git a/crypto/openssl/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
similarity index 100%
rename from crypto/openssl/crypto/perlasm/x86_64-xlate.pl
rename to crypto/perlasm/x86_64-xlate.pl
diff --git a/crypto/openssl/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
similarity index 100%
rename from crypto/openssl/crypto/perlasm/x86asm.pl
rename to crypto/perlasm/x86asm.pl
diff --git a/crypto/openssl/crypto/perlasm/x86ms.pl b/crypto/perlasm/x86ms.pl
similarity index 100%
rename from crypto/openssl/crypto/perlasm/x86ms.pl
rename to crypto/perlasm/x86ms.pl
diff --git a/crypto/openssl/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl
similarity index 100%
rename from crypto/openssl/crypto/perlasm/x86nasm.pl
rename to crypto/perlasm/x86nasm.pl
diff --git a/crypto/openssl/crypto/perlasm/x86unix.pl b/crypto/perlasm/x86unix.pl
similarity index 100%
rename from crypto/openssl/crypto/perlasm/x86unix.pl
rename to crypto/perlasm/x86unix.pl
diff --git a/crypto/openssl/crypto/pkcs12/Makefile b/crypto/pkcs12/Makefile
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/Makefile
rename to crypto/pkcs12/Makefile
diff --git a/crypto/openssl/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_add.c
rename to crypto/pkcs12/p12_add.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_asn.c b/crypto/pkcs12/p12_asn.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_asn.c
rename to crypto/pkcs12/p12_asn.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_attr.c
rename to crypto/pkcs12/p12_attr.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_crpt.c
rename to crypto/pkcs12/p12_crpt.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_crt.c
rename to crypto/pkcs12/p12_crt.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_decr.c
rename to crypto/pkcs12/p12_decr.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_init.c
rename to crypto/pkcs12/p12_init.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_key.c
rename to crypto/pkcs12/p12_key.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_kiss.c
rename to crypto/pkcs12/p12_kiss.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_mutl.c
rename to crypto/pkcs12/p12_mutl.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_npas.c
rename to crypto/pkcs12/p12_npas.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_p8d.c b/crypto/pkcs12/p12_p8d.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_p8d.c
rename to crypto/pkcs12/p12_p8d.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_p8e.c b/crypto/pkcs12/p12_p8e.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_p8e.c
rename to crypto/pkcs12/p12_p8e.c
diff --git a/crypto/openssl/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/p12_utl.c
rename to crypto/pkcs12/p12_utl.c
diff --git a/crypto/openssl/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/pk12err.c
rename to crypto/pkcs12/pk12err.c
diff --git a/crypto/openssl/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
similarity index 100%
rename from crypto/openssl/crypto/pkcs12/pkcs12.h
rename to crypto/pkcs12/pkcs12.h
diff --git a/crypto/openssl/crypto/pkcs7/Makefile b/crypto/pkcs7/Makefile
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/Makefile
rename to crypto/pkcs7/Makefile
diff --git a/crypto/openssl/crypto/pkcs7/bio_ber.c b/crypto/pkcs7/bio_ber.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/bio_ber.c
rename to crypto/pkcs7/bio_ber.c
diff --git a/crypto/openssl/crypto/pkcs7/dec.c b/crypto/pkcs7/dec.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/dec.c
rename to crypto/pkcs7/dec.c
diff --git a/crypto/openssl/crypto/pkcs7/des.pem b/crypto/pkcs7/des.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/des.pem
rename to crypto/pkcs7/des.pem
diff --git a/crypto/openssl/crypto/pkcs7/doc b/crypto/pkcs7/doc
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/doc
rename to crypto/pkcs7/doc
diff --git a/crypto/openssl/crypto/pkcs7/enc.c b/crypto/pkcs7/enc.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/enc.c
rename to crypto/pkcs7/enc.c
diff --git a/crypto/openssl/crypto/pkcs7/es1.pem b/crypto/pkcs7/es1.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/es1.pem
rename to crypto/pkcs7/es1.pem
diff --git a/crypto/openssl/crypto/pkcs7/example.c b/crypto/pkcs7/example.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/example.c
rename to crypto/pkcs7/example.c
diff --git a/crypto/openssl/crypto/pkcs7/example.h b/crypto/pkcs7/example.h
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/example.h
rename to crypto/pkcs7/example.h
diff --git a/crypto/openssl/crypto/pkcs7/info.pem b/crypto/pkcs7/info.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/info.pem
rename to crypto/pkcs7/info.pem
diff --git a/crypto/openssl/crypto/pkcs7/infokey.pem b/crypto/pkcs7/infokey.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/infokey.pem
rename to crypto/pkcs7/infokey.pem
diff --git a/crypto/openssl/crypto/pkcs7/p7/a1 b/crypto/pkcs7/p7/a1
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/p7/a1
rename to crypto/pkcs7/p7/a1
diff --git a/crypto/openssl/crypto/pkcs7/p7/a2 b/crypto/pkcs7/p7/a2
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/p7/a2
rename to crypto/pkcs7/p7/a2
diff --git a/crypto/openssl/crypto/pkcs7/p7/cert.p7c b/crypto/pkcs7/p7/cert.p7c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/p7/cert.p7c
rename to crypto/pkcs7/p7/cert.p7c
diff --git a/crypto/openssl/crypto/pkcs7/p7/smime.p7m b/crypto/pkcs7/p7/smime.p7m
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/p7/smime.p7m
rename to crypto/pkcs7/p7/smime.p7m
diff --git a/crypto/openssl/crypto/pkcs7/p7/smime.p7s b/crypto/pkcs7/p7/smime.p7s
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/p7/smime.p7s
rename to crypto/pkcs7/p7/smime.p7s
diff --git a/crypto/openssl/crypto/pkcs7/pk7_asn1.c b/crypto/pkcs7/pk7_asn1.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pk7_asn1.c
rename to crypto/pkcs7/pk7_asn1.c
diff --git a/crypto/openssl/crypto/pkcs7/pk7_attr.c b/crypto/pkcs7/pk7_attr.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pk7_attr.c
rename to crypto/pkcs7/pk7_attr.c
diff --git a/crypto/openssl/crypto/pkcs7/pk7_dgst.c b/crypto/pkcs7/pk7_dgst.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pk7_dgst.c
rename to crypto/pkcs7/pk7_dgst.c
diff --git a/crypto/openssl/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pk7_doit.c
rename to crypto/pkcs7/pk7_doit.c
diff --git a/crypto/openssl/crypto/pkcs7/pk7_enc.c b/crypto/pkcs7/pk7_enc.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pk7_enc.c
rename to crypto/pkcs7/pk7_enc.c
diff --git a/crypto/openssl/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pk7_lib.c
rename to crypto/pkcs7/pk7_lib.c
diff --git a/crypto/openssl/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pk7_mime.c
rename to crypto/pkcs7/pk7_mime.c
diff --git a/crypto/openssl/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pk7_smime.c
rename to crypto/pkcs7/pk7_smime.c
diff --git a/crypto/openssl/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pkcs7.h
rename to crypto/pkcs7/pkcs7.h
diff --git a/crypto/openssl/crypto/pkcs7/pkcs7err.c b/crypto/pkcs7/pkcs7err.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/pkcs7err.c
rename to crypto/pkcs7/pkcs7err.c
diff --git a/crypto/openssl/crypto/pkcs7/server.pem b/crypto/pkcs7/server.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/server.pem
rename to crypto/pkcs7/server.pem
diff --git a/crypto/openssl/crypto/pkcs7/sign.c b/crypto/pkcs7/sign.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/sign.c
rename to crypto/pkcs7/sign.c
diff --git a/crypto/openssl/crypto/pkcs7/t/3des.pem b/crypto/pkcs7/t/3des.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/3des.pem
rename to crypto/pkcs7/t/3des.pem
diff --git a/crypto/openssl/crypto/pkcs7/t/3dess.pem b/crypto/pkcs7/t/3dess.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/3dess.pem
rename to crypto/pkcs7/t/3dess.pem
diff --git a/crypto/openssl/crypto/pkcs7/t/c.pem b/crypto/pkcs7/t/c.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/c.pem
rename to crypto/pkcs7/t/c.pem
diff --git a/crypto/openssl/crypto/pkcs7/t/ff b/crypto/pkcs7/t/ff
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/ff
rename to crypto/pkcs7/t/ff
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-e b/crypto/pkcs7/t/msie-e
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/msie-e
rename to crypto/pkcs7/t/msie-e
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-e.pem b/crypto/pkcs7/t/msie-e.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/msie-e.pem
rename to crypto/pkcs7/t/msie-e.pem
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-enc-01 b/crypto/pkcs7/t/msie-enc-01
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/msie-enc-01
rename to crypto/pkcs7/t/msie-enc-01
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-enc-01.pem b/crypto/pkcs7/t/msie-enc-01.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/msie-enc-01.pem
rename to crypto/pkcs7/t/msie-enc-01.pem
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-enc-02 b/crypto/pkcs7/t/msie-enc-02
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/msie-enc-02
rename to crypto/pkcs7/t/msie-enc-02
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-enc-02.pem b/crypto/pkcs7/t/msie-enc-02.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/msie-enc-02.pem
rename to crypto/pkcs7/t/msie-enc-02.pem
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-s-a-e b/crypto/pkcs7/t/msie-s-a-e
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/msie-s-a-e
rename to crypto/pkcs7/t/msie-s-a-e
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-s-a-e.pem b/crypto/pkcs7/t/msie-s-a-e.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/msie-s-a-e.pem
rename to crypto/pkcs7/t/msie-s-a-e.pem
diff --git a/crypto/openssl/crypto/pkcs7/t/nav-smime b/crypto/pkcs7/t/nav-smime
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/nav-smime
rename to crypto/pkcs7/t/nav-smime
diff --git a/crypto/openssl/crypto/pkcs7/t/s.pem b/crypto/pkcs7/t/s.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/s.pem
rename to crypto/pkcs7/t/s.pem
diff --git a/crypto/openssl/crypto/pkcs7/t/server.pem b/crypto/pkcs7/t/server.pem
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/t/server.pem
rename to crypto/pkcs7/t/server.pem
diff --git a/crypto/openssl/crypto/pkcs7/verify.c b/crypto/pkcs7/verify.c
similarity index 100%
rename from crypto/openssl/crypto/pkcs7/verify.c
rename to crypto/pkcs7/verify.c
diff --git a/crypto/openssl/crypto/pqueue/Makefile b/crypto/pqueue/Makefile
similarity index 100%
rename from crypto/openssl/crypto/pqueue/Makefile
rename to crypto/pqueue/Makefile
diff --git a/crypto/openssl/crypto/pqueue/pq_compat.h b/crypto/pqueue/pq_compat.h
similarity index 100%
rename from crypto/openssl/crypto/pqueue/pq_compat.h
rename to crypto/pqueue/pq_compat.h
diff --git a/crypto/openssl/crypto/pqueue/pq_test.c b/crypto/pqueue/pq_test.c
similarity index 100%
rename from crypto/openssl/crypto/pqueue/pq_test.c
rename to crypto/pqueue/pq_test.c
diff --git a/crypto/openssl/crypto/pqueue/pqueue.c b/crypto/pqueue/pqueue.c
similarity index 100%
rename from crypto/openssl/crypto/pqueue/pqueue.c
rename to crypto/pqueue/pqueue.c
diff --git a/crypto/openssl/crypto/pqueue/pqueue.h b/crypto/pqueue/pqueue.h
similarity index 100%
rename from crypto/openssl/crypto/pqueue/pqueue.h
rename to crypto/pqueue/pqueue.h
diff --git a/crypto/openssl/crypto/rand/Makefile b/crypto/rand/Makefile
similarity index 100%
rename from crypto/openssl/crypto/rand/Makefile
rename to crypto/rand/Makefile
diff --git a/crypto/openssl/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
similarity index 100%
rename from crypto/openssl/crypto/rand/md_rand.c
rename to crypto/rand/md_rand.c
diff --git a/crypto/openssl/crypto/rand/rand.h b/crypto/rand/rand.h
similarity index 100%
rename from crypto/openssl/crypto/rand/rand.h
rename to crypto/rand/rand.h
diff --git a/crypto/openssl/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c
similarity index 100%
rename from crypto/openssl/crypto/rand/rand_egd.c
rename to crypto/rand/rand_egd.c
diff --git a/crypto/openssl/crypto/rand/rand_err.c b/crypto/rand/rand_err.c
similarity index 100%
rename from crypto/openssl/crypto/rand/rand_err.c
rename to crypto/rand/rand_err.c
diff --git a/crypto/openssl/crypto/rand/rand_lcl.h b/crypto/rand/rand_lcl.h
similarity index 100%
rename from crypto/openssl/crypto/rand/rand_lcl.h
rename to crypto/rand/rand_lcl.h
diff --git a/crypto/openssl/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
similarity index 100%
rename from crypto/openssl/crypto/rand/rand_lib.c
rename to crypto/rand/rand_lib.c
diff --git a/crypto/openssl/crypto/rand/rand_nw.c b/crypto/rand/rand_nw.c
similarity index 100%
rename from crypto/openssl/crypto/rand/rand_nw.c
rename to crypto/rand/rand_nw.c
diff --git a/crypto/openssl/crypto/rand/rand_os2.c b/crypto/rand/rand_os2.c
similarity index 100%
rename from crypto/openssl/crypto/rand/rand_os2.c
rename to crypto/rand/rand_os2.c
diff --git a/crypto/openssl/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
similarity index 100%
rename from crypto/openssl/crypto/rand/rand_unix.c
rename to crypto/rand/rand_unix.c
diff --git a/crypto/openssl/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c
similarity index 100%
rename from crypto/openssl/crypto/rand/rand_vms.c
rename to crypto/rand/rand_vms.c
diff --git a/crypto/openssl/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
similarity index 100%
rename from crypto/openssl/crypto/rand/rand_win.c
rename to crypto/rand/rand_win.c
diff --git a/crypto/openssl/crypto/rand/randfile.c b/crypto/rand/randfile.c
similarity index 100%
rename from crypto/openssl/crypto/rand/randfile.c
rename to crypto/rand/randfile.c
diff --git a/crypto/openssl/crypto/rand/randtest.c b/crypto/rand/randtest.c
similarity index 100%
rename from crypto/openssl/crypto/rand/randtest.c
rename to crypto/rand/randtest.c
diff --git a/crypto/openssl/crypto/rc2/Makefile b/crypto/rc2/Makefile
similarity index 100%
rename from crypto/openssl/crypto/rc2/Makefile
rename to crypto/rc2/Makefile
diff --git a/crypto/openssl/crypto/rc2/rc2.h b/crypto/rc2/rc2.h
similarity index 100%
rename from crypto/openssl/crypto/rc2/rc2.h
rename to crypto/rc2/rc2.h
diff --git a/crypto/openssl/crypto/rc2/rc2_cbc.c b/crypto/rc2/rc2_cbc.c
similarity index 100%
rename from crypto/openssl/crypto/rc2/rc2_cbc.c
rename to crypto/rc2/rc2_cbc.c
diff --git a/crypto/openssl/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c
similarity index 100%
rename from crypto/openssl/crypto/rc2/rc2_ecb.c
rename to crypto/rc2/rc2_ecb.c
diff --git a/crypto/openssl/crypto/rc2/rc2_locl.h b/crypto/rc2/rc2_locl.h
similarity index 100%
rename from crypto/openssl/crypto/rc2/rc2_locl.h
rename to crypto/rc2/rc2_locl.h
diff --git a/crypto/openssl/crypto/rc2/rc2_skey.c b/crypto/rc2/rc2_skey.c
similarity index 100%
rename from crypto/openssl/crypto/rc2/rc2_skey.c
rename to crypto/rc2/rc2_skey.c
diff --git a/crypto/openssl/crypto/rc2/rc2cfb64.c b/crypto/rc2/rc2cfb64.c
similarity index 100%
rename from crypto/openssl/crypto/rc2/rc2cfb64.c
rename to crypto/rc2/rc2cfb64.c
diff --git a/crypto/openssl/crypto/rc2/rc2ofb64.c b/crypto/rc2/rc2ofb64.c
similarity index 100%
rename from crypto/openssl/crypto/rc2/rc2ofb64.c
rename to crypto/rc2/rc2ofb64.c
diff --git a/crypto/openssl/crypto/rc2/rc2speed.c b/crypto/rc2/rc2speed.c
similarity index 100%
rename from crypto/openssl/crypto/rc2/rc2speed.c
rename to crypto/rc2/rc2speed.c
diff --git a/crypto/openssl/crypto/rc2/rc2test.c b/crypto/rc2/rc2test.c
similarity index 100%
rename from crypto/openssl/crypto/rc2/rc2test.c
rename to crypto/rc2/rc2test.c
diff --git a/crypto/openssl/crypto/rc2/rrc2.doc b/crypto/rc2/rrc2.doc
similarity index 100%
rename from crypto/openssl/crypto/rc2/rrc2.doc
rename to crypto/rc2/rrc2.doc
diff --git a/crypto/openssl/crypto/rc2/tab.c b/crypto/rc2/tab.c
similarity index 100%
rename from crypto/openssl/crypto/rc2/tab.c
rename to crypto/rc2/tab.c
diff --git a/crypto/openssl/crypto/rc2/version b/crypto/rc2/version
similarity index 100%
rename from crypto/openssl/crypto/rc2/version
rename to crypto/rc2/version
diff --git a/crypto/openssl/crypto/rc4/Makefile b/crypto/rc4/Makefile
similarity index 100%
rename from crypto/openssl/crypto/rc4/Makefile
rename to crypto/rc4/Makefile
diff --git a/crypto/openssl/crypto/rc4/asm/rc4-586.pl b/crypto/rc4/asm/rc4-586.pl
similarity index 100%
rename from crypto/openssl/crypto/rc4/asm/rc4-586.pl
rename to crypto/rc4/asm/rc4-586.pl
diff --git a/crypto/openssl/crypto/rc4/asm/rc4-ia64.S b/crypto/rc4/asm/rc4-ia64.S
similarity index 100%
rename from crypto/openssl/crypto/rc4/asm/rc4-ia64.S
rename to crypto/rc4/asm/rc4-ia64.S
diff --git a/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl b/crypto/rc4/asm/rc4-x86_64.pl
similarity index 100%
rename from crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl
rename to crypto/rc4/asm/rc4-x86_64.pl
diff --git a/crypto/openssl/crypto/rc4/rc4.c b/crypto/rc4/rc4.c
similarity index 100%
rename from crypto/openssl/crypto/rc4/rc4.c
rename to crypto/rc4/rc4.c
diff --git a/crypto/openssl/crypto/rc4/rc4.h b/crypto/rc4/rc4.h
similarity index 100%
rename from crypto/openssl/crypto/rc4/rc4.h
rename to crypto/rc4/rc4.h
diff --git a/crypto/openssl/crypto/rc4/rc4_enc.c b/crypto/rc4/rc4_enc.c
similarity index 100%
rename from crypto/openssl/crypto/rc4/rc4_enc.c
rename to crypto/rc4/rc4_enc.c
diff --git a/crypto/openssl/crypto/rc4/rc4_locl.h b/crypto/rc4/rc4_locl.h
similarity index 100%
rename from crypto/openssl/crypto/rc4/rc4_locl.h
rename to crypto/rc4/rc4_locl.h
diff --git a/crypto/openssl/crypto/rc4/rc4_skey.c b/crypto/rc4/rc4_skey.c
similarity index 100%
rename from crypto/openssl/crypto/rc4/rc4_skey.c
rename to crypto/rc4/rc4_skey.c
diff --git a/crypto/openssl/crypto/rc4/rc4s.cpp b/crypto/rc4/rc4s.cpp
similarity index 100%
rename from crypto/openssl/crypto/rc4/rc4s.cpp
rename to crypto/rc4/rc4s.cpp
diff --git a/crypto/openssl/crypto/rc4/rc4speed.c b/crypto/rc4/rc4speed.c
similarity index 100%
rename from crypto/openssl/crypto/rc4/rc4speed.c
rename to crypto/rc4/rc4speed.c
diff --git a/crypto/openssl/crypto/rc4/rc4test.c b/crypto/rc4/rc4test.c
similarity index 100%
rename from crypto/openssl/crypto/rc4/rc4test.c
rename to crypto/rc4/rc4test.c
diff --git a/crypto/openssl/crypto/rc4/rrc4.doc b/crypto/rc4/rrc4.doc
similarity index 100%
rename from crypto/openssl/crypto/rc4/rrc4.doc
rename to crypto/rc4/rrc4.doc
diff --git a/crypto/openssl/crypto/rc5/Makefile b/crypto/rc5/Makefile
similarity index 100%
rename from crypto/openssl/crypto/rc5/Makefile
rename to crypto/rc5/Makefile
diff --git a/crypto/openssl/crypto/rc5/asm/rc5-586.pl b/crypto/rc5/asm/rc5-586.pl
similarity index 100%
rename from crypto/openssl/crypto/rc5/asm/rc5-586.pl
rename to crypto/rc5/asm/rc5-586.pl
diff --git a/crypto/openssl/crypto/rc5/rc5.h b/crypto/rc5/rc5.h
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5.h
rename to crypto/rc5/rc5.h
diff --git a/crypto/openssl/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5_ecb.c
rename to crypto/rc5/rc5_ecb.c
diff --git a/crypto/openssl/crypto/rc5/rc5_enc.c b/crypto/rc5/rc5_enc.c
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5_enc.c
rename to crypto/rc5/rc5_enc.c
diff --git a/crypto/openssl/crypto/rc5/rc5_locl.h b/crypto/rc5/rc5_locl.h
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5_locl.h
rename to crypto/rc5/rc5_locl.h
diff --git a/crypto/openssl/crypto/rc5/rc5_skey.c b/crypto/rc5/rc5_skey.c
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5_skey.c
rename to crypto/rc5/rc5_skey.c
diff --git a/crypto/openssl/crypto/rc5/rc5cfb64.c b/crypto/rc5/rc5cfb64.c
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5cfb64.c
rename to crypto/rc5/rc5cfb64.c
diff --git a/crypto/openssl/crypto/rc5/rc5ofb64.c b/crypto/rc5/rc5ofb64.c
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5ofb64.c
rename to crypto/rc5/rc5ofb64.c
diff --git a/crypto/openssl/crypto/rc5/rc5s.cpp b/crypto/rc5/rc5s.cpp
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5s.cpp
rename to crypto/rc5/rc5s.cpp
diff --git a/crypto/openssl/crypto/rc5/rc5speed.c b/crypto/rc5/rc5speed.c
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5speed.c
rename to crypto/rc5/rc5speed.c
diff --git a/crypto/openssl/crypto/rc5/rc5test.c b/crypto/rc5/rc5test.c
similarity index 100%
rename from crypto/openssl/crypto/rc5/rc5test.c
rename to crypto/rc5/rc5test.c
diff --git a/crypto/openssl/crypto/ripemd/Makefile b/crypto/ripemd/Makefile
similarity index 100%
rename from crypto/openssl/crypto/ripemd/Makefile
rename to crypto/ripemd/Makefile
diff --git a/crypto/openssl/crypto/ripemd/README b/crypto/ripemd/README
similarity index 100%
rename from crypto/openssl/crypto/ripemd/README
rename to crypto/ripemd/README
diff --git a/crypto/openssl/crypto/ripemd/asm/rips.cpp b/crypto/ripemd/asm/rips.cpp
similarity index 100%
rename from crypto/openssl/crypto/ripemd/asm/rips.cpp
rename to crypto/ripemd/asm/rips.cpp
diff --git a/crypto/openssl/crypto/ripemd/asm/rmd-586.pl b/crypto/ripemd/asm/rmd-586.pl
similarity index 100%
rename from crypto/openssl/crypto/ripemd/asm/rmd-586.pl
rename to crypto/ripemd/asm/rmd-586.pl
diff --git a/crypto/openssl/crypto/ripemd/ripemd.h b/crypto/ripemd/ripemd.h
similarity index 100%
rename from crypto/openssl/crypto/ripemd/ripemd.h
rename to crypto/ripemd/ripemd.h
diff --git a/crypto/openssl/crypto/ripemd/rmd160.c b/crypto/ripemd/rmd160.c
similarity index 100%
rename from crypto/openssl/crypto/ripemd/rmd160.c
rename to crypto/ripemd/rmd160.c
diff --git a/crypto/openssl/crypto/ripemd/rmd_dgst.c b/crypto/ripemd/rmd_dgst.c
similarity index 100%
rename from crypto/openssl/crypto/ripemd/rmd_dgst.c
rename to crypto/ripemd/rmd_dgst.c
diff --git a/crypto/openssl/crypto/ripemd/rmd_locl.h b/crypto/ripemd/rmd_locl.h
similarity index 100%
rename from crypto/openssl/crypto/ripemd/rmd_locl.h
rename to crypto/ripemd/rmd_locl.h
diff --git a/crypto/openssl/crypto/ripemd/rmd_one.c b/crypto/ripemd/rmd_one.c
similarity index 100%
rename from crypto/openssl/crypto/ripemd/rmd_one.c
rename to crypto/ripemd/rmd_one.c
diff --git a/crypto/openssl/crypto/ripemd/rmdconst.h b/crypto/ripemd/rmdconst.h
similarity index 100%
rename from crypto/openssl/crypto/ripemd/rmdconst.h
rename to crypto/ripemd/rmdconst.h
diff --git a/crypto/openssl/crypto/ripemd/rmdtest.c b/crypto/ripemd/rmdtest.c
similarity index 100%
rename from crypto/openssl/crypto/ripemd/rmdtest.c
rename to crypto/ripemd/rmdtest.c
diff --git a/crypto/openssl/crypto/rsa/Makefile b/crypto/rsa/Makefile
similarity index 100%
rename from crypto/openssl/crypto/rsa/Makefile
rename to crypto/rsa/Makefile
diff --git a/crypto/openssl/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa.h
rename to crypto/rsa/rsa.h
diff --git a/crypto/openssl/crypto/rsa/rsa_asn1.c b/crypto/rsa/rsa_asn1.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_asn1.c
rename to crypto/rsa/rsa_asn1.c
diff --git a/crypto/openssl/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_chk.c
rename to crypto/rsa/rsa_chk.c
diff --git a/crypto/openssl/crypto/rsa/rsa_depr.c b/crypto/rsa/rsa_depr.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_depr.c
rename to crypto/rsa/rsa_depr.c
diff --git a/crypto/openssl/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_eay.c
rename to crypto/rsa/rsa_eay.c
diff --git a/crypto/openssl/crypto/rsa/rsa_err.c b/crypto/rsa/rsa_err.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_err.c
rename to crypto/rsa/rsa_err.c
diff --git a/crypto/openssl/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_gen.c
rename to crypto/rsa/rsa_gen.c
diff --git a/crypto/openssl/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_lib.c
rename to crypto/rsa/rsa_lib.c
diff --git a/crypto/openssl/crypto/rsa/rsa_none.c b/crypto/rsa/rsa_none.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_none.c
rename to crypto/rsa/rsa_none.c
diff --git a/crypto/openssl/crypto/rsa/rsa_null.c b/crypto/rsa/rsa_null.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_null.c
rename to crypto/rsa/rsa_null.c
diff --git a/crypto/openssl/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_oaep.c
rename to crypto/rsa/rsa_oaep.c
diff --git a/crypto/openssl/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_pk1.c
rename to crypto/rsa/rsa_pk1.c
diff --git a/crypto/openssl/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_pss.c
rename to crypto/rsa/rsa_pss.c
diff --git a/crypto/openssl/crypto/rsa/rsa_saos.c b/crypto/rsa/rsa_saos.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_saos.c
rename to crypto/rsa/rsa_saos.c
diff --git a/crypto/openssl/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_sign.c
rename to crypto/rsa/rsa_sign.c
diff --git a/crypto/openssl/crypto/rsa/rsa_ssl.c b/crypto/rsa/rsa_ssl.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_ssl.c
rename to crypto/rsa/rsa_ssl.c
diff --git a/crypto/openssl/crypto/rsa/rsa_test.c b/crypto/rsa/rsa_test.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_test.c
rename to crypto/rsa/rsa_test.c
diff --git a/crypto/openssl/crypto/rsa/rsa_x931.c b/crypto/rsa/rsa_x931.c
similarity index 100%
rename from crypto/openssl/crypto/rsa/rsa_x931.c
rename to crypto/rsa/rsa_x931.c
diff --git a/crypto/openssl/crypto/sha/Makefile b/crypto/sha/Makefile
similarity index 100%
rename from crypto/openssl/crypto/sha/Makefile
rename to crypto/sha/Makefile
diff --git a/crypto/openssl/crypto/sha/asm/README b/crypto/sha/asm/README
similarity index 100%
rename from crypto/openssl/crypto/sha/asm/README
rename to crypto/sha/asm/README
diff --git a/crypto/openssl/crypto/sha/asm/sha1-586.pl b/crypto/sha/asm/sha1-586.pl
similarity index 100%
rename from crypto/openssl/crypto/sha/asm/sha1-586.pl
rename to crypto/sha/asm/sha1-586.pl
diff --git a/crypto/openssl/crypto/sha/asm/sha1-ia64.pl b/crypto/sha/asm/sha1-ia64.pl
similarity index 100%
rename from crypto/openssl/crypto/sha/asm/sha1-ia64.pl
rename to crypto/sha/asm/sha1-ia64.pl
diff --git a/crypto/openssl/crypto/sha/asm/sha512-ia64.pl b/crypto/sha/asm/sha512-ia64.pl
similarity index 100%
rename from crypto/openssl/crypto/sha/asm/sha512-ia64.pl
rename to crypto/sha/asm/sha512-ia64.pl
diff --git a/crypto/openssl/crypto/sha/asm/sha512-sse2.pl b/crypto/sha/asm/sha512-sse2.pl
similarity index 100%
rename from crypto/openssl/crypto/sha/asm/sha512-sse2.pl
rename to crypto/sha/asm/sha512-sse2.pl
diff --git a/crypto/openssl/crypto/sha/sha.c b/crypto/sha/sha.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha.c
rename to crypto/sha/sha.c
diff --git a/crypto/openssl/crypto/sha/sha.h b/crypto/sha/sha.h
similarity index 100%
rename from crypto/openssl/crypto/sha/sha.h
rename to crypto/sha/sha.h
diff --git a/crypto/openssl/crypto/sha/sha1.c b/crypto/sha/sha1.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha1.c
rename to crypto/sha/sha1.c
diff --git a/crypto/openssl/crypto/sha/sha1_one.c b/crypto/sha/sha1_one.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha1_one.c
rename to crypto/sha/sha1_one.c
diff --git a/crypto/openssl/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha1dgst.c
rename to crypto/sha/sha1dgst.c
diff --git a/crypto/openssl/crypto/sha/sha1s.cpp b/crypto/sha/sha1s.cpp
similarity index 100%
rename from crypto/openssl/crypto/sha/sha1s.cpp
rename to crypto/sha/sha1s.cpp
diff --git a/crypto/openssl/crypto/sha/sha1test.c b/crypto/sha/sha1test.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha1test.c
rename to crypto/sha/sha1test.c
diff --git a/crypto/openssl/crypto/sha/sha256.c b/crypto/sha/sha256.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha256.c
rename to crypto/sha/sha256.c
diff --git a/crypto/openssl/crypto/sha/sha256t.c b/crypto/sha/sha256t.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha256t.c
rename to crypto/sha/sha256t.c
diff --git a/crypto/openssl/crypto/sha/sha512.c b/crypto/sha/sha512.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha512.c
rename to crypto/sha/sha512.c
diff --git a/crypto/openssl/crypto/sha/sha512t.c b/crypto/sha/sha512t.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha512t.c
rename to crypto/sha/sha512t.c
diff --git a/crypto/openssl/crypto/sha/sha_dgst.c b/crypto/sha/sha_dgst.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha_dgst.c
rename to crypto/sha/sha_dgst.c
diff --git a/crypto/openssl/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h
similarity index 100%
rename from crypto/openssl/crypto/sha/sha_locl.h
rename to crypto/sha/sha_locl.h
diff --git a/crypto/openssl/crypto/sha/sha_one.c b/crypto/sha/sha_one.c
similarity index 100%
rename from crypto/openssl/crypto/sha/sha_one.c
rename to crypto/sha/sha_one.c
diff --git a/crypto/openssl/crypto/sha/shatest.c b/crypto/sha/shatest.c
similarity index 100%
rename from crypto/openssl/crypto/sha/shatest.c
rename to crypto/sha/shatest.c
diff --git a/crypto/openssl/crypto/sparccpuid.S b/crypto/sparccpuid.S
similarity index 100%
rename from crypto/openssl/crypto/sparccpuid.S
rename to crypto/sparccpuid.S
diff --git a/crypto/openssl/crypto/stack/Makefile b/crypto/stack/Makefile
similarity index 100%
rename from crypto/openssl/crypto/stack/Makefile
rename to crypto/stack/Makefile
diff --git a/crypto/openssl/crypto/stack/safestack.h b/crypto/stack/safestack.h
similarity index 100%
rename from crypto/openssl/crypto/stack/safestack.h
rename to crypto/stack/safestack.h
diff --git a/crypto/openssl/crypto/stack/stack.c b/crypto/stack/stack.c
similarity index 100%
rename from crypto/openssl/crypto/stack/stack.c
rename to crypto/stack/stack.c
diff --git a/crypto/openssl/crypto/stack/stack.h b/crypto/stack/stack.h
similarity index 100%
rename from crypto/openssl/crypto/stack/stack.h
rename to crypto/stack/stack.h
diff --git a/crypto/openssl/crypto/store/Makefile b/crypto/store/Makefile
similarity index 100%
rename from crypto/openssl/crypto/store/Makefile
rename to crypto/store/Makefile
diff --git a/crypto/openssl/crypto/store/README b/crypto/store/README
similarity index 100%
rename from crypto/openssl/crypto/store/README
rename to crypto/store/README
diff --git a/crypto/openssl/crypto/store/store.h b/crypto/store/store.h
similarity index 100%
rename from crypto/openssl/crypto/store/store.h
rename to crypto/store/store.h
diff --git a/crypto/openssl/crypto/store/str_err.c b/crypto/store/str_err.c
similarity index 100%
rename from crypto/openssl/crypto/store/str_err.c
rename to crypto/store/str_err.c
diff --git a/crypto/openssl/crypto/store/str_lib.c b/crypto/store/str_lib.c
similarity index 100%
rename from crypto/openssl/crypto/store/str_lib.c
rename to crypto/store/str_lib.c
diff --git a/crypto/openssl/crypto/store/str_locl.h b/crypto/store/str_locl.h
similarity index 100%
rename from crypto/openssl/crypto/store/str_locl.h
rename to crypto/store/str_locl.h
diff --git a/crypto/openssl/crypto/store/str_mem.c b/crypto/store/str_mem.c
similarity index 100%
rename from crypto/openssl/crypto/store/str_mem.c
rename to crypto/store/str_mem.c
diff --git a/crypto/openssl/crypto/store/str_meth.c b/crypto/store/str_meth.c
similarity index 100%
rename from crypto/openssl/crypto/store/str_meth.c
rename to crypto/store/str_meth.c
diff --git a/crypto/openssl/crypto/symhacks.h b/crypto/symhacks.h
similarity index 100%
rename from crypto/openssl/crypto/symhacks.h
rename to crypto/symhacks.h
diff --git a/crypto/openssl/crypto/threads/README b/crypto/threads/README
similarity index 100%
rename from crypto/openssl/crypto/threads/README
rename to crypto/threads/README
diff --git a/crypto/openssl/crypto/threads/mttest.c b/crypto/threads/mttest.c
similarity index 100%
rename from crypto/openssl/crypto/threads/mttest.c
rename to crypto/threads/mttest.c
diff --git a/crypto/openssl/crypto/threads/profile.sh b/crypto/threads/profile.sh
similarity index 100%
rename from crypto/openssl/crypto/threads/profile.sh
rename to crypto/threads/profile.sh
diff --git a/crypto/openssl/crypto/threads/pthread.sh b/crypto/threads/pthread.sh
similarity index 100%
rename from crypto/openssl/crypto/threads/pthread.sh
rename to crypto/threads/pthread.sh
diff --git a/crypto/openssl/crypto/threads/pthread2.sh b/crypto/threads/pthread2.sh
similarity index 100%
rename from crypto/openssl/crypto/threads/pthread2.sh
rename to crypto/threads/pthread2.sh
diff --git a/crypto/openssl/crypto/threads/purify.sh b/crypto/threads/purify.sh
similarity index 100%
rename from crypto/openssl/crypto/threads/purify.sh
rename to crypto/threads/purify.sh
diff --git a/crypto/openssl/crypto/threads/th-lock.c b/crypto/threads/th-lock.c
similarity index 100%
rename from crypto/openssl/crypto/threads/th-lock.c
rename to crypto/threads/th-lock.c
diff --git a/crypto/openssl/crypto/tmdiff.c b/crypto/tmdiff.c
similarity index 100%
rename from crypto/openssl/crypto/tmdiff.c
rename to crypto/tmdiff.c
diff --git a/crypto/openssl/crypto/tmdiff.h b/crypto/tmdiff.h
similarity index 100%
rename from crypto/openssl/crypto/tmdiff.h
rename to crypto/tmdiff.h
diff --git a/crypto/openssl/crypto/txt_db/Makefile b/crypto/txt_db/Makefile
similarity index 100%
rename from crypto/openssl/crypto/txt_db/Makefile
rename to crypto/txt_db/Makefile
diff --git a/crypto/openssl/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c
similarity index 100%
rename from crypto/openssl/crypto/txt_db/txt_db.c
rename to crypto/txt_db/txt_db.c
diff --git a/crypto/openssl/crypto/txt_db/txt_db.h b/crypto/txt_db/txt_db.h
similarity index 100%
rename from crypto/openssl/crypto/txt_db/txt_db.h
rename to crypto/txt_db/txt_db.h
diff --git a/crypto/openssl/crypto/ui/Makefile b/crypto/ui/Makefile
similarity index 100%
rename from crypto/openssl/crypto/ui/Makefile
rename to crypto/ui/Makefile
diff --git a/crypto/openssl/crypto/ui/ui.h b/crypto/ui/ui.h
similarity index 100%
rename from crypto/openssl/crypto/ui/ui.h
rename to crypto/ui/ui.h
diff --git a/crypto/openssl/crypto/ui/ui_compat.c b/crypto/ui/ui_compat.c
similarity index 100%
rename from crypto/openssl/crypto/ui/ui_compat.c
rename to crypto/ui/ui_compat.c
diff --git a/crypto/openssl/crypto/ui/ui_compat.h b/crypto/ui/ui_compat.h
similarity index 100%
rename from crypto/openssl/crypto/ui/ui_compat.h
rename to crypto/ui/ui_compat.h
diff --git a/crypto/openssl/crypto/ui/ui_err.c b/crypto/ui/ui_err.c
similarity index 100%
rename from crypto/openssl/crypto/ui/ui_err.c
rename to crypto/ui/ui_err.c
diff --git a/crypto/openssl/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
similarity index 100%
rename from crypto/openssl/crypto/ui/ui_lib.c
rename to crypto/ui/ui_lib.c
diff --git a/crypto/openssl/crypto/ui/ui_locl.h b/crypto/ui/ui_locl.h
similarity index 100%
rename from crypto/openssl/crypto/ui/ui_locl.h
rename to crypto/ui/ui_locl.h
diff --git a/crypto/openssl/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
similarity index 100%
rename from crypto/openssl/crypto/ui/ui_openssl.c
rename to crypto/ui/ui_openssl.c
diff --git a/crypto/openssl/crypto/ui/ui_util.c b/crypto/ui/ui_util.c
similarity index 100%
rename from crypto/openssl/crypto/ui/ui_util.c
rename to crypto/ui/ui_util.c
diff --git a/crypto/openssl/crypto/uid.c b/crypto/uid.c
similarity index 100%
rename from crypto/openssl/crypto/uid.c
rename to crypto/uid.c
diff --git a/crypto/openssl/crypto/x509/Makefile b/crypto/x509/Makefile
similarity index 100%
rename from crypto/openssl/crypto/x509/Makefile
rename to crypto/x509/Makefile
diff --git a/crypto/openssl/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
similarity index 100%
rename from crypto/openssl/crypto/x509/by_dir.c
rename to crypto/x509/by_dir.c
diff --git a/crypto/openssl/crypto/x509/by_file.c b/crypto/x509/by_file.c
similarity index 100%
rename from crypto/openssl/crypto/x509/by_file.c
rename to crypto/x509/by_file.c
diff --git a/crypto/openssl/crypto/x509/x509.h b/crypto/x509/x509.h
similarity index 100%
rename from crypto/openssl/crypto/x509/x509.h
rename to crypto/x509/x509.h
diff --git a/crypto/openssl/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_att.c
rename to crypto/x509/x509_att.c
diff --git a/crypto/openssl/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_cmp.c
rename to crypto/x509/x509_cmp.c
diff --git a/crypto/openssl/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_d2.c
rename to crypto/x509/x509_d2.c
diff --git a/crypto/openssl/crypto/x509/x509_def.c b/crypto/x509/x509_def.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_def.c
rename to crypto/x509/x509_def.c
diff --git a/crypto/openssl/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_err.c
rename to crypto/x509/x509_err.c
diff --git a/crypto/openssl/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_ext.c
rename to crypto/x509/x509_ext.c
diff --git a/crypto/openssl/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_lu.c
rename to crypto/x509/x509_lu.c
diff --git a/crypto/openssl/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_obj.c
rename to crypto/x509/x509_obj.c
diff --git a/crypto/openssl/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_r2x.c
rename to crypto/x509/x509_r2x.c
diff --git a/crypto/openssl/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_req.c
rename to crypto/x509/x509_req.c
diff --git a/crypto/openssl/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_set.c
rename to crypto/x509/x509_set.c
diff --git a/crypto/openssl/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_trs.c
rename to crypto/x509/x509_trs.c
diff --git a/crypto/openssl/crypto/x509/x509_txt.c b/crypto/x509/x509_txt.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_txt.c
rename to crypto/x509/x509_txt.c
diff --git a/crypto/openssl/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_v3.c
rename to crypto/x509/x509_v3.c
diff --git a/crypto/openssl/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_vfy.c
rename to crypto/x509/x509_vfy.c
diff --git a/crypto/openssl/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_vfy.h
rename to crypto/x509/x509_vfy.h
diff --git a/crypto/openssl/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509_vpm.c
rename to crypto/x509/x509_vpm.c
diff --git a/crypto/openssl/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509cset.c
rename to crypto/x509/x509cset.c
diff --git a/crypto/openssl/crypto/x509/x509name.c b/crypto/x509/x509name.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509name.c
rename to crypto/x509/x509name.c
diff --git a/crypto/openssl/crypto/x509/x509rset.c b/crypto/x509/x509rset.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509rset.c
rename to crypto/x509/x509rset.c
diff --git a/crypto/openssl/crypto/x509/x509spki.c b/crypto/x509/x509spki.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509spki.c
rename to crypto/x509/x509spki.c
diff --git a/crypto/openssl/crypto/x509/x509type.c b/crypto/x509/x509type.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x509type.c
rename to crypto/x509/x509type.c
diff --git a/crypto/openssl/crypto/x509/x_all.c b/crypto/x509/x_all.c
similarity index 100%
rename from crypto/openssl/crypto/x509/x_all.c
rename to crypto/x509/x_all.c
diff --git a/crypto/openssl/crypto/x509v3/Makefile b/crypto/x509v3/Makefile
similarity index 100%
rename from crypto/openssl/crypto/x509v3/Makefile
rename to crypto/x509v3/Makefile
diff --git a/crypto/openssl/crypto/x509v3/ext_dat.h b/crypto/x509v3/ext_dat.h
similarity index 100%
rename from crypto/openssl/crypto/x509v3/ext_dat.h
rename to crypto/x509v3/ext_dat.h
diff --git a/crypto/openssl/crypto/x509v3/pcy_cache.c b/crypto/x509v3/pcy_cache.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/pcy_cache.c
rename to crypto/x509v3/pcy_cache.c
diff --git a/crypto/openssl/crypto/x509v3/pcy_data.c b/crypto/x509v3/pcy_data.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/pcy_data.c
rename to crypto/x509v3/pcy_data.c
diff --git a/crypto/openssl/crypto/x509v3/pcy_int.h b/crypto/x509v3/pcy_int.h
similarity index 100%
rename from crypto/openssl/crypto/x509v3/pcy_int.h
rename to crypto/x509v3/pcy_int.h
diff --git a/crypto/openssl/crypto/x509v3/pcy_lib.c b/crypto/x509v3/pcy_lib.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/pcy_lib.c
rename to crypto/x509v3/pcy_lib.c
diff --git a/crypto/openssl/crypto/x509v3/pcy_map.c b/crypto/x509v3/pcy_map.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/pcy_map.c
rename to crypto/x509v3/pcy_map.c
diff --git a/crypto/openssl/crypto/x509v3/pcy_node.c b/crypto/x509v3/pcy_node.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/pcy_node.c
rename to crypto/x509v3/pcy_node.c
diff --git a/crypto/openssl/crypto/x509v3/pcy_tree.c b/crypto/x509v3/pcy_tree.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/pcy_tree.c
rename to crypto/x509v3/pcy_tree.c
diff --git a/crypto/openssl/crypto/x509v3/tabtest.c b/crypto/x509v3/tabtest.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/tabtest.c
rename to crypto/x509v3/tabtest.c
diff --git a/crypto/openssl/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_addr.c
rename to crypto/x509v3/v3_addr.c
diff --git a/crypto/openssl/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_akey.c
rename to crypto/x509v3/v3_akey.c
diff --git a/crypto/openssl/crypto/x509v3/v3_akeya.c b/crypto/x509v3/v3_akeya.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_akeya.c
rename to crypto/x509v3/v3_akeya.c
diff --git a/crypto/openssl/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_alt.c
rename to crypto/x509v3/v3_alt.c
diff --git a/crypto/openssl/crypto/x509v3/v3_asid.c b/crypto/x509v3/v3_asid.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_asid.c
rename to crypto/x509v3/v3_asid.c
diff --git a/crypto/openssl/crypto/x509v3/v3_bcons.c b/crypto/x509v3/v3_bcons.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_bcons.c
rename to crypto/x509v3/v3_bcons.c
diff --git a/crypto/openssl/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_bitst.c
rename to crypto/x509v3/v3_bitst.c
diff --git a/crypto/openssl/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_conf.c
rename to crypto/x509v3/v3_conf.c
diff --git a/crypto/openssl/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_cpols.c
rename to crypto/x509v3/v3_cpols.c
diff --git a/crypto/openssl/crypto/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_crld.c
rename to crypto/x509v3/v3_crld.c
diff --git a/crypto/openssl/crypto/x509v3/v3_enum.c b/crypto/x509v3/v3_enum.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_enum.c
rename to crypto/x509v3/v3_enum.c
diff --git a/crypto/openssl/crypto/x509v3/v3_extku.c b/crypto/x509v3/v3_extku.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_extku.c
rename to crypto/x509v3/v3_extku.c
diff --git a/crypto/openssl/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_genn.c
rename to crypto/x509v3/v3_genn.c
diff --git a/crypto/openssl/crypto/x509v3/v3_ia5.c b/crypto/x509v3/v3_ia5.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_ia5.c
rename to crypto/x509v3/v3_ia5.c
diff --git a/crypto/openssl/crypto/x509v3/v3_info.c b/crypto/x509v3/v3_info.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_info.c
rename to crypto/x509v3/v3_info.c
diff --git a/crypto/openssl/crypto/x509v3/v3_int.c b/crypto/x509v3/v3_int.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_int.c
rename to crypto/x509v3/v3_int.c
diff --git a/crypto/openssl/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_lib.c
rename to crypto/x509v3/v3_lib.c
diff --git a/crypto/openssl/crypto/x509v3/v3_ncons.c b/crypto/x509v3/v3_ncons.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_ncons.c
rename to crypto/x509v3/v3_ncons.c
diff --git a/crypto/openssl/crypto/x509v3/v3_ocsp.c b/crypto/x509v3/v3_ocsp.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_ocsp.c
rename to crypto/x509v3/v3_ocsp.c
diff --git a/crypto/openssl/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_pci.c
rename to crypto/x509v3/v3_pci.c
diff --git a/crypto/openssl/crypto/x509v3/v3_pcia.c b/crypto/x509v3/v3_pcia.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_pcia.c
rename to crypto/x509v3/v3_pcia.c
diff --git a/crypto/openssl/crypto/x509v3/v3_pcons.c b/crypto/x509v3/v3_pcons.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_pcons.c
rename to crypto/x509v3/v3_pcons.c
diff --git a/crypto/openssl/crypto/x509v3/v3_pku.c b/crypto/x509v3/v3_pku.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_pku.c
rename to crypto/x509v3/v3_pku.c
diff --git a/crypto/openssl/crypto/x509v3/v3_pmaps.c b/crypto/x509v3/v3_pmaps.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_pmaps.c
rename to crypto/x509v3/v3_pmaps.c
diff --git a/crypto/openssl/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_prn.c
rename to crypto/x509v3/v3_prn.c
diff --git a/crypto/openssl/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_purp.c
rename to crypto/x509v3/v3_purp.c
diff --git a/crypto/openssl/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_skey.c
rename to crypto/x509v3/v3_skey.c
diff --git a/crypto/openssl/crypto/x509v3/v3_sxnet.c b/crypto/x509v3/v3_sxnet.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_sxnet.c
rename to crypto/x509v3/v3_sxnet.c
diff --git a/crypto/openssl/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3_utl.c
rename to crypto/x509v3/v3_utl.c
diff --git a/crypto/openssl/crypto/x509v3/v3conf.c b/crypto/x509v3/v3conf.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3conf.c
rename to crypto/x509v3/v3conf.c
diff --git a/crypto/openssl/crypto/x509v3/v3err.c b/crypto/x509v3/v3err.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3err.c
rename to crypto/x509v3/v3err.c
diff --git a/crypto/openssl/crypto/x509v3/v3prin.c b/crypto/x509v3/v3prin.c
similarity index 100%
rename from crypto/openssl/crypto/x509v3/v3prin.c
rename to crypto/x509v3/v3prin.c
diff --git a/crypto/openssl/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
similarity index 100%
rename from crypto/openssl/crypto/x509v3/x509v3.h
rename to crypto/x509v3/x509v3.h
diff --git a/crypto/openssl/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
similarity index 100%
rename from crypto/openssl/crypto/x86_64cpuid.pl
rename to crypto/x86_64cpuid.pl
diff --git a/crypto/openssl/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
similarity index 100%
rename from crypto/openssl/crypto/x86cpuid.pl
rename to crypto/x86cpuid.pl
diff --git a/crypto/openssl/demos/README b/demos/README
similarity index 100%
rename from crypto/openssl/demos/README
rename to demos/README
diff --git a/crypto/openssl/demos/asn1/README.ASN1 b/demos/asn1/README.ASN1
similarity index 100%
rename from crypto/openssl/demos/asn1/README.ASN1
rename to demos/asn1/README.ASN1
diff --git a/crypto/openssl/demos/asn1/ocsp.c b/demos/asn1/ocsp.c
similarity index 100%
rename from crypto/openssl/demos/asn1/ocsp.c
rename to demos/asn1/ocsp.c
diff --git a/crypto/openssl/demos/b64.c b/demos/b64.c
similarity index 100%
rename from crypto/openssl/demos/b64.c
rename to demos/b64.c
diff --git a/crypto/openssl/demos/b64.pl b/demos/b64.pl
similarity index 100%
rename from crypto/openssl/demos/b64.pl
rename to demos/b64.pl
diff --git a/crypto/openssl/demos/bio/Makefile b/demos/bio/Makefile
similarity index 100%
rename from crypto/openssl/demos/bio/Makefile
rename to demos/bio/Makefile
diff --git a/crypto/openssl/demos/bio/README b/demos/bio/README
similarity index 100%
rename from crypto/openssl/demos/bio/README
rename to demos/bio/README
diff --git a/crypto/openssl/demos/bio/saccept.c b/demos/bio/saccept.c
similarity index 100%
rename from crypto/openssl/demos/bio/saccept.c
rename to demos/bio/saccept.c
diff --git a/crypto/openssl/demos/bio/sconnect.c b/demos/bio/sconnect.c
similarity index 100%
rename from crypto/openssl/demos/bio/sconnect.c
rename to demos/bio/sconnect.c
diff --git a/crypto/openssl/demos/bio/server.pem b/demos/bio/server.pem
similarity index 100%
rename from crypto/openssl/demos/bio/server.pem
rename to demos/bio/server.pem
diff --git a/crypto/openssl/demos/easy_tls/Makefile b/demos/easy_tls/Makefile
similarity index 100%
rename from crypto/openssl/demos/easy_tls/Makefile
rename to demos/easy_tls/Makefile
diff --git a/crypto/openssl/demos/easy_tls/README b/demos/easy_tls/README
similarity index 100%
rename from crypto/openssl/demos/easy_tls/README
rename to demos/easy_tls/README
diff --git a/crypto/openssl/demos/easy_tls/cacerts.pem b/demos/easy_tls/cacerts.pem
similarity index 100%
rename from crypto/openssl/demos/easy_tls/cacerts.pem
rename to demos/easy_tls/cacerts.pem
diff --git a/crypto/openssl/demos/easy_tls/cert.pem b/demos/easy_tls/cert.pem
similarity index 100%
rename from crypto/openssl/demos/easy_tls/cert.pem
rename to demos/easy_tls/cert.pem
diff --git a/crypto/openssl/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c
similarity index 100%
rename from crypto/openssl/demos/easy_tls/easy-tls.c
rename to demos/easy_tls/easy-tls.c
diff --git a/crypto/openssl/demos/easy_tls/easy-tls.h b/demos/easy_tls/easy-tls.h
similarity index 100%
rename from crypto/openssl/demos/easy_tls/easy-tls.h
rename to demos/easy_tls/easy-tls.h
diff --git a/crypto/openssl/demos/easy_tls/test.c b/demos/easy_tls/test.c
similarity index 100%
rename from crypto/openssl/demos/easy_tls/test.c
rename to demos/easy_tls/test.c
diff --git a/crypto/openssl/demos/easy_tls/test.h b/demos/easy_tls/test.h
similarity index 100%
rename from crypto/openssl/demos/easy_tls/test.h
rename to demos/easy_tls/test.h
diff --git a/crypto/openssl/demos/eay/Makefile b/demos/eay/Makefile
similarity index 100%
rename from crypto/openssl/demos/eay/Makefile
rename to demos/eay/Makefile
diff --git a/crypto/openssl/demos/eay/base64.c b/demos/eay/base64.c
similarity index 100%
rename from crypto/openssl/demos/eay/base64.c
rename to demos/eay/base64.c
diff --git a/crypto/openssl/demos/eay/conn.c b/demos/eay/conn.c
similarity index 100%
rename from crypto/openssl/demos/eay/conn.c
rename to demos/eay/conn.c
diff --git a/crypto/openssl/demos/eay/loadrsa.c b/demos/eay/loadrsa.c
similarity index 100%
rename from crypto/openssl/demos/eay/loadrsa.c
rename to demos/eay/loadrsa.c
diff --git a/crypto/openssl/demos/engines/cluster_labs/Makefile b/demos/engines/cluster_labs/Makefile
similarity index 100%
rename from crypto/openssl/demos/engines/cluster_labs/Makefile
rename to demos/engines/cluster_labs/Makefile
diff --git a/crypto/openssl/demos/engines/cluster_labs/cluster_labs.h b/demos/engines/cluster_labs/cluster_labs.h
similarity index 100%
rename from crypto/openssl/demos/engines/cluster_labs/cluster_labs.h
rename to demos/engines/cluster_labs/cluster_labs.h
diff --git a/crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs.c b/demos/engines/cluster_labs/hw_cluster_labs.c
similarity index 100%
rename from crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs.c
rename to demos/engines/cluster_labs/hw_cluster_labs.c
diff --git a/crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs.ec b/demos/engines/cluster_labs/hw_cluster_labs.ec
similarity index 100%
rename from crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs.ec
rename to demos/engines/cluster_labs/hw_cluster_labs.ec
diff --git a/crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.c b/demos/engines/cluster_labs/hw_cluster_labs_err.c
similarity index 100%
rename from crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.c
rename to demos/engines/cluster_labs/hw_cluster_labs_err.c
diff --git a/crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.h b/demos/engines/cluster_labs/hw_cluster_labs_err.h
similarity index 100%
rename from crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.h
rename to demos/engines/cluster_labs/hw_cluster_labs_err.h
diff --git a/crypto/openssl/demos/engines/ibmca/Makefile b/demos/engines/ibmca/Makefile
similarity index 100%
rename from crypto/openssl/demos/engines/ibmca/Makefile
rename to demos/engines/ibmca/Makefile
diff --git a/crypto/openssl/demos/engines/ibmca/hw_ibmca.c b/demos/engines/ibmca/hw_ibmca.c
similarity index 100%
rename from crypto/openssl/demos/engines/ibmca/hw_ibmca.c
rename to demos/engines/ibmca/hw_ibmca.c
diff --git a/crypto/openssl/demos/engines/ibmca/hw_ibmca.ec b/demos/engines/ibmca/hw_ibmca.ec
similarity index 100%
rename from crypto/openssl/demos/engines/ibmca/hw_ibmca.ec
rename to demos/engines/ibmca/hw_ibmca.ec
diff --git a/crypto/openssl/demos/engines/ibmca/hw_ibmca_err.c b/demos/engines/ibmca/hw_ibmca_err.c
similarity index 100%
rename from crypto/openssl/demos/engines/ibmca/hw_ibmca_err.c
rename to demos/engines/ibmca/hw_ibmca_err.c
diff --git a/crypto/openssl/demos/engines/ibmca/hw_ibmca_err.h b/demos/engines/ibmca/hw_ibmca_err.h
similarity index 100%
rename from crypto/openssl/demos/engines/ibmca/hw_ibmca_err.h
rename to demos/engines/ibmca/hw_ibmca_err.h
diff --git a/crypto/openssl/demos/engines/ibmca/ica_openssl_api.h b/demos/engines/ibmca/ica_openssl_api.h
similarity index 100%
rename from crypto/openssl/demos/engines/ibmca/ica_openssl_api.h
rename to demos/engines/ibmca/ica_openssl_api.h
diff --git a/crypto/openssl/demos/engines/zencod/Makefile b/demos/engines/zencod/Makefile
similarity index 100%
rename from crypto/openssl/demos/engines/zencod/Makefile
rename to demos/engines/zencod/Makefile
diff --git a/crypto/openssl/demos/engines/zencod/hw_zencod.c b/demos/engines/zencod/hw_zencod.c
similarity index 100%
rename from crypto/openssl/demos/engines/zencod/hw_zencod.c
rename to demos/engines/zencod/hw_zencod.c
diff --git a/crypto/openssl/demos/engines/zencod/hw_zencod.ec b/demos/engines/zencod/hw_zencod.ec
similarity index 100%
rename from crypto/openssl/demos/engines/zencod/hw_zencod.ec
rename to demos/engines/zencod/hw_zencod.ec
diff --git a/crypto/openssl/demos/engines/zencod/hw_zencod.h b/demos/engines/zencod/hw_zencod.h
similarity index 100%
rename from crypto/openssl/demos/engines/zencod/hw_zencod.h
rename to demos/engines/zencod/hw_zencod.h
diff --git a/crypto/openssl/demos/engines/zencod/hw_zencod_err.c b/demos/engines/zencod/hw_zencod_err.c
similarity index 100%
rename from crypto/openssl/demos/engines/zencod/hw_zencod_err.c
rename to demos/engines/zencod/hw_zencod_err.c
diff --git a/crypto/openssl/demos/engines/zencod/hw_zencod_err.h b/demos/engines/zencod/hw_zencod_err.h
similarity index 100%
rename from crypto/openssl/demos/engines/zencod/hw_zencod_err.h
rename to demos/engines/zencod/hw_zencod_err.h
diff --git a/crypto/openssl/demos/maurice/Makefile b/demos/maurice/Makefile
similarity index 100%
rename from crypto/openssl/demos/maurice/Makefile
rename to demos/maurice/Makefile
diff --git a/crypto/openssl/demos/maurice/README b/demos/maurice/README
similarity index 100%
rename from crypto/openssl/demos/maurice/README
rename to demos/maurice/README
diff --git a/crypto/openssl/demos/maurice/cert.pem b/demos/maurice/cert.pem
similarity index 100%
rename from crypto/openssl/demos/maurice/cert.pem
rename to demos/maurice/cert.pem
diff --git a/crypto/openssl/demos/maurice/example1.c b/demos/maurice/example1.c
similarity index 100%
rename from crypto/openssl/demos/maurice/example1.c
rename to demos/maurice/example1.c
diff --git a/crypto/openssl/demos/maurice/example2.c b/demos/maurice/example2.c
similarity index 100%
rename from crypto/openssl/demos/maurice/example2.c
rename to demos/maurice/example2.c
diff --git a/crypto/openssl/demos/maurice/example3.c b/demos/maurice/example3.c
similarity index 100%
rename from crypto/openssl/demos/maurice/example3.c
rename to demos/maurice/example3.c
diff --git a/crypto/openssl/demos/maurice/example4.c b/demos/maurice/example4.c
similarity index 100%
rename from crypto/openssl/demos/maurice/example4.c
rename to demos/maurice/example4.c
diff --git a/crypto/openssl/demos/maurice/loadkeys.c b/demos/maurice/loadkeys.c
similarity index 100%
rename from crypto/openssl/demos/maurice/loadkeys.c
rename to demos/maurice/loadkeys.c
diff --git a/crypto/openssl/demos/maurice/loadkeys.h b/demos/maurice/loadkeys.h
similarity index 100%
rename from crypto/openssl/demos/maurice/loadkeys.h
rename to demos/maurice/loadkeys.h
diff --git a/crypto/openssl/demos/maurice/privkey.pem b/demos/maurice/privkey.pem
similarity index 100%
rename from crypto/openssl/demos/maurice/privkey.pem
rename to demos/maurice/privkey.pem
diff --git a/crypto/openssl/demos/pkcs12/README b/demos/pkcs12/README
similarity index 100%
rename from crypto/openssl/demos/pkcs12/README
rename to demos/pkcs12/README
diff --git a/crypto/openssl/demos/pkcs12/pkread.c b/demos/pkcs12/pkread.c
similarity index 100%
rename from crypto/openssl/demos/pkcs12/pkread.c
rename to demos/pkcs12/pkread.c
diff --git a/crypto/openssl/demos/pkcs12/pkwrite.c b/demos/pkcs12/pkwrite.c
similarity index 100%
rename from crypto/openssl/demos/pkcs12/pkwrite.c
rename to demos/pkcs12/pkwrite.c
diff --git a/crypto/openssl/demos/prime/Makefile b/demos/prime/Makefile
similarity index 100%
rename from crypto/openssl/demos/prime/Makefile
rename to demos/prime/Makefile
diff --git a/crypto/openssl/demos/prime/prime.c b/demos/prime/prime.c
similarity index 100%
rename from crypto/openssl/demos/prime/prime.c
rename to demos/prime/prime.c
diff --git a/crypto/openssl/demos/privkey.pem b/demos/privkey.pem
similarity index 100%
rename from crypto/openssl/demos/privkey.pem
rename to demos/privkey.pem
diff --git a/crypto/openssl/demos/selfsign.c b/demos/selfsign.c
similarity index 100%
rename from crypto/openssl/demos/selfsign.c
rename to demos/selfsign.c
diff --git a/crypto/openssl/demos/sign/Makefile b/demos/sign/Makefile
similarity index 100%
rename from crypto/openssl/demos/sign/Makefile
rename to demos/sign/Makefile
diff --git a/crypto/openssl/demos/sign/cert.pem b/demos/sign/cert.pem
similarity index 100%
rename from crypto/openssl/demos/sign/cert.pem
rename to demos/sign/cert.pem
diff --git a/crypto/openssl/demos/sign/key.pem b/demos/sign/key.pem
similarity index 100%
rename from crypto/openssl/demos/sign/key.pem
rename to demos/sign/key.pem
diff --git a/crypto/openssl/demos/sign/sig.txt b/demos/sign/sig.txt
similarity index 100%
rename from crypto/openssl/demos/sign/sig.txt
rename to demos/sign/sig.txt
diff --git a/crypto/openssl/demos/sign/sign.c b/demos/sign/sign.c
similarity index 100%
rename from crypto/openssl/demos/sign/sign.c
rename to demos/sign/sign.c
diff --git a/crypto/openssl/demos/sign/sign.txt b/demos/sign/sign.txt
similarity index 100%
rename from crypto/openssl/demos/sign/sign.txt
rename to demos/sign/sign.txt
diff --git a/crypto/openssl/demos/spkigen.c b/demos/spkigen.c
similarity index 100%
rename from crypto/openssl/demos/spkigen.c
rename to demos/spkigen.c
diff --git a/crypto/openssl/demos/ssl/cli.cpp b/demos/ssl/cli.cpp
similarity index 100%
rename from crypto/openssl/demos/ssl/cli.cpp
rename to demos/ssl/cli.cpp
diff --git a/crypto/openssl/demos/ssl/inetdsrv.cpp b/demos/ssl/inetdsrv.cpp
similarity index 100%
rename from crypto/openssl/demos/ssl/inetdsrv.cpp
rename to demos/ssl/inetdsrv.cpp
diff --git a/crypto/openssl/demos/ssl/serv.cpp b/demos/ssl/serv.cpp
similarity index 100%
rename from crypto/openssl/demos/ssl/serv.cpp
rename to demos/ssl/serv.cpp
diff --git a/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh b/demos/ssltest-ecc/ECC-RSAcertgen.sh
similarity index 100%
rename from crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh
rename to demos/ssltest-ecc/ECC-RSAcertgen.sh
diff --git a/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh b/demos/ssltest-ecc/ECCcertgen.sh
similarity index 100%
rename from crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh
rename to demos/ssltest-ecc/ECCcertgen.sh
diff --git a/crypto/openssl/demos/ssltest-ecc/README b/demos/ssltest-ecc/README
similarity index 100%
rename from crypto/openssl/demos/ssltest-ecc/README
rename to demos/ssltest-ecc/README
diff --git a/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh b/demos/ssltest-ecc/RSAcertgen.sh
similarity index 100%
rename from crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh
rename to demos/ssltest-ecc/RSAcertgen.sh
diff --git a/crypto/openssl/demos/ssltest-ecc/ssltest.sh b/demos/ssltest-ecc/ssltest.sh
similarity index 100%
rename from crypto/openssl/demos/ssltest-ecc/ssltest.sh
rename to demos/ssltest-ecc/ssltest.sh
diff --git a/crypto/openssl/demos/state_machine/Makefile b/demos/state_machine/Makefile
similarity index 100%
rename from crypto/openssl/demos/state_machine/Makefile
rename to demos/state_machine/Makefile
diff --git a/crypto/openssl/demos/state_machine/state_machine.c b/demos/state_machine/state_machine.c
similarity index 100%
rename from crypto/openssl/demos/state_machine/state_machine.c
rename to demos/state_machine/state_machine.c
diff --git a/crypto/openssl/demos/tunala/A-client.pem b/demos/tunala/A-client.pem
similarity index 100%
rename from crypto/openssl/demos/tunala/A-client.pem
rename to demos/tunala/A-client.pem
diff --git a/crypto/openssl/demos/tunala/A-server.pem b/demos/tunala/A-server.pem
similarity index 100%
rename from crypto/openssl/demos/tunala/A-server.pem
rename to demos/tunala/A-server.pem
diff --git a/crypto/openssl/demos/tunala/CA.pem b/demos/tunala/CA.pem
similarity index 100%
rename from crypto/openssl/demos/tunala/CA.pem
rename to demos/tunala/CA.pem
diff --git a/crypto/openssl/demos/tunala/INSTALL b/demos/tunala/INSTALL
similarity index 100%
rename from crypto/openssl/demos/tunala/INSTALL
rename to demos/tunala/INSTALL
diff --git a/crypto/openssl/demos/tunala/Makefile b/demos/tunala/Makefile
similarity index 100%
rename from crypto/openssl/demos/tunala/Makefile
rename to demos/tunala/Makefile
diff --git a/crypto/openssl/demos/tunala/Makefile.am b/demos/tunala/Makefile.am
similarity index 100%
rename from crypto/openssl/demos/tunala/Makefile.am
rename to demos/tunala/Makefile.am
diff --git a/crypto/openssl/demos/tunala/README b/demos/tunala/README
similarity index 100%
rename from crypto/openssl/demos/tunala/README
rename to demos/tunala/README
diff --git a/crypto/openssl/demos/tunala/autogunk.sh b/demos/tunala/autogunk.sh
similarity index 100%
rename from crypto/openssl/demos/tunala/autogunk.sh
rename to demos/tunala/autogunk.sh
diff --git a/crypto/openssl/demos/tunala/autoungunk.sh b/demos/tunala/autoungunk.sh
similarity index 100%
rename from crypto/openssl/demos/tunala/autoungunk.sh
rename to demos/tunala/autoungunk.sh
diff --git a/crypto/openssl/demos/tunala/breakage.c b/demos/tunala/breakage.c
similarity index 100%
rename from crypto/openssl/demos/tunala/breakage.c
rename to demos/tunala/breakage.c
diff --git a/crypto/openssl/demos/tunala/buffer.c b/demos/tunala/buffer.c
similarity index 100%
rename from crypto/openssl/demos/tunala/buffer.c
rename to demos/tunala/buffer.c
diff --git a/crypto/openssl/demos/tunala/cb.c b/demos/tunala/cb.c
similarity index 100%
rename from crypto/openssl/demos/tunala/cb.c
rename to demos/tunala/cb.c
diff --git a/crypto/openssl/demos/tunala/configure.in b/demos/tunala/configure.in
similarity index 100%
rename from crypto/openssl/demos/tunala/configure.in
rename to demos/tunala/configure.in
diff --git a/crypto/openssl/demos/tunala/ip.c b/demos/tunala/ip.c
similarity index 100%
rename from crypto/openssl/demos/tunala/ip.c
rename to demos/tunala/ip.c
diff --git a/crypto/openssl/demos/tunala/sm.c b/demos/tunala/sm.c
similarity index 100%
rename from crypto/openssl/demos/tunala/sm.c
rename to demos/tunala/sm.c
diff --git a/crypto/openssl/demos/tunala/test.sh b/demos/tunala/test.sh
similarity index 100%
rename from crypto/openssl/demos/tunala/test.sh
rename to demos/tunala/test.sh
diff --git a/crypto/openssl/demos/tunala/tunala.c b/demos/tunala/tunala.c
similarity index 100%
rename from crypto/openssl/demos/tunala/tunala.c
rename to demos/tunala/tunala.c
diff --git a/crypto/openssl/demos/tunala/tunala.h b/demos/tunala/tunala.h
similarity index 100%
rename from crypto/openssl/demos/tunala/tunala.h
rename to demos/tunala/tunala.h
diff --git a/crypto/openssl/demos/x509/README b/demos/x509/README
similarity index 100%
rename from crypto/openssl/demos/x509/README
rename to demos/x509/README
diff --git a/crypto/openssl/demos/x509/mkcert.c b/demos/x509/mkcert.c
similarity index 100%
rename from crypto/openssl/demos/x509/mkcert.c
rename to demos/x509/mkcert.c
diff --git a/crypto/openssl/demos/x509/mkreq.c b/demos/x509/mkreq.c
similarity index 100%
rename from crypto/openssl/demos/x509/mkreq.c
rename to demos/x509/mkreq.c
diff --git a/crypto/openssl/doc/HOWTO/certificates.txt b/doc/HOWTO/certificates.txt
similarity index 100%
rename from crypto/openssl/doc/HOWTO/certificates.txt
rename to doc/HOWTO/certificates.txt
diff --git a/crypto/openssl/doc/HOWTO/keys.txt b/doc/HOWTO/keys.txt
similarity index 100%
rename from crypto/openssl/doc/HOWTO/keys.txt
rename to doc/HOWTO/keys.txt
diff --git a/crypto/openssl/doc/HOWTO/proxy_certificates.txt b/doc/HOWTO/proxy_certificates.txt
similarity index 100%
rename from crypto/openssl/doc/HOWTO/proxy_certificates.txt
rename to doc/HOWTO/proxy_certificates.txt
diff --git a/crypto/openssl/doc/README b/doc/README
similarity index 100%
rename from crypto/openssl/doc/README
rename to doc/README
diff --git a/crypto/openssl/doc/apps/CA.pl.pod b/doc/apps/CA.pl.pod
similarity index 100%
rename from crypto/openssl/doc/apps/CA.pl.pod
rename to doc/apps/CA.pl.pod
diff --git a/crypto/openssl/doc/apps/asn1parse.pod b/doc/apps/asn1parse.pod
similarity index 100%
rename from crypto/openssl/doc/apps/asn1parse.pod
rename to doc/apps/asn1parse.pod
diff --git a/crypto/openssl/doc/apps/ca.pod b/doc/apps/ca.pod
similarity index 100%
rename from crypto/openssl/doc/apps/ca.pod
rename to doc/apps/ca.pod
diff --git a/crypto/openssl/doc/apps/ciphers.pod b/doc/apps/ciphers.pod
similarity index 100%
rename from crypto/openssl/doc/apps/ciphers.pod
rename to doc/apps/ciphers.pod
diff --git a/crypto/openssl/doc/apps/config.pod b/doc/apps/config.pod
similarity index 100%
rename from crypto/openssl/doc/apps/config.pod
rename to doc/apps/config.pod
diff --git a/crypto/openssl/doc/apps/crl.pod b/doc/apps/crl.pod
similarity index 100%
rename from crypto/openssl/doc/apps/crl.pod
rename to doc/apps/crl.pod
diff --git a/crypto/openssl/doc/apps/crl2pkcs7.pod b/doc/apps/crl2pkcs7.pod
similarity index 100%
rename from crypto/openssl/doc/apps/crl2pkcs7.pod
rename to doc/apps/crl2pkcs7.pod
diff --git a/crypto/openssl/doc/apps/dgst.pod b/doc/apps/dgst.pod
similarity index 100%
rename from crypto/openssl/doc/apps/dgst.pod
rename to doc/apps/dgst.pod
diff --git a/crypto/openssl/doc/apps/dhparam.pod b/doc/apps/dhparam.pod
similarity index 100%
rename from crypto/openssl/doc/apps/dhparam.pod
rename to doc/apps/dhparam.pod
diff --git a/crypto/openssl/doc/apps/dsa.pod b/doc/apps/dsa.pod
similarity index 100%
rename from crypto/openssl/doc/apps/dsa.pod
rename to doc/apps/dsa.pod
diff --git a/crypto/openssl/doc/apps/dsaparam.pod b/doc/apps/dsaparam.pod
similarity index 100%
rename from crypto/openssl/doc/apps/dsaparam.pod
rename to doc/apps/dsaparam.pod
diff --git a/crypto/openssl/doc/apps/ec.pod b/doc/apps/ec.pod
similarity index 100%
rename from crypto/openssl/doc/apps/ec.pod
rename to doc/apps/ec.pod
diff --git a/crypto/openssl/doc/apps/ecparam.pod b/doc/apps/ecparam.pod
similarity index 100%
rename from crypto/openssl/doc/apps/ecparam.pod
rename to doc/apps/ecparam.pod
diff --git a/crypto/openssl/doc/apps/enc.pod b/doc/apps/enc.pod
similarity index 100%
rename from crypto/openssl/doc/apps/enc.pod
rename to doc/apps/enc.pod
diff --git a/crypto/openssl/doc/apps/errstr.pod b/doc/apps/errstr.pod
similarity index 100%
rename from crypto/openssl/doc/apps/errstr.pod
rename to doc/apps/errstr.pod
diff --git a/crypto/openssl/doc/apps/gendsa.pod b/doc/apps/gendsa.pod
similarity index 100%
rename from crypto/openssl/doc/apps/gendsa.pod
rename to doc/apps/gendsa.pod
diff --git a/crypto/openssl/doc/apps/genrsa.pod b/doc/apps/genrsa.pod
similarity index 100%
rename from crypto/openssl/doc/apps/genrsa.pod
rename to doc/apps/genrsa.pod
diff --git a/crypto/openssl/doc/apps/nseq.pod b/doc/apps/nseq.pod
similarity index 100%
rename from crypto/openssl/doc/apps/nseq.pod
rename to doc/apps/nseq.pod
diff --git a/crypto/openssl/doc/apps/ocsp.pod b/doc/apps/ocsp.pod
similarity index 100%
rename from crypto/openssl/doc/apps/ocsp.pod
rename to doc/apps/ocsp.pod
diff --git a/crypto/openssl/doc/apps/openssl.pod b/doc/apps/openssl.pod
similarity index 100%
rename from crypto/openssl/doc/apps/openssl.pod
rename to doc/apps/openssl.pod
diff --git a/crypto/openssl/doc/apps/passwd.pod b/doc/apps/passwd.pod
similarity index 100%
rename from crypto/openssl/doc/apps/passwd.pod
rename to doc/apps/passwd.pod
diff --git a/crypto/openssl/doc/apps/pkcs12.pod b/doc/apps/pkcs12.pod
similarity index 100%
rename from crypto/openssl/doc/apps/pkcs12.pod
rename to doc/apps/pkcs12.pod
diff --git a/crypto/openssl/doc/apps/pkcs7.pod b/doc/apps/pkcs7.pod
similarity index 100%
rename from crypto/openssl/doc/apps/pkcs7.pod
rename to doc/apps/pkcs7.pod
diff --git a/crypto/openssl/doc/apps/pkcs8.pod b/doc/apps/pkcs8.pod
similarity index 100%
rename from crypto/openssl/doc/apps/pkcs8.pod
rename to doc/apps/pkcs8.pod
diff --git a/crypto/openssl/doc/apps/rand.pod b/doc/apps/rand.pod
similarity index 100%
rename from crypto/openssl/doc/apps/rand.pod
rename to doc/apps/rand.pod
diff --git a/crypto/openssl/doc/apps/req.pod b/doc/apps/req.pod
similarity index 100%
rename from crypto/openssl/doc/apps/req.pod
rename to doc/apps/req.pod
diff --git a/crypto/openssl/doc/apps/rsa.pod b/doc/apps/rsa.pod
similarity index 100%
rename from crypto/openssl/doc/apps/rsa.pod
rename to doc/apps/rsa.pod
diff --git a/crypto/openssl/doc/apps/rsautl.pod b/doc/apps/rsautl.pod
similarity index 100%
rename from crypto/openssl/doc/apps/rsautl.pod
rename to doc/apps/rsautl.pod
diff --git a/crypto/openssl/doc/apps/s_client.pod b/doc/apps/s_client.pod
similarity index 100%
rename from crypto/openssl/doc/apps/s_client.pod
rename to doc/apps/s_client.pod
diff --git a/crypto/openssl/doc/apps/s_server.pod b/doc/apps/s_server.pod
similarity index 100%
rename from crypto/openssl/doc/apps/s_server.pod
rename to doc/apps/s_server.pod
diff --git a/crypto/openssl/doc/apps/s_time.pod b/doc/apps/s_time.pod
similarity index 100%
rename from crypto/openssl/doc/apps/s_time.pod
rename to doc/apps/s_time.pod
diff --git a/crypto/openssl/doc/apps/sess_id.pod b/doc/apps/sess_id.pod
similarity index 100%
rename from crypto/openssl/doc/apps/sess_id.pod
rename to doc/apps/sess_id.pod
diff --git a/crypto/openssl/doc/apps/smime.pod b/doc/apps/smime.pod
similarity index 100%
rename from crypto/openssl/doc/apps/smime.pod
rename to doc/apps/smime.pod
diff --git a/crypto/openssl/doc/apps/speed.pod b/doc/apps/speed.pod
similarity index 100%
rename from crypto/openssl/doc/apps/speed.pod
rename to doc/apps/speed.pod
diff --git a/crypto/openssl/doc/apps/spkac.pod b/doc/apps/spkac.pod
similarity index 100%
rename from crypto/openssl/doc/apps/spkac.pod
rename to doc/apps/spkac.pod
diff --git a/crypto/openssl/doc/apps/verify.pod b/doc/apps/verify.pod
similarity index 100%
rename from crypto/openssl/doc/apps/verify.pod
rename to doc/apps/verify.pod
diff --git a/crypto/openssl/doc/apps/version.pod b/doc/apps/version.pod
similarity index 100%
rename from crypto/openssl/doc/apps/version.pod
rename to doc/apps/version.pod
diff --git a/crypto/openssl/doc/apps/x509.pod b/doc/apps/x509.pod
similarity index 100%
rename from crypto/openssl/doc/apps/x509.pod
rename to doc/apps/x509.pod
diff --git a/crypto/openssl/doc/apps/x509v3_config.pod b/doc/apps/x509v3_config.pod
similarity index 100%
rename from crypto/openssl/doc/apps/x509v3_config.pod
rename to doc/apps/x509v3_config.pod
diff --git a/crypto/openssl/doc/c-indentation.el b/doc/c-indentation.el
similarity index 100%
rename from crypto/openssl/doc/c-indentation.el
rename to doc/c-indentation.el
diff --git a/crypto/openssl/doc/crypto/ASN1_OBJECT_new.pod b/doc/crypto/ASN1_OBJECT_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ASN1_OBJECT_new.pod
rename to doc/crypto/ASN1_OBJECT_new.pod
diff --git a/crypto/openssl/doc/crypto/ASN1_STRING_length.pod b/doc/crypto/ASN1_STRING_length.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ASN1_STRING_length.pod
rename to doc/crypto/ASN1_STRING_length.pod
diff --git a/crypto/openssl/doc/crypto/ASN1_STRING_new.pod b/doc/crypto/ASN1_STRING_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ASN1_STRING_new.pod
rename to doc/crypto/ASN1_STRING_new.pod
diff --git a/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod b/doc/crypto/ASN1_STRING_print_ex.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod
rename to doc/crypto/ASN1_STRING_print_ex.pod
diff --git a/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod b/doc/crypto/ASN1_generate_nconf.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ASN1_generate_nconf.pod
rename to doc/crypto/ASN1_generate_nconf.pod
diff --git a/crypto/openssl/doc/crypto/BIO_ctrl.pod b/doc/crypto/BIO_ctrl.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_ctrl.pod
rename to doc/crypto/BIO_ctrl.pod
diff --git a/crypto/openssl/doc/crypto/BIO_f_base64.pod b/doc/crypto/BIO_f_base64.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_f_base64.pod
rename to doc/crypto/BIO_f_base64.pod
diff --git a/crypto/openssl/doc/crypto/BIO_f_buffer.pod b/doc/crypto/BIO_f_buffer.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_f_buffer.pod
rename to doc/crypto/BIO_f_buffer.pod
diff --git a/crypto/openssl/doc/crypto/BIO_f_cipher.pod b/doc/crypto/BIO_f_cipher.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_f_cipher.pod
rename to doc/crypto/BIO_f_cipher.pod
diff --git a/crypto/openssl/doc/crypto/BIO_f_md.pod b/doc/crypto/BIO_f_md.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_f_md.pod
rename to doc/crypto/BIO_f_md.pod
diff --git a/crypto/openssl/doc/crypto/BIO_f_null.pod b/doc/crypto/BIO_f_null.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_f_null.pod
rename to doc/crypto/BIO_f_null.pod
diff --git a/crypto/openssl/doc/crypto/BIO_f_ssl.pod b/doc/crypto/BIO_f_ssl.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_f_ssl.pod
rename to doc/crypto/BIO_f_ssl.pod
diff --git a/crypto/openssl/doc/crypto/BIO_find_type.pod b/doc/crypto/BIO_find_type.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_find_type.pod
rename to doc/crypto/BIO_find_type.pod
diff --git a/crypto/openssl/doc/crypto/BIO_new.pod b/doc/crypto/BIO_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_new.pod
rename to doc/crypto/BIO_new.pod
diff --git a/crypto/openssl/doc/crypto/BIO_push.pod b/doc/crypto/BIO_push.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_push.pod
rename to doc/crypto/BIO_push.pod
diff --git a/crypto/openssl/doc/crypto/BIO_read.pod b/doc/crypto/BIO_read.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_read.pod
rename to doc/crypto/BIO_read.pod
diff --git a/crypto/openssl/doc/crypto/BIO_s_accept.pod b/doc/crypto/BIO_s_accept.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_s_accept.pod
rename to doc/crypto/BIO_s_accept.pod
diff --git a/crypto/openssl/doc/crypto/BIO_s_bio.pod b/doc/crypto/BIO_s_bio.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_s_bio.pod
rename to doc/crypto/BIO_s_bio.pod
diff --git a/crypto/openssl/doc/crypto/BIO_s_connect.pod b/doc/crypto/BIO_s_connect.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_s_connect.pod
rename to doc/crypto/BIO_s_connect.pod
diff --git a/crypto/openssl/doc/crypto/BIO_s_fd.pod b/doc/crypto/BIO_s_fd.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_s_fd.pod
rename to doc/crypto/BIO_s_fd.pod
diff --git a/crypto/openssl/doc/crypto/BIO_s_file.pod b/doc/crypto/BIO_s_file.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_s_file.pod
rename to doc/crypto/BIO_s_file.pod
diff --git a/crypto/openssl/doc/crypto/BIO_s_mem.pod b/doc/crypto/BIO_s_mem.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_s_mem.pod
rename to doc/crypto/BIO_s_mem.pod
diff --git a/crypto/openssl/doc/crypto/BIO_s_null.pod b/doc/crypto/BIO_s_null.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_s_null.pod
rename to doc/crypto/BIO_s_null.pod
diff --git a/crypto/openssl/doc/crypto/BIO_s_socket.pod b/doc/crypto/BIO_s_socket.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_s_socket.pod
rename to doc/crypto/BIO_s_socket.pod
diff --git a/crypto/openssl/doc/crypto/BIO_set_callback.pod b/doc/crypto/BIO_set_callback.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_set_callback.pod
rename to doc/crypto/BIO_set_callback.pod
diff --git a/crypto/openssl/doc/crypto/BIO_should_retry.pod b/doc/crypto/BIO_should_retry.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BIO_should_retry.pod
rename to doc/crypto/BIO_should_retry.pod
diff --git a/crypto/openssl/doc/crypto/BN_BLINDING_new.pod b/doc/crypto/BN_BLINDING_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_BLINDING_new.pod
rename to doc/crypto/BN_BLINDING_new.pod
diff --git a/crypto/openssl/doc/crypto/BN_CTX_new.pod b/doc/crypto/BN_CTX_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_CTX_new.pod
rename to doc/crypto/BN_CTX_new.pod
diff --git a/crypto/openssl/doc/crypto/BN_CTX_start.pod b/doc/crypto/BN_CTX_start.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_CTX_start.pod
rename to doc/crypto/BN_CTX_start.pod
diff --git a/crypto/openssl/doc/crypto/BN_add.pod b/doc/crypto/BN_add.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_add.pod
rename to doc/crypto/BN_add.pod
diff --git a/crypto/openssl/doc/crypto/BN_add_word.pod b/doc/crypto/BN_add_word.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_add_word.pod
rename to doc/crypto/BN_add_word.pod
diff --git a/crypto/openssl/doc/crypto/BN_bn2bin.pod b/doc/crypto/BN_bn2bin.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_bn2bin.pod
rename to doc/crypto/BN_bn2bin.pod
diff --git a/crypto/openssl/doc/crypto/BN_cmp.pod b/doc/crypto/BN_cmp.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_cmp.pod
rename to doc/crypto/BN_cmp.pod
diff --git a/crypto/openssl/doc/crypto/BN_copy.pod b/doc/crypto/BN_copy.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_copy.pod
rename to doc/crypto/BN_copy.pod
diff --git a/crypto/openssl/doc/crypto/BN_generate_prime.pod b/doc/crypto/BN_generate_prime.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_generate_prime.pod
rename to doc/crypto/BN_generate_prime.pod
diff --git a/crypto/openssl/doc/crypto/BN_mod_inverse.pod b/doc/crypto/BN_mod_inverse.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_mod_inverse.pod
rename to doc/crypto/BN_mod_inverse.pod
diff --git a/crypto/openssl/doc/crypto/BN_mod_mul_montgomery.pod b/doc/crypto/BN_mod_mul_montgomery.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_mod_mul_montgomery.pod
rename to doc/crypto/BN_mod_mul_montgomery.pod
diff --git a/crypto/openssl/doc/crypto/BN_mod_mul_reciprocal.pod b/doc/crypto/BN_mod_mul_reciprocal.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_mod_mul_reciprocal.pod
rename to doc/crypto/BN_mod_mul_reciprocal.pod
diff --git a/crypto/openssl/doc/crypto/BN_new.pod b/doc/crypto/BN_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_new.pod
rename to doc/crypto/BN_new.pod
diff --git a/crypto/openssl/doc/crypto/BN_num_bytes.pod b/doc/crypto/BN_num_bytes.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_num_bytes.pod
rename to doc/crypto/BN_num_bytes.pod
diff --git a/crypto/openssl/doc/crypto/BN_rand.pod b/doc/crypto/BN_rand.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_rand.pod
rename to doc/crypto/BN_rand.pod
diff --git a/crypto/openssl/doc/crypto/BN_set_bit.pod b/doc/crypto/BN_set_bit.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_set_bit.pod
rename to doc/crypto/BN_set_bit.pod
diff --git a/crypto/openssl/doc/crypto/BN_swap.pod b/doc/crypto/BN_swap.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_swap.pod
rename to doc/crypto/BN_swap.pod
diff --git a/crypto/openssl/doc/crypto/BN_zero.pod b/doc/crypto/BN_zero.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/BN_zero.pod
rename to doc/crypto/BN_zero.pod
diff --git a/crypto/openssl/doc/crypto/CONF_modules_free.pod b/doc/crypto/CONF_modules_free.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/CONF_modules_free.pod
rename to doc/crypto/CONF_modules_free.pod
diff --git a/crypto/openssl/doc/crypto/CONF_modules_load_file.pod b/doc/crypto/CONF_modules_load_file.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/CONF_modules_load_file.pod
rename to doc/crypto/CONF_modules_load_file.pod
diff --git a/crypto/openssl/doc/crypto/CRYPTO_set_ex_data.pod b/doc/crypto/CRYPTO_set_ex_data.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/CRYPTO_set_ex_data.pod
rename to doc/crypto/CRYPTO_set_ex_data.pod
diff --git a/crypto/openssl/doc/crypto/DH_generate_key.pod b/doc/crypto/DH_generate_key.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DH_generate_key.pod
rename to doc/crypto/DH_generate_key.pod
diff --git a/crypto/openssl/doc/crypto/DH_generate_parameters.pod b/doc/crypto/DH_generate_parameters.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DH_generate_parameters.pod
rename to doc/crypto/DH_generate_parameters.pod
diff --git a/crypto/openssl/doc/crypto/DH_get_ex_new_index.pod b/doc/crypto/DH_get_ex_new_index.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DH_get_ex_new_index.pod
rename to doc/crypto/DH_get_ex_new_index.pod
diff --git a/crypto/openssl/doc/crypto/DH_new.pod b/doc/crypto/DH_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DH_new.pod
rename to doc/crypto/DH_new.pod
diff --git a/crypto/openssl/doc/crypto/DH_set_method.pod b/doc/crypto/DH_set_method.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DH_set_method.pod
rename to doc/crypto/DH_set_method.pod
diff --git a/crypto/openssl/doc/crypto/DH_size.pod b/doc/crypto/DH_size.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DH_size.pod
rename to doc/crypto/DH_size.pod
diff --git a/crypto/openssl/doc/crypto/DSA_SIG_new.pod b/doc/crypto/DSA_SIG_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_SIG_new.pod
rename to doc/crypto/DSA_SIG_new.pod
diff --git a/crypto/openssl/doc/crypto/DSA_do_sign.pod b/doc/crypto/DSA_do_sign.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_do_sign.pod
rename to doc/crypto/DSA_do_sign.pod
diff --git a/crypto/openssl/doc/crypto/DSA_dup_DH.pod b/doc/crypto/DSA_dup_DH.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_dup_DH.pod
rename to doc/crypto/DSA_dup_DH.pod
diff --git a/crypto/openssl/doc/crypto/DSA_generate_key.pod b/doc/crypto/DSA_generate_key.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_generate_key.pod
rename to doc/crypto/DSA_generate_key.pod
diff --git a/crypto/openssl/doc/crypto/DSA_generate_parameters.pod b/doc/crypto/DSA_generate_parameters.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_generate_parameters.pod
rename to doc/crypto/DSA_generate_parameters.pod
diff --git a/crypto/openssl/doc/crypto/DSA_get_ex_new_index.pod b/doc/crypto/DSA_get_ex_new_index.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_get_ex_new_index.pod
rename to doc/crypto/DSA_get_ex_new_index.pod
diff --git a/crypto/openssl/doc/crypto/DSA_new.pod b/doc/crypto/DSA_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_new.pod
rename to doc/crypto/DSA_new.pod
diff --git a/crypto/openssl/doc/crypto/DSA_set_method.pod b/doc/crypto/DSA_set_method.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_set_method.pod
rename to doc/crypto/DSA_set_method.pod
diff --git a/crypto/openssl/doc/crypto/DSA_sign.pod b/doc/crypto/DSA_sign.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_sign.pod
rename to doc/crypto/DSA_sign.pod
diff --git a/crypto/openssl/doc/crypto/DSA_size.pod b/doc/crypto/DSA_size.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/DSA_size.pod
rename to doc/crypto/DSA_size.pod
diff --git a/crypto/openssl/doc/crypto/ERR_GET_LIB.pod b/doc/crypto/ERR_GET_LIB.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_GET_LIB.pod
rename to doc/crypto/ERR_GET_LIB.pod
diff --git a/crypto/openssl/doc/crypto/ERR_clear_error.pod b/doc/crypto/ERR_clear_error.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_clear_error.pod
rename to doc/crypto/ERR_clear_error.pod
diff --git a/crypto/openssl/doc/crypto/ERR_error_string.pod b/doc/crypto/ERR_error_string.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_error_string.pod
rename to doc/crypto/ERR_error_string.pod
diff --git a/crypto/openssl/doc/crypto/ERR_get_error.pod b/doc/crypto/ERR_get_error.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_get_error.pod
rename to doc/crypto/ERR_get_error.pod
diff --git a/crypto/openssl/doc/crypto/ERR_load_crypto_strings.pod b/doc/crypto/ERR_load_crypto_strings.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_load_crypto_strings.pod
rename to doc/crypto/ERR_load_crypto_strings.pod
diff --git a/crypto/openssl/doc/crypto/ERR_load_strings.pod b/doc/crypto/ERR_load_strings.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_load_strings.pod
rename to doc/crypto/ERR_load_strings.pod
diff --git a/crypto/openssl/doc/crypto/ERR_print_errors.pod b/doc/crypto/ERR_print_errors.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_print_errors.pod
rename to doc/crypto/ERR_print_errors.pod
diff --git a/crypto/openssl/doc/crypto/ERR_put_error.pod b/doc/crypto/ERR_put_error.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_put_error.pod
rename to doc/crypto/ERR_put_error.pod
diff --git a/crypto/openssl/doc/crypto/ERR_remove_state.pod b/doc/crypto/ERR_remove_state.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_remove_state.pod
rename to doc/crypto/ERR_remove_state.pod
diff --git a/crypto/openssl/doc/crypto/ERR_set_mark.pod b/doc/crypto/ERR_set_mark.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ERR_set_mark.pod
rename to doc/crypto/ERR_set_mark.pod
diff --git a/crypto/openssl/doc/crypto/EVP_BytesToKey.pod b/doc/crypto/EVP_BytesToKey.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/EVP_BytesToKey.pod
rename to doc/crypto/EVP_BytesToKey.pod
diff --git a/crypto/openssl/doc/crypto/EVP_DigestInit.pod b/doc/crypto/EVP_DigestInit.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/EVP_DigestInit.pod
rename to doc/crypto/EVP_DigestInit.pod
diff --git a/crypto/openssl/doc/crypto/EVP_EncryptInit.pod b/doc/crypto/EVP_EncryptInit.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/EVP_EncryptInit.pod
rename to doc/crypto/EVP_EncryptInit.pod
diff --git a/crypto/openssl/doc/crypto/EVP_OpenInit.pod b/doc/crypto/EVP_OpenInit.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/EVP_OpenInit.pod
rename to doc/crypto/EVP_OpenInit.pod
diff --git a/crypto/openssl/doc/crypto/EVP_PKEY_new.pod b/doc/crypto/EVP_PKEY_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/EVP_PKEY_new.pod
rename to doc/crypto/EVP_PKEY_new.pod
diff --git a/crypto/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod b/doc/crypto/EVP_PKEY_set1_RSA.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod
rename to doc/crypto/EVP_PKEY_set1_RSA.pod
diff --git a/crypto/openssl/doc/crypto/EVP_SealInit.pod b/doc/crypto/EVP_SealInit.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/EVP_SealInit.pod
rename to doc/crypto/EVP_SealInit.pod
diff --git a/crypto/openssl/doc/crypto/EVP_SignInit.pod b/doc/crypto/EVP_SignInit.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/EVP_SignInit.pod
rename to doc/crypto/EVP_SignInit.pod
diff --git a/crypto/openssl/doc/crypto/EVP_VerifyInit.pod b/doc/crypto/EVP_VerifyInit.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/EVP_VerifyInit.pod
rename to doc/crypto/EVP_VerifyInit.pod
diff --git a/crypto/openssl/doc/crypto/OBJ_nid2obj.pod b/doc/crypto/OBJ_nid2obj.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/OBJ_nid2obj.pod
rename to doc/crypto/OBJ_nid2obj.pod
diff --git a/crypto/openssl/doc/crypto/OPENSSL_Applink.pod b/doc/crypto/OPENSSL_Applink.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/OPENSSL_Applink.pod
rename to doc/crypto/OPENSSL_Applink.pod
diff --git a/crypto/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod b/doc/crypto/OPENSSL_VERSION_NUMBER.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod
rename to doc/crypto/OPENSSL_VERSION_NUMBER.pod
diff --git a/crypto/openssl/doc/crypto/OPENSSL_config.pod b/doc/crypto/OPENSSL_config.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/OPENSSL_config.pod
rename to doc/crypto/OPENSSL_config.pod
diff --git a/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod b/doc/crypto/OPENSSL_ia32cap.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod
rename to doc/crypto/OPENSSL_ia32cap.pod
diff --git a/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod b/doc/crypto/OPENSSL_load_builtin_modules.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod
rename to doc/crypto/OPENSSL_load_builtin_modules.pod
diff --git a/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod b/doc/crypto/OpenSSL_add_all_algorithms.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod
rename to doc/crypto/OpenSSL_add_all_algorithms.pod
diff --git a/crypto/openssl/doc/crypto/PKCS12_create.pod b/doc/crypto/PKCS12_create.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/PKCS12_create.pod
rename to doc/crypto/PKCS12_create.pod
diff --git a/crypto/openssl/doc/crypto/PKCS12_parse.pod b/doc/crypto/PKCS12_parse.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/PKCS12_parse.pod
rename to doc/crypto/PKCS12_parse.pod
diff --git a/crypto/openssl/doc/crypto/PKCS7_decrypt.pod b/doc/crypto/PKCS7_decrypt.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/PKCS7_decrypt.pod
rename to doc/crypto/PKCS7_decrypt.pod
diff --git a/crypto/openssl/doc/crypto/PKCS7_encrypt.pod b/doc/crypto/PKCS7_encrypt.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/PKCS7_encrypt.pod
rename to doc/crypto/PKCS7_encrypt.pod
diff --git a/crypto/openssl/doc/crypto/PKCS7_sign.pod b/doc/crypto/PKCS7_sign.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/PKCS7_sign.pod
rename to doc/crypto/PKCS7_sign.pod
diff --git a/crypto/openssl/doc/crypto/PKCS7_verify.pod b/doc/crypto/PKCS7_verify.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/PKCS7_verify.pod
rename to doc/crypto/PKCS7_verify.pod
diff --git a/crypto/openssl/doc/crypto/RAND_add.pod b/doc/crypto/RAND_add.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RAND_add.pod
rename to doc/crypto/RAND_add.pod
diff --git a/crypto/openssl/doc/crypto/RAND_bytes.pod b/doc/crypto/RAND_bytes.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RAND_bytes.pod
rename to doc/crypto/RAND_bytes.pod
diff --git a/crypto/openssl/doc/crypto/RAND_cleanup.pod b/doc/crypto/RAND_cleanup.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RAND_cleanup.pod
rename to doc/crypto/RAND_cleanup.pod
diff --git a/crypto/openssl/doc/crypto/RAND_egd.pod b/doc/crypto/RAND_egd.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RAND_egd.pod
rename to doc/crypto/RAND_egd.pod
diff --git a/crypto/openssl/doc/crypto/RAND_load_file.pod b/doc/crypto/RAND_load_file.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RAND_load_file.pod
rename to doc/crypto/RAND_load_file.pod
diff --git a/crypto/openssl/doc/crypto/RAND_set_rand_method.pod b/doc/crypto/RAND_set_rand_method.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RAND_set_rand_method.pod
rename to doc/crypto/RAND_set_rand_method.pod
diff --git a/crypto/openssl/doc/crypto/RSA_blinding_on.pod b/doc/crypto/RSA_blinding_on.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_blinding_on.pod
rename to doc/crypto/RSA_blinding_on.pod
diff --git a/crypto/openssl/doc/crypto/RSA_check_key.pod b/doc/crypto/RSA_check_key.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_check_key.pod
rename to doc/crypto/RSA_check_key.pod
diff --git a/crypto/openssl/doc/crypto/RSA_generate_key.pod b/doc/crypto/RSA_generate_key.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_generate_key.pod
rename to doc/crypto/RSA_generate_key.pod
diff --git a/crypto/openssl/doc/crypto/RSA_get_ex_new_index.pod b/doc/crypto/RSA_get_ex_new_index.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_get_ex_new_index.pod
rename to doc/crypto/RSA_get_ex_new_index.pod
diff --git a/crypto/openssl/doc/crypto/RSA_new.pod b/doc/crypto/RSA_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_new.pod
rename to doc/crypto/RSA_new.pod
diff --git a/crypto/openssl/doc/crypto/RSA_padding_add_PKCS1_type_1.pod b/doc/crypto/RSA_padding_add_PKCS1_type_1.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_padding_add_PKCS1_type_1.pod
rename to doc/crypto/RSA_padding_add_PKCS1_type_1.pod
diff --git a/crypto/openssl/doc/crypto/RSA_print.pod b/doc/crypto/RSA_print.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_print.pod
rename to doc/crypto/RSA_print.pod
diff --git a/crypto/openssl/doc/crypto/RSA_private_encrypt.pod b/doc/crypto/RSA_private_encrypt.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_private_encrypt.pod
rename to doc/crypto/RSA_private_encrypt.pod
diff --git a/crypto/openssl/doc/crypto/RSA_public_encrypt.pod b/doc/crypto/RSA_public_encrypt.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_public_encrypt.pod
rename to doc/crypto/RSA_public_encrypt.pod
diff --git a/crypto/openssl/doc/crypto/RSA_set_method.pod b/doc/crypto/RSA_set_method.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_set_method.pod
rename to doc/crypto/RSA_set_method.pod
diff --git a/crypto/openssl/doc/crypto/RSA_sign.pod b/doc/crypto/RSA_sign.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_sign.pod
rename to doc/crypto/RSA_sign.pod
diff --git a/crypto/openssl/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod b/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod
rename to doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod
diff --git a/crypto/openssl/doc/crypto/RSA_size.pod b/doc/crypto/RSA_size.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/RSA_size.pod
rename to doc/crypto/RSA_size.pod
diff --git a/crypto/openssl/doc/crypto/SMIME_read_PKCS7.pod b/doc/crypto/SMIME_read_PKCS7.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/SMIME_read_PKCS7.pod
rename to doc/crypto/SMIME_read_PKCS7.pod
diff --git a/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod b/doc/crypto/SMIME_write_PKCS7.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod
rename to doc/crypto/SMIME_write_PKCS7.pod
diff --git a/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod b/doc/crypto/X509_NAME_ENTRY_get_object.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod
rename to doc/crypto/X509_NAME_ENTRY_get_object.pod
diff --git a/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod b/doc/crypto/X509_NAME_add_entry_by_txt.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod
rename to doc/crypto/X509_NAME_add_entry_by_txt.pod
diff --git a/crypto/openssl/doc/crypto/X509_NAME_get_index_by_NID.pod b/doc/crypto/X509_NAME_get_index_by_NID.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/X509_NAME_get_index_by_NID.pod
rename to doc/crypto/X509_NAME_get_index_by_NID.pod
diff --git a/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod b/doc/crypto/X509_NAME_print_ex.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/X509_NAME_print_ex.pod
rename to doc/crypto/X509_NAME_print_ex.pod
diff --git a/crypto/openssl/doc/crypto/X509_new.pod b/doc/crypto/X509_new.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/X509_new.pod
rename to doc/crypto/X509_new.pod
diff --git a/crypto/openssl/doc/crypto/bio.pod b/doc/crypto/bio.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/bio.pod
rename to doc/crypto/bio.pod
diff --git a/crypto/openssl/doc/crypto/blowfish.pod b/doc/crypto/blowfish.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/blowfish.pod
rename to doc/crypto/blowfish.pod
diff --git a/crypto/openssl/doc/crypto/bn.pod b/doc/crypto/bn.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/bn.pod
rename to doc/crypto/bn.pod
diff --git a/crypto/openssl/doc/crypto/bn_internal.pod b/doc/crypto/bn_internal.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/bn_internal.pod
rename to doc/crypto/bn_internal.pod
diff --git a/crypto/openssl/doc/crypto/buffer.pod b/doc/crypto/buffer.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/buffer.pod
rename to doc/crypto/buffer.pod
diff --git a/crypto/openssl/doc/crypto/crypto.pod b/doc/crypto/crypto.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/crypto.pod
rename to doc/crypto/crypto.pod
diff --git a/crypto/openssl/doc/crypto/d2i_ASN1_OBJECT.pod b/doc/crypto/d2i_ASN1_OBJECT.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_ASN1_OBJECT.pod
rename to doc/crypto/d2i_ASN1_OBJECT.pod
diff --git a/crypto/openssl/doc/crypto/d2i_DHparams.pod b/doc/crypto/d2i_DHparams.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_DHparams.pod
rename to doc/crypto/d2i_DHparams.pod
diff --git a/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod b/doc/crypto/d2i_DSAPublicKey.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod
rename to doc/crypto/d2i_DSAPublicKey.pod
diff --git a/crypto/openssl/doc/crypto/d2i_PKCS8PrivateKey.pod b/doc/crypto/d2i_PKCS8PrivateKey.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_PKCS8PrivateKey.pod
rename to doc/crypto/d2i_PKCS8PrivateKey.pod
diff --git a/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod b/doc/crypto/d2i_RSAPublicKey.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod
rename to doc/crypto/d2i_RSAPublicKey.pod
diff --git a/crypto/openssl/doc/crypto/d2i_X509.pod b/doc/crypto/d2i_X509.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_X509.pod
rename to doc/crypto/d2i_X509.pod
diff --git a/crypto/openssl/doc/crypto/d2i_X509_ALGOR.pod b/doc/crypto/d2i_X509_ALGOR.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_X509_ALGOR.pod
rename to doc/crypto/d2i_X509_ALGOR.pod
diff --git a/crypto/openssl/doc/crypto/d2i_X509_CRL.pod b/doc/crypto/d2i_X509_CRL.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_X509_CRL.pod
rename to doc/crypto/d2i_X509_CRL.pod
diff --git a/crypto/openssl/doc/crypto/d2i_X509_NAME.pod b/doc/crypto/d2i_X509_NAME.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_X509_NAME.pod
rename to doc/crypto/d2i_X509_NAME.pod
diff --git a/crypto/openssl/doc/crypto/d2i_X509_REQ.pod b/doc/crypto/d2i_X509_REQ.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_X509_REQ.pod
rename to doc/crypto/d2i_X509_REQ.pod
diff --git a/crypto/openssl/doc/crypto/d2i_X509_SIG.pod b/doc/crypto/d2i_X509_SIG.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/d2i_X509_SIG.pod
rename to doc/crypto/d2i_X509_SIG.pod
diff --git a/crypto/openssl/doc/crypto/des.pod b/doc/crypto/des.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/des.pod
rename to doc/crypto/des.pod
diff --git a/crypto/openssl/doc/crypto/des_modes.pod b/doc/crypto/des_modes.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/des_modes.pod
rename to doc/crypto/des_modes.pod
diff --git a/crypto/openssl/doc/crypto/dh.pod b/doc/crypto/dh.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/dh.pod
rename to doc/crypto/dh.pod
diff --git a/crypto/openssl/doc/crypto/dsa.pod b/doc/crypto/dsa.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/dsa.pod
rename to doc/crypto/dsa.pod
diff --git a/crypto/openssl/doc/crypto/ecdsa.pod b/doc/crypto/ecdsa.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ecdsa.pod
rename to doc/crypto/ecdsa.pod
diff --git a/crypto/openssl/doc/crypto/engine.pod b/doc/crypto/engine.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/engine.pod
rename to doc/crypto/engine.pod
diff --git a/crypto/openssl/doc/crypto/err.pod b/doc/crypto/err.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/err.pod
rename to doc/crypto/err.pod
diff --git a/crypto/openssl/doc/crypto/evp.pod b/doc/crypto/evp.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/evp.pod
rename to doc/crypto/evp.pod
diff --git a/crypto/openssl/doc/crypto/hmac.pod b/doc/crypto/hmac.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/hmac.pod
rename to doc/crypto/hmac.pod
diff --git a/crypto/openssl/doc/crypto/lh_stats.pod b/doc/crypto/lh_stats.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/lh_stats.pod
rename to doc/crypto/lh_stats.pod
diff --git a/crypto/openssl/doc/crypto/lhash.pod b/doc/crypto/lhash.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/lhash.pod
rename to doc/crypto/lhash.pod
diff --git a/crypto/openssl/doc/crypto/md5.pod b/doc/crypto/md5.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/md5.pod
rename to doc/crypto/md5.pod
diff --git a/crypto/openssl/doc/crypto/mdc2.pod b/doc/crypto/mdc2.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/mdc2.pod
rename to doc/crypto/mdc2.pod
diff --git a/crypto/openssl/doc/crypto/pem.pod b/doc/crypto/pem.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/pem.pod
rename to doc/crypto/pem.pod
diff --git a/crypto/openssl/doc/crypto/rand.pod b/doc/crypto/rand.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/rand.pod
rename to doc/crypto/rand.pod
diff --git a/crypto/openssl/doc/crypto/rc4.pod b/doc/crypto/rc4.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/rc4.pod
rename to doc/crypto/rc4.pod
diff --git a/crypto/openssl/doc/crypto/ripemd.pod b/doc/crypto/ripemd.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ripemd.pod
rename to doc/crypto/ripemd.pod
diff --git a/crypto/openssl/doc/crypto/rsa.pod b/doc/crypto/rsa.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/rsa.pod
rename to doc/crypto/rsa.pod
diff --git a/crypto/openssl/doc/crypto/sha.pod b/doc/crypto/sha.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/sha.pod
rename to doc/crypto/sha.pod
diff --git a/crypto/openssl/doc/crypto/threads.pod b/doc/crypto/threads.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/threads.pod
rename to doc/crypto/threads.pod
diff --git a/crypto/openssl/doc/crypto/ui.pod b/doc/crypto/ui.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ui.pod
rename to doc/crypto/ui.pod
diff --git a/crypto/openssl/doc/crypto/ui_compat.pod b/doc/crypto/ui_compat.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/ui_compat.pod
rename to doc/crypto/ui_compat.pod
diff --git a/crypto/openssl/doc/crypto/x509.pod b/doc/crypto/x509.pod
similarity index 100%
rename from crypto/openssl/doc/crypto/x509.pod
rename to doc/crypto/x509.pod
diff --git a/crypto/openssl/doc/fingerprints.txt b/doc/fingerprints.txt
similarity index 100%
rename from crypto/openssl/doc/fingerprints.txt
rename to doc/fingerprints.txt
diff --git a/crypto/openssl/doc/openssl-shared.txt b/doc/openssl-shared.txt
similarity index 100%
rename from crypto/openssl/doc/openssl-shared.txt
rename to doc/openssl-shared.txt
diff --git a/crypto/openssl/doc/openssl.txt b/doc/openssl.txt
similarity index 100%
rename from crypto/openssl/doc/openssl.txt
rename to doc/openssl.txt
diff --git a/crypto/openssl/doc/openssl_button.gif b/doc/openssl_button.gif
similarity index 100%
rename from crypto/openssl/doc/openssl_button.gif
rename to doc/openssl_button.gif
diff --git a/crypto/openssl/doc/openssl_button.html b/doc/openssl_button.html
similarity index 100%
rename from crypto/openssl/doc/openssl_button.html
rename to doc/openssl_button.html
diff --git a/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod b/doc/ssl/SSL_CIPHER_get_name.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod
rename to doc/ssl/SSL_CIPHER_get_name.pod
diff --git a/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/ssl/SSL_COMP_add_compression_method.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod
rename to doc/ssl/SSL_COMP_add_compression_method.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod b/doc/ssl/SSL_CTX_add_extra_chain_cert.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod
rename to doc/ssl/SSL_CTX_add_extra_chain_cert.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_add_session.pod b/doc/ssl/SSL_CTX_add_session.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_add_session.pod
rename to doc/ssl/SSL_CTX_add_session.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_ctrl.pod b/doc/ssl/SSL_CTX_ctrl.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_ctrl.pod
rename to doc/ssl/SSL_CTX_ctrl.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_flush_sessions.pod b/doc/ssl/SSL_CTX_flush_sessions.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_flush_sessions.pod
rename to doc/ssl/SSL_CTX_flush_sessions.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_free.pod b/doc/ssl/SSL_CTX_free.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_free.pod
rename to doc/ssl/SSL_CTX_free.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod b/doc/ssl/SSL_CTX_get_ex_new_index.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod
rename to doc/ssl/SSL_CTX_get_ex_new_index.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod b/doc/ssl/SSL_CTX_get_verify_mode.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod
rename to doc/ssl/SSL_CTX_get_verify_mode.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/ssl/SSL_CTX_load_verify_locations.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_load_verify_locations.pod
rename to doc/ssl/SSL_CTX_load_verify_locations.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_new.pod b/doc/ssl/SSL_CTX_new.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_new.pod
rename to doc/ssl/SSL_CTX_new.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_sess_number.pod b/doc/ssl/SSL_CTX_sess_number.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_sess_number.pod
rename to doc/ssl/SSL_CTX_sess_number.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_sess_set_cache_size.pod b/doc/ssl/SSL_CTX_sess_set_cache_size.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_sess_set_cache_size.pod
rename to doc/ssl/SSL_CTX_sess_set_cache_size.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod b/doc/ssl/SSL_CTX_sess_set_get_cb.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod
rename to doc/ssl/SSL_CTX_sess_set_get_cb.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_sessions.pod b/doc/ssl/SSL_CTX_sessions.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_sessions.pod
rename to doc/ssl/SSL_CTX_sessions.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod b/doc/ssl/SSL_CTX_set_cert_store.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod
rename to doc/ssl/SSL_CTX_set_cert_store.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_cert_verify_callback.pod b/doc/ssl/SSL_CTX_set_cert_verify_callback.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_cert_verify_callback.pod
rename to doc/ssl/SSL_CTX_set_cert_verify_callback.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_cipher_list.pod b/doc/ssl/SSL_CTX_set_cipher_list.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_cipher_list.pod
rename to doc/ssl/SSL_CTX_set_cipher_list.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/ssl/SSL_CTX_set_client_CA_list.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod
rename to doc/ssl/SSL_CTX_set_client_CA_list.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod b/doc/ssl/SSL_CTX_set_client_cert_cb.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod
rename to doc/ssl/SSL_CTX_set_client_cert_cb.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_default_passwd_cb.pod b/doc/ssl/SSL_CTX_set_default_passwd_cb.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_default_passwd_cb.pod
rename to doc/ssl/SSL_CTX_set_default_passwd_cb.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_generate_session_id.pod b/doc/ssl/SSL_CTX_set_generate_session_id.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_generate_session_id.pod
rename to doc/ssl/SSL_CTX_set_generate_session_id.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod b/doc/ssl/SSL_CTX_set_info_callback.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod
rename to doc/ssl/SSL_CTX_set_info_callback.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_max_cert_list.pod b/doc/ssl/SSL_CTX_set_max_cert_list.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_max_cert_list.pod
rename to doc/ssl/SSL_CTX_set_max_cert_list.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod b/doc/ssl/SSL_CTX_set_mode.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod
rename to doc/ssl/SSL_CTX_set_mode.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_msg_callback.pod b/doc/ssl/SSL_CTX_set_msg_callback.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_msg_callback.pod
rename to doc/ssl/SSL_CTX_set_msg_callback.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod b/doc/ssl/SSL_CTX_set_options.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
rename to doc/ssl/SSL_CTX_set_options.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod b/doc/ssl/SSL_CTX_set_quiet_shutdown.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod
rename to doc/ssl/SSL_CTX_set_quiet_shutdown.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_session_cache_mode.pod b/doc/ssl/SSL_CTX_set_session_cache_mode.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_session_cache_mode.pod
rename to doc/ssl/SSL_CTX_set_session_cache_mode.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/ssl/SSL_CTX_set_session_id_context.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod
rename to doc/ssl/SSL_CTX_set_session_id_context.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/ssl/SSL_CTX_set_ssl_version.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_ssl_version.pod
rename to doc/ssl/SSL_CTX_set_ssl_version.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_timeout.pod b/doc/ssl/SSL_CTX_set_timeout.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_timeout.pod
rename to doc/ssl/SSL_CTX_set_timeout.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod b/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
rename to doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod b/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod
rename to doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod b/doc/ssl/SSL_CTX_set_verify.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod
rename to doc/ssl/SSL_CTX_set_verify.pod
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod b/doc/ssl/SSL_CTX_use_certificate.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod
rename to doc/ssl/SSL_CTX_use_certificate.pod
diff --git a/crypto/openssl/doc/ssl/SSL_SESSION_free.pod b/doc/ssl/SSL_SESSION_free.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_SESSION_free.pod
rename to doc/ssl/SSL_SESSION_free.pod
diff --git a/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod b/doc/ssl/SSL_SESSION_get_ex_new_index.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod
rename to doc/ssl/SSL_SESSION_get_ex_new_index.pod
diff --git a/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod b/doc/ssl/SSL_SESSION_get_time.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod
rename to doc/ssl/SSL_SESSION_get_time.pod
diff --git a/crypto/openssl/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_accept.pod
rename to doc/ssl/SSL_accept.pod
diff --git a/crypto/openssl/doc/ssl/SSL_alert_type_string.pod b/doc/ssl/SSL_alert_type_string.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_alert_type_string.pod
rename to doc/ssl/SSL_alert_type_string.pod
diff --git a/crypto/openssl/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_clear.pod
rename to doc/ssl/SSL_clear.pod
diff --git a/crypto/openssl/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_connect.pod
rename to doc/ssl/SSL_connect.pod
diff --git a/crypto/openssl/doc/ssl/SSL_do_handshake.pod b/doc/ssl/SSL_do_handshake.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_do_handshake.pod
rename to doc/ssl/SSL_do_handshake.pod
diff --git a/crypto/openssl/doc/ssl/SSL_free.pod b/doc/ssl/SSL_free.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_free.pod
rename to doc/ssl/SSL_free.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod b/doc/ssl/SSL_get_SSL_CTX.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod
rename to doc/ssl/SSL_get_SSL_CTX.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_ciphers.pod b/doc/ssl/SSL_get_ciphers.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_ciphers.pod
rename to doc/ssl/SSL_get_ciphers.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod b/doc/ssl/SSL_get_client_CA_list.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod
rename to doc/ssl/SSL_get_client_CA_list.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod b/doc/ssl/SSL_get_current_cipher.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_current_cipher.pod
rename to doc/ssl/SSL_get_current_cipher.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod b/doc/ssl/SSL_get_default_timeout.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_default_timeout.pod
rename to doc/ssl/SSL_get_default_timeout.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_error.pod b/doc/ssl/SSL_get_error.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_error.pod
rename to doc/ssl/SSL_get_error.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod b/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
rename to doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod b/doc/ssl/SSL_get_ex_new_index.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod
rename to doc/ssl/SSL_get_ex_new_index.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_fd.pod b/doc/ssl/SSL_get_fd.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_fd.pod
rename to doc/ssl/SSL_get_fd.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod b/doc/ssl/SSL_get_peer_cert_chain.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod
rename to doc/ssl/SSL_get_peer_cert_chain.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod b/doc/ssl/SSL_get_peer_certificate.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod
rename to doc/ssl/SSL_get_peer_certificate.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_rbio.pod b/doc/ssl/SSL_get_rbio.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_rbio.pod
rename to doc/ssl/SSL_get_rbio.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_session.pod b/doc/ssl/SSL_get_session.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_session.pod
rename to doc/ssl/SSL_get_session.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_verify_result.pod b/doc/ssl/SSL_get_verify_result.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_verify_result.pod
rename to doc/ssl/SSL_get_verify_result.pod
diff --git a/crypto/openssl/doc/ssl/SSL_get_version.pod b/doc/ssl/SSL_get_version.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_get_version.pod
rename to doc/ssl/SSL_get_version.pod
diff --git a/crypto/openssl/doc/ssl/SSL_library_init.pod b/doc/ssl/SSL_library_init.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_library_init.pod
rename to doc/ssl/SSL_library_init.pod
diff --git a/crypto/openssl/doc/ssl/SSL_load_client_CA_file.pod b/doc/ssl/SSL_load_client_CA_file.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_load_client_CA_file.pod
rename to doc/ssl/SSL_load_client_CA_file.pod
diff --git a/crypto/openssl/doc/ssl/SSL_new.pod b/doc/ssl/SSL_new.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_new.pod
rename to doc/ssl/SSL_new.pod
diff --git a/crypto/openssl/doc/ssl/SSL_pending.pod b/doc/ssl/SSL_pending.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_pending.pod
rename to doc/ssl/SSL_pending.pod
diff --git a/crypto/openssl/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_read.pod
rename to doc/ssl/SSL_read.pod
diff --git a/crypto/openssl/doc/ssl/SSL_rstate_string.pod b/doc/ssl/SSL_rstate_string.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_rstate_string.pod
rename to doc/ssl/SSL_rstate_string.pod
diff --git a/crypto/openssl/doc/ssl/SSL_session_reused.pod b/doc/ssl/SSL_session_reused.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_session_reused.pod
rename to doc/ssl/SSL_session_reused.pod
diff --git a/crypto/openssl/doc/ssl/SSL_set_bio.pod b/doc/ssl/SSL_set_bio.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_set_bio.pod
rename to doc/ssl/SSL_set_bio.pod
diff --git a/crypto/openssl/doc/ssl/SSL_set_connect_state.pod b/doc/ssl/SSL_set_connect_state.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_set_connect_state.pod
rename to doc/ssl/SSL_set_connect_state.pod
diff --git a/crypto/openssl/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_set_fd.pod
rename to doc/ssl/SSL_set_fd.pod
diff --git a/crypto/openssl/doc/ssl/SSL_set_session.pod b/doc/ssl/SSL_set_session.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_set_session.pod
rename to doc/ssl/SSL_set_session.pod
diff --git a/crypto/openssl/doc/ssl/SSL_set_shutdown.pod b/doc/ssl/SSL_set_shutdown.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_set_shutdown.pod
rename to doc/ssl/SSL_set_shutdown.pod
diff --git a/crypto/openssl/doc/ssl/SSL_set_verify_result.pod b/doc/ssl/SSL_set_verify_result.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_set_verify_result.pod
rename to doc/ssl/SSL_set_verify_result.pod
diff --git a/crypto/openssl/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_shutdown.pod
rename to doc/ssl/SSL_shutdown.pod
diff --git a/crypto/openssl/doc/ssl/SSL_state_string.pod b/doc/ssl/SSL_state_string.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_state_string.pod
rename to doc/ssl/SSL_state_string.pod
diff --git a/crypto/openssl/doc/ssl/SSL_want.pod b/doc/ssl/SSL_want.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_want.pod
rename to doc/ssl/SSL_want.pod
diff --git a/crypto/openssl/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/SSL_write.pod
rename to doc/ssl/SSL_write.pod
diff --git a/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod b/doc/ssl/d2i_SSL_SESSION.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod
rename to doc/ssl/d2i_SSL_SESSION.pod
diff --git a/crypto/openssl/doc/ssl/ssl.pod b/doc/ssl/ssl.pod
similarity index 100%
rename from crypto/openssl/doc/ssl/ssl.pod
rename to doc/ssl/ssl.pod
diff --git a/crypto/openssl/doc/ssleay.txt b/doc/ssleay.txt
similarity index 100%
rename from crypto/openssl/doc/ssleay.txt
rename to doc/ssleay.txt
diff --git a/crypto/openssl/doc/standards.txt b/doc/standards.txt
similarity index 100%
rename from crypto/openssl/doc/standards.txt
rename to doc/standards.txt
diff --git a/crypto/openssl/e_os.h b/e_os.h
similarity index 100%
rename from crypto/openssl/e_os.h
rename to e_os.h
diff --git a/crypto/openssl/e_os2.h b/e_os2.h
similarity index 100%
rename from crypto/openssl/e_os2.h
rename to e_os2.h
diff --git a/crypto/openssl/engines/Makefile b/engines/Makefile
similarity index 100%
rename from crypto/openssl/engines/Makefile
rename to engines/Makefile
diff --git a/crypto/openssl/engines/axp.opt b/engines/axp.opt
similarity index 100%
rename from crypto/openssl/engines/axp.opt
rename to engines/axp.opt
diff --git a/crypto/openssl/engines/e_4758cca.c b/engines/e_4758cca.c
similarity index 100%
rename from crypto/openssl/engines/e_4758cca.c
rename to engines/e_4758cca.c
diff --git a/crypto/openssl/engines/e_4758cca.ec b/engines/e_4758cca.ec
similarity index 100%
rename from crypto/openssl/engines/e_4758cca.ec
rename to engines/e_4758cca.ec
diff --git a/crypto/openssl/engines/e_4758cca_err.c b/engines/e_4758cca_err.c
similarity index 100%
rename from crypto/openssl/engines/e_4758cca_err.c
rename to engines/e_4758cca_err.c
diff --git a/crypto/openssl/engines/e_4758cca_err.h b/engines/e_4758cca_err.h
similarity index 100%
rename from crypto/openssl/engines/e_4758cca_err.h
rename to engines/e_4758cca_err.h
diff --git a/crypto/openssl/engines/e_aep.c b/engines/e_aep.c
similarity index 100%
rename from crypto/openssl/engines/e_aep.c
rename to engines/e_aep.c
diff --git a/crypto/openssl/engines/e_aep.ec b/engines/e_aep.ec
similarity index 100%
rename from crypto/openssl/engines/e_aep.ec
rename to engines/e_aep.ec
diff --git a/crypto/openssl/engines/e_aep_err.c b/engines/e_aep_err.c
similarity index 100%
rename from crypto/openssl/engines/e_aep_err.c
rename to engines/e_aep_err.c
diff --git a/crypto/openssl/engines/e_aep_err.h b/engines/e_aep_err.h
similarity index 100%
rename from crypto/openssl/engines/e_aep_err.h
rename to engines/e_aep_err.h
diff --git a/crypto/openssl/engines/e_atalla.c b/engines/e_atalla.c
similarity index 100%
rename from crypto/openssl/engines/e_atalla.c
rename to engines/e_atalla.c
diff --git a/crypto/openssl/engines/e_atalla.ec b/engines/e_atalla.ec
similarity index 100%
rename from crypto/openssl/engines/e_atalla.ec
rename to engines/e_atalla.ec
diff --git a/crypto/openssl/engines/e_atalla_err.c b/engines/e_atalla_err.c
similarity index 100%
rename from crypto/openssl/engines/e_atalla_err.c
rename to engines/e_atalla_err.c
diff --git a/crypto/openssl/engines/e_atalla_err.h b/engines/e_atalla_err.h
similarity index 100%
rename from crypto/openssl/engines/e_atalla_err.h
rename to engines/e_atalla_err.h
diff --git a/crypto/openssl/engines/e_chil.c b/engines/e_chil.c
similarity index 100%
rename from crypto/openssl/engines/e_chil.c
rename to engines/e_chil.c
diff --git a/crypto/openssl/engines/e_chil.ec b/engines/e_chil.ec
similarity index 100%
rename from crypto/openssl/engines/e_chil.ec
rename to engines/e_chil.ec
diff --git a/crypto/openssl/engines/e_chil_err.c b/engines/e_chil_err.c
similarity index 100%
rename from crypto/openssl/engines/e_chil_err.c
rename to engines/e_chil_err.c
diff --git a/crypto/openssl/engines/e_chil_err.h b/engines/e_chil_err.h
similarity index 100%
rename from crypto/openssl/engines/e_chil_err.h
rename to engines/e_chil_err.h
diff --git a/crypto/openssl/engines/e_cswift.c b/engines/e_cswift.c
similarity index 100%
rename from crypto/openssl/engines/e_cswift.c
rename to engines/e_cswift.c
diff --git a/crypto/openssl/engines/e_cswift.ec b/engines/e_cswift.ec
similarity index 100%
rename from crypto/openssl/engines/e_cswift.ec
rename to engines/e_cswift.ec
diff --git a/crypto/openssl/engines/e_cswift_err.c b/engines/e_cswift_err.c
similarity index 100%
rename from crypto/openssl/engines/e_cswift_err.c
rename to engines/e_cswift_err.c
diff --git a/crypto/openssl/engines/e_cswift_err.h b/engines/e_cswift_err.h
similarity index 100%
rename from crypto/openssl/engines/e_cswift_err.h
rename to engines/e_cswift_err.h
diff --git a/crypto/openssl/engines/e_gmp.c b/engines/e_gmp.c
similarity index 100%
rename from crypto/openssl/engines/e_gmp.c
rename to engines/e_gmp.c
diff --git a/crypto/openssl/engines/e_gmp.ec b/engines/e_gmp.ec
similarity index 100%
rename from crypto/openssl/engines/e_gmp.ec
rename to engines/e_gmp.ec
diff --git a/crypto/openssl/engines/e_gmp_err.c b/engines/e_gmp_err.c
similarity index 100%
rename from crypto/openssl/engines/e_gmp_err.c
rename to engines/e_gmp_err.c
diff --git a/crypto/openssl/engines/e_gmp_err.h b/engines/e_gmp_err.h
similarity index 100%
rename from crypto/openssl/engines/e_gmp_err.h
rename to engines/e_gmp_err.h
diff --git a/crypto/openssl/engines/e_nuron.c b/engines/e_nuron.c
similarity index 100%
rename from crypto/openssl/engines/e_nuron.c
rename to engines/e_nuron.c
diff --git a/crypto/openssl/engines/e_nuron.ec b/engines/e_nuron.ec
similarity index 100%
rename from crypto/openssl/engines/e_nuron.ec
rename to engines/e_nuron.ec
diff --git a/crypto/openssl/engines/e_nuron_err.c b/engines/e_nuron_err.c
similarity index 100%
rename from crypto/openssl/engines/e_nuron_err.c
rename to engines/e_nuron_err.c
diff --git a/crypto/openssl/engines/e_nuron_err.h b/engines/e_nuron_err.h
similarity index 100%
rename from crypto/openssl/engines/e_nuron_err.h
rename to engines/e_nuron_err.h
diff --git a/crypto/openssl/engines/e_sureware.c b/engines/e_sureware.c
similarity index 100%
rename from crypto/openssl/engines/e_sureware.c
rename to engines/e_sureware.c
diff --git a/crypto/openssl/engines/e_sureware.ec b/engines/e_sureware.ec
similarity index 100%
rename from crypto/openssl/engines/e_sureware.ec
rename to engines/e_sureware.ec
diff --git a/crypto/openssl/engines/e_sureware_err.c b/engines/e_sureware_err.c
similarity index 100%
rename from crypto/openssl/engines/e_sureware_err.c
rename to engines/e_sureware_err.c
diff --git a/crypto/openssl/engines/e_sureware_err.h b/engines/e_sureware_err.h
similarity index 100%
rename from crypto/openssl/engines/e_sureware_err.h
rename to engines/e_sureware_err.h
diff --git a/crypto/openssl/engines/e_ubsec.c b/engines/e_ubsec.c
similarity index 100%
rename from crypto/openssl/engines/e_ubsec.c
rename to engines/e_ubsec.c
diff --git a/crypto/openssl/engines/e_ubsec.ec b/engines/e_ubsec.ec
similarity index 100%
rename from crypto/openssl/engines/e_ubsec.ec
rename to engines/e_ubsec.ec
diff --git a/crypto/openssl/engines/e_ubsec_err.c b/engines/e_ubsec_err.c
similarity index 100%
rename from crypto/openssl/engines/e_ubsec_err.c
rename to engines/e_ubsec_err.c
diff --git a/crypto/openssl/engines/e_ubsec_err.h b/engines/e_ubsec_err.h
similarity index 100%
rename from crypto/openssl/engines/e_ubsec_err.h
rename to engines/e_ubsec_err.h
diff --git a/crypto/openssl/engines/engine_vector.mar b/engines/engine_vector.mar
similarity index 100%
rename from crypto/openssl/engines/engine_vector.mar
rename to engines/engine_vector.mar
diff --git a/crypto/openssl/engines/vax.opt b/engines/vax.opt
similarity index 100%
rename from crypto/openssl/engines/vax.opt
rename to engines/vax.opt
diff --git a/crypto/openssl/engines/vendor_defns/aep.h b/engines/vendor_defns/aep.h
similarity index 100%
rename from crypto/openssl/engines/vendor_defns/aep.h
rename to engines/vendor_defns/aep.h
diff --git a/crypto/openssl/engines/vendor_defns/atalla.h b/engines/vendor_defns/atalla.h
similarity index 100%
rename from crypto/openssl/engines/vendor_defns/atalla.h
rename to engines/vendor_defns/atalla.h
diff --git a/crypto/openssl/engines/vendor_defns/cswift.h b/engines/vendor_defns/cswift.h
similarity index 100%
rename from crypto/openssl/engines/vendor_defns/cswift.h
rename to engines/vendor_defns/cswift.h
diff --git a/crypto/openssl/engines/vendor_defns/hw_4758_cca.h b/engines/vendor_defns/hw_4758_cca.h
similarity index 100%
rename from crypto/openssl/engines/vendor_defns/hw_4758_cca.h
rename to engines/vendor_defns/hw_4758_cca.h
diff --git a/crypto/openssl/engines/vendor_defns/hw_ubsec.h b/engines/vendor_defns/hw_ubsec.h
similarity index 100%
rename from crypto/openssl/engines/vendor_defns/hw_ubsec.h
rename to engines/vendor_defns/hw_ubsec.h
diff --git a/crypto/openssl/engines/vendor_defns/hwcryptohook.h b/engines/vendor_defns/hwcryptohook.h
similarity index 100%
rename from crypto/openssl/engines/vendor_defns/hwcryptohook.h
rename to engines/vendor_defns/hwcryptohook.h
diff --git a/crypto/openssl/engines/vendor_defns/sureware.h b/engines/vendor_defns/sureware.h
similarity index 100%
rename from crypto/openssl/engines/vendor_defns/sureware.h
rename to engines/vendor_defns/sureware.h
diff --git a/crypto/openssl/openssl.doxy b/openssl.doxy
similarity index 100%
rename from crypto/openssl/openssl.doxy
rename to openssl.doxy
diff --git a/crypto/openssl/openssl.spec b/openssl.spec
similarity index 100%
rename from crypto/openssl/openssl.spec
rename to openssl.spec
diff --git a/crypto/openssl/shlib/README b/shlib/README
similarity index 100%
rename from crypto/openssl/shlib/README
rename to shlib/README
diff --git a/crypto/openssl/ssl/Makefile b/ssl/Makefile
similarity index 100%
rename from crypto/openssl/ssl/Makefile
rename to ssl/Makefile
diff --git a/crypto/openssl/ssl/bio_ssl.c b/ssl/bio_ssl.c
similarity index 100%
rename from crypto/openssl/ssl/bio_ssl.c
rename to ssl/bio_ssl.c
diff --git a/crypto/openssl/ssl/d1_both.c b/ssl/d1_both.c
similarity index 100%
rename from crypto/openssl/ssl/d1_both.c
rename to ssl/d1_both.c
diff --git a/crypto/openssl/ssl/d1_clnt.c b/ssl/d1_clnt.c
similarity index 100%
rename from crypto/openssl/ssl/d1_clnt.c
rename to ssl/d1_clnt.c
diff --git a/crypto/openssl/ssl/d1_enc.c b/ssl/d1_enc.c
similarity index 100%
rename from crypto/openssl/ssl/d1_enc.c
rename to ssl/d1_enc.c
diff --git a/crypto/openssl/ssl/d1_lib.c b/ssl/d1_lib.c
similarity index 100%
rename from crypto/openssl/ssl/d1_lib.c
rename to ssl/d1_lib.c
diff --git a/crypto/openssl/ssl/d1_meth.c b/ssl/d1_meth.c
similarity index 100%
rename from crypto/openssl/ssl/d1_meth.c
rename to ssl/d1_meth.c
diff --git a/crypto/openssl/ssl/d1_pkt.c b/ssl/d1_pkt.c
similarity index 100%
rename from crypto/openssl/ssl/d1_pkt.c
rename to ssl/d1_pkt.c
diff --git a/crypto/openssl/ssl/d1_srvr.c b/ssl/d1_srvr.c
similarity index 100%
rename from crypto/openssl/ssl/d1_srvr.c
rename to ssl/d1_srvr.c
diff --git a/crypto/openssl/ssl/dtls1.h b/ssl/dtls1.h
similarity index 100%
rename from crypto/openssl/ssl/dtls1.h
rename to ssl/dtls1.h
diff --git a/crypto/openssl/ssl/kssl.c b/ssl/kssl.c
similarity index 100%
rename from crypto/openssl/ssl/kssl.c
rename to ssl/kssl.c
diff --git a/crypto/openssl/ssl/kssl.h b/ssl/kssl.h
similarity index 100%
rename from crypto/openssl/ssl/kssl.h
rename to ssl/kssl.h
diff --git a/crypto/openssl/ssl/kssl_lcl.h b/ssl/kssl_lcl.h
similarity index 100%
rename from crypto/openssl/ssl/kssl_lcl.h
rename to ssl/kssl_lcl.h
diff --git a/crypto/openssl/ssl/s23_clnt.c b/ssl/s23_clnt.c
similarity index 100%
rename from crypto/openssl/ssl/s23_clnt.c
rename to ssl/s23_clnt.c
diff --git a/crypto/openssl/ssl/s23_lib.c b/ssl/s23_lib.c
similarity index 100%
rename from crypto/openssl/ssl/s23_lib.c
rename to ssl/s23_lib.c
diff --git a/crypto/openssl/ssl/s23_meth.c b/ssl/s23_meth.c
similarity index 100%
rename from crypto/openssl/ssl/s23_meth.c
rename to ssl/s23_meth.c
diff --git a/crypto/openssl/ssl/s23_pkt.c b/ssl/s23_pkt.c
similarity index 100%
rename from crypto/openssl/ssl/s23_pkt.c
rename to ssl/s23_pkt.c
diff --git a/crypto/openssl/ssl/s23_srvr.c b/ssl/s23_srvr.c
similarity index 100%
rename from crypto/openssl/ssl/s23_srvr.c
rename to ssl/s23_srvr.c
diff --git a/crypto/openssl/ssl/s2_clnt.c b/ssl/s2_clnt.c
similarity index 100%
rename from crypto/openssl/ssl/s2_clnt.c
rename to ssl/s2_clnt.c
diff --git a/crypto/openssl/ssl/s2_enc.c b/ssl/s2_enc.c
similarity index 100%
rename from crypto/openssl/ssl/s2_enc.c
rename to ssl/s2_enc.c
diff --git a/crypto/openssl/ssl/s2_lib.c b/ssl/s2_lib.c
similarity index 100%
rename from crypto/openssl/ssl/s2_lib.c
rename to ssl/s2_lib.c
diff --git a/crypto/openssl/ssl/s2_meth.c b/ssl/s2_meth.c
similarity index 100%
rename from crypto/openssl/ssl/s2_meth.c
rename to ssl/s2_meth.c
diff --git a/crypto/openssl/ssl/s2_pkt.c b/ssl/s2_pkt.c
similarity index 100%
rename from crypto/openssl/ssl/s2_pkt.c
rename to ssl/s2_pkt.c
diff --git a/crypto/openssl/ssl/s2_srvr.c b/ssl/s2_srvr.c
similarity index 100%
rename from crypto/openssl/ssl/s2_srvr.c
rename to ssl/s2_srvr.c
diff --git a/crypto/openssl/ssl/s3_both.c b/ssl/s3_both.c
similarity index 100%
rename from crypto/openssl/ssl/s3_both.c
rename to ssl/s3_both.c
diff --git a/crypto/openssl/ssl/s3_clnt.c b/ssl/s3_clnt.c
similarity index 100%
rename from crypto/openssl/ssl/s3_clnt.c
rename to ssl/s3_clnt.c
diff --git a/crypto/openssl/ssl/s3_enc.c b/ssl/s3_enc.c
similarity index 100%
rename from crypto/openssl/ssl/s3_enc.c
rename to ssl/s3_enc.c
diff --git a/crypto/openssl/ssl/s3_lib.c b/ssl/s3_lib.c
similarity index 100%
rename from crypto/openssl/ssl/s3_lib.c
rename to ssl/s3_lib.c
diff --git a/crypto/openssl/ssl/s3_meth.c b/ssl/s3_meth.c
similarity index 100%
rename from crypto/openssl/ssl/s3_meth.c
rename to ssl/s3_meth.c
diff --git a/crypto/openssl/ssl/s3_pkt.c b/ssl/s3_pkt.c
similarity index 100%
rename from crypto/openssl/ssl/s3_pkt.c
rename to ssl/s3_pkt.c
diff --git a/crypto/openssl/ssl/s3_srvr.c b/ssl/s3_srvr.c
similarity index 100%
rename from crypto/openssl/ssl/s3_srvr.c
rename to ssl/s3_srvr.c
diff --git a/crypto/openssl/ssl/ssl.h b/ssl/ssl.h
similarity index 100%
rename from crypto/openssl/ssl/ssl.h
rename to ssl/ssl.h
diff --git a/crypto/openssl/ssl/ssl2.h b/ssl/ssl2.h
similarity index 100%
rename from crypto/openssl/ssl/ssl2.h
rename to ssl/ssl2.h
diff --git a/crypto/openssl/ssl/ssl23.h b/ssl/ssl23.h
similarity index 100%
rename from crypto/openssl/ssl/ssl23.h
rename to ssl/ssl23.h
diff --git a/crypto/openssl/ssl/ssl3.h b/ssl/ssl3.h
similarity index 100%
rename from crypto/openssl/ssl/ssl3.h
rename to ssl/ssl3.h
diff --git a/crypto/openssl/ssl/ssl_algs.c b/ssl/ssl_algs.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_algs.c
rename to ssl/ssl_algs.c
diff --git a/crypto/openssl/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_asn1.c
rename to ssl/ssl_asn1.c
diff --git a/crypto/openssl/ssl/ssl_cert.c b/ssl/ssl_cert.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_cert.c
rename to ssl/ssl_cert.c
diff --git a/crypto/openssl/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_ciph.c
rename to ssl/ssl_ciph.c
diff --git a/crypto/openssl/ssl/ssl_err.c b/ssl/ssl_err.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_err.c
rename to ssl/ssl_err.c
diff --git a/crypto/openssl/ssl/ssl_err2.c b/ssl/ssl_err2.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_err2.c
rename to ssl/ssl_err2.c
diff --git a/crypto/openssl/ssl/ssl_lib.c b/ssl/ssl_lib.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_lib.c
rename to ssl/ssl_lib.c
diff --git a/crypto/openssl/ssl/ssl_locl.h b/ssl/ssl_locl.h
similarity index 100%
rename from crypto/openssl/ssl/ssl_locl.h
rename to ssl/ssl_locl.h
diff --git a/crypto/openssl/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_rsa.c
rename to ssl/ssl_rsa.c
diff --git a/crypto/openssl/ssl/ssl_sess.c b/ssl/ssl_sess.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_sess.c
rename to ssl/ssl_sess.c
diff --git a/crypto/openssl/ssl/ssl_stat.c b/ssl/ssl_stat.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_stat.c
rename to ssl/ssl_stat.c
diff --git a/crypto/openssl/ssl/ssl_task.c b/ssl/ssl_task.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_task.c
rename to ssl/ssl_task.c
diff --git a/crypto/openssl/ssl/ssl_txt.c b/ssl/ssl_txt.c
similarity index 100%
rename from crypto/openssl/ssl/ssl_txt.c
rename to ssl/ssl_txt.c
diff --git a/crypto/openssl/ssl/ssltest.c b/ssl/ssltest.c
similarity index 100%
rename from crypto/openssl/ssl/ssltest.c
rename to ssl/ssltest.c
diff --git a/crypto/openssl/ssl/t1_clnt.c b/ssl/t1_clnt.c
similarity index 100%
rename from crypto/openssl/ssl/t1_clnt.c
rename to ssl/t1_clnt.c
diff --git a/crypto/openssl/ssl/t1_enc.c b/ssl/t1_enc.c
similarity index 100%
rename from crypto/openssl/ssl/t1_enc.c
rename to ssl/t1_enc.c
diff --git a/crypto/openssl/ssl/t1_lib.c b/ssl/t1_lib.c
similarity index 100%
rename from crypto/openssl/ssl/t1_lib.c
rename to ssl/t1_lib.c
diff --git a/crypto/openssl/ssl/t1_meth.c b/ssl/t1_meth.c
similarity index 100%
rename from crypto/openssl/ssl/t1_meth.c
rename to ssl/t1_meth.c
diff --git a/crypto/openssl/ssl/t1_srvr.c b/ssl/t1_srvr.c
similarity index 100%
rename from crypto/openssl/ssl/t1_srvr.c
rename to ssl/t1_srvr.c
diff --git a/crypto/openssl/ssl/tls1.h b/ssl/tls1.h
similarity index 100%
rename from crypto/openssl/ssl/tls1.h
rename to ssl/tls1.h
diff --git a/crypto/openssl/test/CAss.cnf b/test/CAss.cnf
similarity index 100%
rename from crypto/openssl/test/CAss.cnf
rename to test/CAss.cnf
diff --git a/crypto/openssl/test/CAssdh.cnf b/test/CAssdh.cnf
similarity index 100%
rename from crypto/openssl/test/CAssdh.cnf
rename to test/CAssdh.cnf
diff --git a/crypto/openssl/test/CAssdsa.cnf b/test/CAssdsa.cnf
similarity index 100%
rename from crypto/openssl/test/CAssdsa.cnf
rename to test/CAssdsa.cnf
diff --git a/crypto/openssl/test/CAssrsa.cnf b/test/CAssrsa.cnf
similarity index 100%
rename from crypto/openssl/test/CAssrsa.cnf
rename to test/CAssrsa.cnf
diff --git a/crypto/openssl/test/Makefile b/test/Makefile
similarity index 100%
rename from crypto/openssl/test/Makefile
rename to test/Makefile
diff --git a/crypto/openssl/test/P1ss.cnf b/test/P1ss.cnf
similarity index 100%
rename from crypto/openssl/test/P1ss.cnf
rename to test/P1ss.cnf
diff --git a/crypto/openssl/test/P2ss.cnf b/test/P2ss.cnf
similarity index 100%
rename from crypto/openssl/test/P2ss.cnf
rename to test/P2ss.cnf
diff --git a/crypto/openssl/test/Sssdsa.cnf b/test/Sssdsa.cnf
similarity index 100%
rename from crypto/openssl/test/Sssdsa.cnf
rename to test/Sssdsa.cnf
diff --git a/crypto/openssl/test/Sssrsa.cnf b/test/Sssrsa.cnf
similarity index 100%
rename from crypto/openssl/test/Sssrsa.cnf
rename to test/Sssrsa.cnf
diff --git a/crypto/openssl/test/Uss.cnf b/test/Uss.cnf
similarity index 100%
rename from crypto/openssl/test/Uss.cnf
rename to test/Uss.cnf
diff --git a/crypto/openssl/test/VMSca-response.1 b/test/VMSca-response.1
similarity index 100%
rename from crypto/openssl/test/VMSca-response.1
rename to test/VMSca-response.1
diff --git a/crypto/openssl/test/VMSca-response.2 b/test/VMSca-response.2
similarity index 100%
rename from crypto/openssl/test/VMSca-response.2
rename to test/VMSca-response.2
diff --git a/crypto/openssl/test/bctest b/test/bctest
similarity index 100%
rename from crypto/openssl/test/bctest
rename to test/bctest
diff --git a/crypto/openssl/test/dummytest.c b/test/dummytest.c
similarity index 100%
rename from crypto/openssl/test/dummytest.c
rename to test/dummytest.c
diff --git a/crypto/openssl/test/evptests.txt b/test/evptests.txt
similarity index 100%
rename from crypto/openssl/test/evptests.txt
rename to test/evptests.txt
diff --git a/crypto/openssl/test/igetest.c b/test/igetest.c
similarity index 100%
rename from crypto/openssl/test/igetest.c
rename to test/igetest.c
diff --git a/crypto/openssl/test/methtest.c b/test/methtest.c
similarity index 100%
rename from crypto/openssl/test/methtest.c
rename to test/methtest.c
diff --git a/crypto/openssl/test/pkcs7-1.pem b/test/pkcs7-1.pem
similarity index 100%
rename from crypto/openssl/test/pkcs7-1.pem
rename to test/pkcs7-1.pem
diff --git a/crypto/openssl/test/pkcs7.pem b/test/pkcs7.pem
similarity index 100%
rename from crypto/openssl/test/pkcs7.pem
rename to test/pkcs7.pem
diff --git a/crypto/openssl/test/r160test.c b/test/r160test.c
similarity index 100%
rename from crypto/openssl/test/r160test.c
rename to test/r160test.c
diff --git a/crypto/openssl/test/tcrl b/test/tcrl
similarity index 100%
rename from crypto/openssl/test/tcrl
rename to test/tcrl
diff --git a/crypto/openssl/test/test.cnf b/test/test.cnf
similarity index 100%
rename from crypto/openssl/test/test.cnf
rename to test/test.cnf
diff --git a/crypto/openssl/test/testca b/test/testca
similarity index 100%
rename from crypto/openssl/test/testca
rename to test/testca
diff --git a/crypto/openssl/test/testcrl.pem b/test/testcrl.pem
similarity index 100%
rename from crypto/openssl/test/testcrl.pem
rename to test/testcrl.pem
diff --git a/crypto/openssl/test/testenc b/test/testenc
similarity index 100%
rename from crypto/openssl/test/testenc
rename to test/testenc
diff --git a/crypto/openssl/test/testfipsssl b/test/testfipsssl
similarity index 100%
rename from crypto/openssl/test/testfipsssl
rename to test/testfipsssl
diff --git a/crypto/openssl/test/testgen b/test/testgen
similarity index 100%
rename from crypto/openssl/test/testgen
rename to test/testgen
diff --git a/crypto/openssl/test/testp7.pem b/test/testp7.pem
similarity index 100%
rename from crypto/openssl/test/testp7.pem
rename to test/testp7.pem
diff --git a/crypto/openssl/test/testreq2.pem b/test/testreq2.pem
similarity index 100%
rename from crypto/openssl/test/testreq2.pem
rename to test/testreq2.pem
diff --git a/crypto/openssl/test/testrsa.pem b/test/testrsa.pem
similarity index 100%
rename from crypto/openssl/test/testrsa.pem
rename to test/testrsa.pem
diff --git a/crypto/openssl/test/testsid.pem b/test/testsid.pem
similarity index 100%
rename from crypto/openssl/test/testsid.pem
rename to test/testsid.pem
diff --git a/crypto/openssl/test/testss b/test/testss
similarity index 100%
rename from crypto/openssl/test/testss
rename to test/testss
diff --git a/crypto/openssl/test/testssl b/test/testssl
similarity index 100%
rename from crypto/openssl/test/testssl
rename to test/testssl
diff --git a/crypto/openssl/test/testsslproxy b/test/testsslproxy
similarity index 100%
rename from crypto/openssl/test/testsslproxy
rename to test/testsslproxy
diff --git a/crypto/openssl/test/testx509.pem b/test/testx509.pem
similarity index 100%
rename from crypto/openssl/test/testx509.pem
rename to test/testx509.pem
diff --git a/crypto/openssl/test/times b/test/times
similarity index 100%
rename from crypto/openssl/test/times
rename to test/times
diff --git a/crypto/openssl/test/tpkcs7 b/test/tpkcs7
similarity index 100%
rename from crypto/openssl/test/tpkcs7
rename to test/tpkcs7
diff --git a/crypto/openssl/test/tpkcs7d b/test/tpkcs7d
similarity index 100%
rename from crypto/openssl/test/tpkcs7d
rename to test/tpkcs7d
diff --git a/crypto/openssl/test/treq b/test/treq
similarity index 100%
rename from crypto/openssl/test/treq
rename to test/treq
diff --git a/crypto/openssl/test/trsa b/test/trsa
similarity index 100%
rename from crypto/openssl/test/trsa
rename to test/trsa
diff --git a/crypto/openssl/test/tsid b/test/tsid
similarity index 100%
rename from crypto/openssl/test/tsid
rename to test/tsid
diff --git a/crypto/openssl/test/tx509 b/test/tx509
similarity index 100%
rename from crypto/openssl/test/tx509
rename to test/tx509
diff --git a/crypto/openssl/test/v3-cert1.pem b/test/v3-cert1.pem
similarity index 100%
rename from crypto/openssl/test/v3-cert1.pem
rename to test/v3-cert1.pem
diff --git a/crypto/openssl/test/v3-cert2.pem b/test/v3-cert2.pem
similarity index 100%
rename from crypto/openssl/test/v3-cert2.pem
rename to test/v3-cert2.pem
diff --git a/crypto/openssl/times/090/586-100.nt b/times/090/586-100.nt
similarity index 100%
rename from crypto/openssl/times/090/586-100.nt
rename to times/090/586-100.nt
diff --git a/crypto/openssl/times/091/486-50.nt b/times/091/486-50.nt
similarity index 100%
rename from crypto/openssl/times/091/486-50.nt
rename to times/091/486-50.nt
diff --git a/crypto/openssl/times/091/586-100.lnx b/times/091/586-100.lnx
similarity index 100%
rename from crypto/openssl/times/091/586-100.lnx
rename to times/091/586-100.lnx
diff --git a/crypto/openssl/times/091/68000.bsd b/times/091/68000.bsd
similarity index 100%
rename from crypto/openssl/times/091/68000.bsd
rename to times/091/68000.bsd
diff --git a/crypto/openssl/times/091/686-200.lnx b/times/091/686-200.lnx
similarity index 100%
rename from crypto/openssl/times/091/686-200.lnx
rename to times/091/686-200.lnx
diff --git a/crypto/openssl/times/091/alpha064.osf b/times/091/alpha064.osf
similarity index 100%
rename from crypto/openssl/times/091/alpha064.osf
rename to times/091/alpha064.osf
diff --git a/crypto/openssl/times/091/alpha164.lnx b/times/091/alpha164.lnx
similarity index 100%
rename from crypto/openssl/times/091/alpha164.lnx
rename to times/091/alpha164.lnx
diff --git a/crypto/openssl/times/091/alpha164.osf b/times/091/alpha164.osf
similarity index 100%
rename from crypto/openssl/times/091/alpha164.osf
rename to times/091/alpha164.osf
diff --git a/crypto/openssl/times/091/mips-rel.pl b/times/091/mips-rel.pl
similarity index 100%
rename from crypto/openssl/times/091/mips-rel.pl
rename to times/091/mips-rel.pl
diff --git a/crypto/openssl/times/091/r10000.irx b/times/091/r10000.irx
similarity index 100%
rename from crypto/openssl/times/091/r10000.irx
rename to times/091/r10000.irx
diff --git a/crypto/openssl/times/091/r3000.ult b/times/091/r3000.ult
similarity index 100%
rename from crypto/openssl/times/091/r3000.ult
rename to times/091/r3000.ult
diff --git a/crypto/openssl/times/091/r4400.irx b/times/091/r4400.irx
similarity index 100%
rename from crypto/openssl/times/091/r4400.irx
rename to times/091/r4400.irx
diff --git a/crypto/openssl/times/100.lnx b/times/100.lnx
similarity index 100%
rename from crypto/openssl/times/100.lnx
rename to times/100.lnx
diff --git a/crypto/openssl/times/100.nt b/times/100.nt
similarity index 100%
rename from crypto/openssl/times/100.nt
rename to times/100.nt
diff --git a/crypto/openssl/times/200.lnx b/times/200.lnx
similarity index 100%
rename from crypto/openssl/times/200.lnx
rename to times/200.lnx
diff --git a/crypto/openssl/times/486-66.dos b/times/486-66.dos
similarity index 100%
rename from crypto/openssl/times/486-66.dos
rename to times/486-66.dos
diff --git a/crypto/openssl/times/486-66.nt b/times/486-66.nt
similarity index 100%
rename from crypto/openssl/times/486-66.nt
rename to times/486-66.nt
diff --git a/crypto/openssl/times/486-66.w31 b/times/486-66.w31
similarity index 100%
rename from crypto/openssl/times/486-66.w31
rename to times/486-66.w31
diff --git a/crypto/openssl/times/5.lnx b/times/5.lnx
similarity index 100%
rename from crypto/openssl/times/5.lnx
rename to times/5.lnx
diff --git a/crypto/openssl/times/586-085i.nt b/times/586-085i.nt
similarity index 100%
rename from crypto/openssl/times/586-085i.nt
rename to times/586-085i.nt
diff --git a/crypto/openssl/times/586-100.LN3 b/times/586-100.LN3
similarity index 100%
rename from crypto/openssl/times/586-100.LN3
rename to times/586-100.LN3
diff --git a/crypto/openssl/times/586-100.NT2 b/times/586-100.NT2
similarity index 100%
rename from crypto/openssl/times/586-100.NT2
rename to times/586-100.NT2
diff --git a/crypto/openssl/times/586-100.dos b/times/586-100.dos
similarity index 100%
rename from crypto/openssl/times/586-100.dos
rename to times/586-100.dos
diff --git a/crypto/openssl/times/586-100.ln4 b/times/586-100.ln4
similarity index 100%
rename from crypto/openssl/times/586-100.ln4
rename to times/586-100.ln4
diff --git a/crypto/openssl/times/586-100.lnx b/times/586-100.lnx
similarity index 100%
rename from crypto/openssl/times/586-100.lnx
rename to times/586-100.lnx
diff --git a/crypto/openssl/times/586-100.nt b/times/586-100.nt
similarity index 100%
rename from crypto/openssl/times/586-100.nt
rename to times/586-100.nt
diff --git a/crypto/openssl/times/586-100.ntx b/times/586-100.ntx
similarity index 100%
rename from crypto/openssl/times/586-100.ntx
rename to times/586-100.ntx
diff --git a/crypto/openssl/times/586-100.w31 b/times/586-100.w31
similarity index 100%
rename from crypto/openssl/times/586-100.w31
rename to times/586-100.w31
diff --git a/crypto/openssl/times/586-1002.lnx b/times/586-1002.lnx
similarity index 100%
rename from crypto/openssl/times/586-1002.lnx
rename to times/586-1002.lnx
diff --git a/crypto/openssl/times/586p-100.lnx b/times/586p-100.lnx
similarity index 100%
rename from crypto/openssl/times/586p-100.lnx
rename to times/586p-100.lnx
diff --git a/crypto/openssl/times/686-200.bsd b/times/686-200.bsd
similarity index 100%
rename from crypto/openssl/times/686-200.bsd
rename to times/686-200.bsd
diff --git a/crypto/openssl/times/686-200.lnx b/times/686-200.lnx
similarity index 100%
rename from crypto/openssl/times/686-200.lnx
rename to times/686-200.lnx
diff --git a/crypto/openssl/times/686-200.nt b/times/686-200.nt
similarity index 100%
rename from crypto/openssl/times/686-200.nt
rename to times/686-200.nt
diff --git a/crypto/openssl/times/L1 b/times/L1
similarity index 100%
rename from crypto/openssl/times/L1
rename to times/L1
diff --git a/crypto/openssl/times/R10000.t b/times/R10000.t
similarity index 100%
rename from crypto/openssl/times/R10000.t
rename to times/R10000.t
diff --git a/crypto/openssl/times/R4400.t b/times/R4400.t
similarity index 100%
rename from crypto/openssl/times/R4400.t
rename to times/R4400.t
diff --git a/crypto/openssl/times/aix.t b/times/aix.t
similarity index 100%
rename from crypto/openssl/times/aix.t
rename to times/aix.t
diff --git a/crypto/openssl/times/aixold.t b/times/aixold.t
similarity index 100%
rename from crypto/openssl/times/aixold.t
rename to times/aixold.t
diff --git a/crypto/openssl/times/alpha.t b/times/alpha.t
similarity index 100%
rename from crypto/openssl/times/alpha.t
rename to times/alpha.t
diff --git a/crypto/openssl/times/alpha400.t b/times/alpha400.t
similarity index 100%
rename from crypto/openssl/times/alpha400.t
rename to times/alpha400.t
diff --git a/crypto/openssl/times/cyrix100.lnx b/times/cyrix100.lnx
similarity index 100%
rename from crypto/openssl/times/cyrix100.lnx
rename to times/cyrix100.lnx
diff --git a/crypto/openssl/times/dgux-x86.t b/times/dgux-x86.t
similarity index 100%
rename from crypto/openssl/times/dgux-x86.t
rename to times/dgux-x86.t
diff --git a/crypto/openssl/times/dgux.t b/times/dgux.t
similarity index 100%
rename from crypto/openssl/times/dgux.t
rename to times/dgux.t
diff --git a/crypto/openssl/times/hpux-acc.t b/times/hpux-acc.t
similarity index 100%
rename from crypto/openssl/times/hpux-acc.t
rename to times/hpux-acc.t
diff --git a/crypto/openssl/times/hpux-kr.t b/times/hpux-kr.t
similarity index 100%
rename from crypto/openssl/times/hpux-kr.t
rename to times/hpux-kr.t
diff --git a/crypto/openssl/times/hpux.t b/times/hpux.t
similarity index 100%
rename from crypto/openssl/times/hpux.t
rename to times/hpux.t
diff --git a/crypto/openssl/times/p2.w95 b/times/p2.w95
similarity index 100%
rename from crypto/openssl/times/p2.w95
rename to times/p2.w95
diff --git a/crypto/openssl/times/pent2.t b/times/pent2.t
similarity index 100%
rename from crypto/openssl/times/pent2.t
rename to times/pent2.t
diff --git a/crypto/openssl/times/readme b/times/readme
similarity index 100%
rename from crypto/openssl/times/readme
rename to times/readme
diff --git a/crypto/openssl/times/s586-100.lnx b/times/s586-100.lnx
similarity index 100%
rename from crypto/openssl/times/s586-100.lnx
rename to times/s586-100.lnx
diff --git a/crypto/openssl/times/s586-100.nt b/times/s586-100.nt
similarity index 100%
rename from crypto/openssl/times/s586-100.nt
rename to times/s586-100.nt
diff --git a/crypto/openssl/times/sgi.t b/times/sgi.t
similarity index 100%
rename from crypto/openssl/times/sgi.t
rename to times/sgi.t
diff --git a/crypto/openssl/times/sparc.t b/times/sparc.t
similarity index 100%
rename from crypto/openssl/times/sparc.t
rename to times/sparc.t
diff --git a/crypto/openssl/times/sparc2 b/times/sparc2
similarity index 100%
rename from crypto/openssl/times/sparc2
rename to times/sparc2
diff --git a/crypto/openssl/times/sparcLX.t b/times/sparcLX.t
similarity index 100%
rename from crypto/openssl/times/sparcLX.t
rename to times/sparcLX.t
diff --git a/crypto/openssl/times/usparc.t b/times/usparc.t
similarity index 100%
rename from crypto/openssl/times/usparc.t
rename to times/usparc.t
diff --git a/crypto/openssl/times/x86/bfs.cpp b/times/x86/bfs.cpp
similarity index 100%
rename from crypto/openssl/times/x86/bfs.cpp
rename to times/x86/bfs.cpp
diff --git a/crypto/openssl/times/x86/casts.cpp b/times/x86/casts.cpp
similarity index 100%
rename from crypto/openssl/times/x86/casts.cpp
rename to times/x86/casts.cpp
diff --git a/crypto/openssl/times/x86/des3s.cpp b/times/x86/des3s.cpp
similarity index 100%
rename from crypto/openssl/times/x86/des3s.cpp
rename to times/x86/des3s.cpp
diff --git a/crypto/openssl/times/x86/dess.cpp b/times/x86/dess.cpp
similarity index 100%
rename from crypto/openssl/times/x86/dess.cpp
rename to times/x86/dess.cpp
diff --git a/crypto/openssl/times/x86/md4s.cpp b/times/x86/md4s.cpp
similarity index 100%
rename from crypto/openssl/times/x86/md4s.cpp
rename to times/x86/md4s.cpp
diff --git a/crypto/openssl/times/x86/md5s.cpp b/times/x86/md5s.cpp
similarity index 100%
rename from crypto/openssl/times/x86/md5s.cpp
rename to times/x86/md5s.cpp
diff --git a/crypto/openssl/times/x86/rc4s.cpp b/times/x86/rc4s.cpp
similarity index 100%
rename from crypto/openssl/times/x86/rc4s.cpp
rename to times/x86/rc4s.cpp
diff --git a/crypto/openssl/times/x86/sha1s.cpp b/times/x86/sha1s.cpp
similarity index 100%
rename from crypto/openssl/times/x86/sha1s.cpp
rename to times/x86/sha1s.cpp
diff --git a/crypto/openssl/tools/Makefile b/tools/Makefile
similarity index 100%
rename from crypto/openssl/tools/Makefile
rename to tools/Makefile
diff --git a/crypto/openssl/tools/c89.sh b/tools/c89.sh
similarity index 100%
rename from crypto/openssl/tools/c89.sh
rename to tools/c89.sh
diff --git a/crypto/openssl/tools/c_hash b/tools/c_hash
similarity index 100%
rename from crypto/openssl/tools/c_hash
rename to tools/c_hash
diff --git a/crypto/openssl/tools/c_info b/tools/c_info
similarity index 100%
rename from crypto/openssl/tools/c_info
rename to tools/c_info
diff --git a/crypto/openssl/tools/c_issuer b/tools/c_issuer
similarity index 100%
rename from crypto/openssl/tools/c_issuer
rename to tools/c_issuer
diff --git a/crypto/openssl/tools/c_name b/tools/c_name
similarity index 100%
rename from crypto/openssl/tools/c_name
rename to tools/c_name
diff --git a/crypto/openssl/tools/c_rehash b/tools/c_rehash
similarity index 100%
rename from crypto/openssl/tools/c_rehash
rename to tools/c_rehash
diff --git a/crypto/openssl/tools/c_rehash.in b/tools/c_rehash.in
similarity index 100%
rename from crypto/openssl/tools/c_rehash.in
rename to tools/c_rehash.in
diff --git a/crypto/openssl/util/FreeBSD.sh b/util/FreeBSD.sh
similarity index 100%
rename from crypto/openssl/util/FreeBSD.sh
rename to util/FreeBSD.sh
diff --git a/crypto/openssl/util/add_cr.pl b/util/add_cr.pl
similarity index 100%
rename from crypto/openssl/util/add_cr.pl
rename to util/add_cr.pl
diff --git a/crypto/openssl/util/bat.sh b/util/bat.sh
similarity index 100%
rename from crypto/openssl/util/bat.sh
rename to util/bat.sh
diff --git a/crypto/openssl/util/ck_errf.pl b/util/ck_errf.pl
similarity index 100%
rename from crypto/openssl/util/ck_errf.pl
rename to util/ck_errf.pl
diff --git a/crypto/openssl/util/clean-depend.pl b/util/clean-depend.pl
similarity index 100%
rename from crypto/openssl/util/clean-depend.pl
rename to util/clean-depend.pl
diff --git a/crypto/openssl/util/copy.pl b/util/copy.pl
similarity index 100%
rename from crypto/openssl/util/copy.pl
rename to util/copy.pl
diff --git a/crypto/openssl/util/deleof.pl b/util/deleof.pl
similarity index 100%
rename from crypto/openssl/util/deleof.pl
rename to util/deleof.pl
diff --git a/crypto/openssl/util/dirname.pl b/util/dirname.pl
similarity index 100%
rename from crypto/openssl/util/dirname.pl
rename to util/dirname.pl
diff --git a/crypto/openssl/util/do_ms.sh b/util/do_ms.sh
similarity index 100%
rename from crypto/openssl/util/do_ms.sh
rename to util/do_ms.sh
diff --git a/crypto/openssl/util/domd b/util/domd
similarity index 100%
rename from crypto/openssl/util/domd
rename to util/domd
diff --git a/crypto/openssl/util/err-ins.pl b/util/err-ins.pl
similarity index 100%
rename from crypto/openssl/util/err-ins.pl
rename to util/err-ins.pl
diff --git a/crypto/openssl/util/extract-names.pl b/util/extract-names.pl
similarity index 100%
rename from crypto/openssl/util/extract-names.pl
rename to util/extract-names.pl
diff --git a/crypto/openssl/util/extract-section.pl b/util/extract-section.pl
similarity index 100%
rename from crypto/openssl/util/extract-section.pl
rename to util/extract-section.pl
diff --git a/crypto/openssl/util/files.pl b/util/files.pl
similarity index 100%
rename from crypto/openssl/util/files.pl
rename to util/files.pl
diff --git a/crypto/openssl/util/fixNT.sh b/util/fixNT.sh
similarity index 100%
rename from crypto/openssl/util/fixNT.sh
rename to util/fixNT.sh
diff --git a/crypto/openssl/util/install.sh b/util/install.sh
similarity index 100%
rename from crypto/openssl/util/install.sh
rename to util/install.sh
diff --git a/crypto/openssl/util/libeay.num b/util/libeay.num
similarity index 100%
rename from crypto/openssl/util/libeay.num
rename to util/libeay.num
diff --git a/crypto/openssl/util/mk1mf.pl b/util/mk1mf.pl
similarity index 100%
rename from crypto/openssl/util/mk1mf.pl
rename to util/mk1mf.pl
diff --git a/crypto/openssl/util/mkcerts.sh b/util/mkcerts.sh
similarity index 100%
rename from crypto/openssl/util/mkcerts.sh
rename to util/mkcerts.sh
diff --git a/crypto/openssl/util/mkdef.pl b/util/mkdef.pl
similarity index 100%
rename from crypto/openssl/util/mkdef.pl
rename to util/mkdef.pl
diff --git a/crypto/openssl/util/mkdir-p.pl b/util/mkdir-p.pl
similarity index 100%
rename from crypto/openssl/util/mkdir-p.pl
rename to util/mkdir-p.pl
diff --git a/crypto/openssl/util/mkerr.pl b/util/mkerr.pl
similarity index 100%
rename from crypto/openssl/util/mkerr.pl
rename to util/mkerr.pl
diff --git a/crypto/openssl/util/mkfiles.pl b/util/mkfiles.pl
similarity index 100%
rename from crypto/openssl/util/mkfiles.pl
rename to util/mkfiles.pl
diff --git a/crypto/openssl/util/mklink.pl b/util/mklink.pl
similarity index 100%
rename from crypto/openssl/util/mklink.pl
rename to util/mklink.pl
diff --git a/crypto/openssl/util/mkstack.pl b/util/mkstack.pl
similarity index 100%
rename from crypto/openssl/util/mkstack.pl
rename to util/mkstack.pl
diff --git a/crypto/openssl/util/opensslwrap.sh b/util/opensslwrap.sh
similarity index 100%
rename from crypto/openssl/util/opensslwrap.sh
rename to util/opensslwrap.sh
diff --git a/crypto/openssl/util/perlpath.pl b/util/perlpath.pl
similarity index 100%
rename from crypto/openssl/util/perlpath.pl
rename to util/perlpath.pl
diff --git a/crypto/openssl/util/pl/BC-16.pl b/util/pl/BC-16.pl
similarity index 100%
rename from crypto/openssl/util/pl/BC-16.pl
rename to util/pl/BC-16.pl
diff --git a/crypto/openssl/util/pl/BC-32.pl b/util/pl/BC-32.pl
similarity index 100%
rename from crypto/openssl/util/pl/BC-32.pl
rename to util/pl/BC-32.pl
diff --git a/crypto/openssl/util/pl/Mingw32.pl b/util/pl/Mingw32.pl
similarity index 100%
rename from crypto/openssl/util/pl/Mingw32.pl
rename to util/pl/Mingw32.pl
diff --git a/crypto/openssl/util/pl/OS2-EMX.pl b/util/pl/OS2-EMX.pl
similarity index 100%
rename from crypto/openssl/util/pl/OS2-EMX.pl
rename to util/pl/OS2-EMX.pl
diff --git a/crypto/openssl/util/pl/VC-16.pl b/util/pl/VC-16.pl
similarity index 100%
rename from crypto/openssl/util/pl/VC-16.pl
rename to util/pl/VC-16.pl
diff --git a/crypto/openssl/util/pl/VC-32.pl b/util/pl/VC-32.pl
similarity index 100%
rename from crypto/openssl/util/pl/VC-32.pl
rename to util/pl/VC-32.pl
diff --git a/crypto/openssl/util/pl/VC-CE.pl b/util/pl/VC-CE.pl
similarity index 100%
rename from crypto/openssl/util/pl/VC-CE.pl
rename to util/pl/VC-CE.pl
diff --git a/crypto/openssl/util/pl/linux.pl b/util/pl/linux.pl
similarity index 100%
rename from crypto/openssl/util/pl/linux.pl
rename to util/pl/linux.pl
diff --git a/crypto/openssl/util/pl/netware.pl b/util/pl/netware.pl
similarity index 100%
rename from crypto/openssl/util/pl/netware.pl
rename to util/pl/netware.pl
diff --git a/crypto/openssl/util/pl/ultrix.pl b/util/pl/ultrix.pl
similarity index 100%
rename from crypto/openssl/util/pl/ultrix.pl
rename to util/pl/ultrix.pl
diff --git a/crypto/openssl/util/pl/unix.pl b/util/pl/unix.pl
similarity index 100%
rename from crypto/openssl/util/pl/unix.pl
rename to util/pl/unix.pl
diff --git a/crypto/openssl/util/pod2man.pl b/util/pod2man.pl
similarity index 100%
rename from crypto/openssl/util/pod2man.pl
rename to util/pod2man.pl
diff --git a/crypto/openssl/util/pod2mantest b/util/pod2mantest
similarity index 100%
rename from crypto/openssl/util/pod2mantest
rename to util/pod2mantest
diff --git a/crypto/openssl/util/pod2mantest.pod b/util/pod2mantest.pod
similarity index 100%
rename from crypto/openssl/util/pod2mantest.pod
rename to util/pod2mantest.pod
diff --git a/crypto/openssl/util/point.sh b/util/point.sh
similarity index 100%
rename from crypto/openssl/util/point.sh
rename to util/point.sh
diff --git a/crypto/openssl/util/selftest.pl b/util/selftest.pl
similarity index 100%
rename from crypto/openssl/util/selftest.pl
rename to util/selftest.pl
diff --git a/crypto/openssl/util/shlib_wrap.sh b/util/shlib_wrap.sh
similarity index 100%
rename from crypto/openssl/util/shlib_wrap.sh
rename to util/shlib_wrap.sh
diff --git a/crypto/openssl/util/sp-diff.pl b/util/sp-diff.pl
similarity index 100%
rename from crypto/openssl/util/sp-diff.pl
rename to util/sp-diff.pl
diff --git a/crypto/openssl/util/speed.sh b/util/speed.sh
similarity index 100%
rename from crypto/openssl/util/speed.sh
rename to util/speed.sh
diff --git a/crypto/openssl/util/src-dep.pl b/util/src-dep.pl
similarity index 100%
rename from crypto/openssl/util/src-dep.pl
rename to util/src-dep.pl
diff --git a/crypto/openssl/util/ssleay.num b/util/ssleay.num
similarity index 100%
rename from crypto/openssl/util/ssleay.num
rename to util/ssleay.num
diff --git a/crypto/openssl/util/tab_num.pl b/util/tab_num.pl
similarity index 100%
rename from crypto/openssl/util/tab_num.pl
rename to util/tab_num.pl
diff --git a/crypto/openssl/util/x86asm.sh b/util/x86asm.sh
similarity index 100%
rename from crypto/openssl/util/x86asm.sh
rename to util/x86asm.sh