diff --git a/src/libfreeswan/libfreeswan/.cvsignore b/src/libfreeswan/freeswan/.cvsignore
similarity index 100%
rename from src/libfreeswan/libfreeswan/.cvsignore
rename to src/libfreeswan/freeswan/.cvsignore
diff --git a/src/libfreeswan/libfreeswan/Makefile b/src/libfreeswan/freeswan/Makefile
similarity index 100%
rename from src/libfreeswan/libfreeswan/Makefile
rename to src/libfreeswan/freeswan/Makefile
diff --git a/src/libfreeswan/libfreeswan/Makefile.objs b/src/libfreeswan/freeswan/Makefile.objs
similarity index 100%
rename from src/libfreeswan/libfreeswan/Makefile.objs
rename to src/libfreeswan/freeswan/Makefile.objs
diff --git a/src/libfreeswan/libfreeswan/addrtoa.c b/src/libfreeswan/freeswan/addrtoa.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/addrtoa.c
rename to src/libfreeswan/freeswan/addrtoa.c
diff --git a/src/libfreeswan/libfreeswan/addrtot.c b/src/libfreeswan/freeswan/addrtot.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/addrtot.c
rename to src/libfreeswan/freeswan/addrtot.c
diff --git a/src/libfreeswan/libfreeswan/addrtypeof.c b/src/libfreeswan/freeswan/addrtypeof.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/addrtypeof.c
rename to src/libfreeswan/freeswan/addrtypeof.c
diff --git a/src/libfreeswan/libfreeswan/anyaddr.3 b/src/libfreeswan/freeswan/anyaddr.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/anyaddr.3
rename to src/libfreeswan/freeswan/anyaddr.3
diff --git a/src/libfreeswan/libfreeswan/anyaddr.c b/src/libfreeswan/freeswan/anyaddr.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/anyaddr.c
rename to src/libfreeswan/freeswan/anyaddr.c
diff --git a/src/libfreeswan/libfreeswan/atoaddr.3 b/src/libfreeswan/freeswan/atoaddr.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/atoaddr.3
rename to src/libfreeswan/freeswan/atoaddr.3
diff --git a/src/libfreeswan/libfreeswan/atoaddr.c b/src/libfreeswan/freeswan/atoaddr.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/atoaddr.c
rename to src/libfreeswan/freeswan/atoaddr.c
diff --git a/src/libfreeswan/libfreeswan/atoasr.3 b/src/libfreeswan/freeswan/atoasr.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/atoasr.3
rename to src/libfreeswan/freeswan/atoasr.3
diff --git a/src/libfreeswan/libfreeswan/atoasr.c b/src/libfreeswan/freeswan/atoasr.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/atoasr.c
rename to src/libfreeswan/freeswan/atoasr.c
diff --git a/src/libfreeswan/libfreeswan/atosa.3 b/src/libfreeswan/freeswan/atosa.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/atosa.3
rename to src/libfreeswan/freeswan/atosa.3
diff --git a/src/libfreeswan/libfreeswan/atosa.c b/src/libfreeswan/freeswan/atosa.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/atosa.c
rename to src/libfreeswan/freeswan/atosa.c
diff --git a/src/libfreeswan/libfreeswan/atosubnet.c b/src/libfreeswan/freeswan/atosubnet.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/atosubnet.c
rename to src/libfreeswan/freeswan/atosubnet.c
diff --git a/src/libfreeswan/libfreeswan/atoul.3 b/src/libfreeswan/freeswan/atoul.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/atoul.3
rename to src/libfreeswan/freeswan/atoul.3
diff --git a/src/libfreeswan/libfreeswan/atoul.c b/src/libfreeswan/freeswan/atoul.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/atoul.c
rename to src/libfreeswan/freeswan/atoul.c
diff --git a/src/libfreeswan/libfreeswan/copyright.c b/src/libfreeswan/freeswan/copyright.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/copyright.c
rename to src/libfreeswan/freeswan/copyright.c
diff --git a/src/libfreeswan/libfreeswan/datatot.c b/src/libfreeswan/freeswan/datatot.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/datatot.c
rename to src/libfreeswan/freeswan/datatot.c
diff --git a/src/libfreeswan/libfreeswan/goodmask.3 b/src/libfreeswan/freeswan/goodmask.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/goodmask.3
rename to src/libfreeswan/freeswan/goodmask.3
diff --git a/src/libfreeswan/libfreeswan/goodmask.c b/src/libfreeswan/freeswan/goodmask.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/goodmask.c
rename to src/libfreeswan/freeswan/goodmask.c
diff --git a/src/libfreeswan/libfreeswan/initaddr.3 b/src/libfreeswan/freeswan/initaddr.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/initaddr.3
rename to src/libfreeswan/freeswan/initaddr.3
diff --git a/src/libfreeswan/libfreeswan/initaddr.c b/src/libfreeswan/freeswan/initaddr.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/initaddr.c
rename to src/libfreeswan/freeswan/initaddr.c
diff --git a/src/libfreeswan/libfreeswan/initsaid.c b/src/libfreeswan/freeswan/initsaid.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/initsaid.c
rename to src/libfreeswan/freeswan/initsaid.c
diff --git a/src/libfreeswan/libfreeswan/initsubnet.3 b/src/libfreeswan/freeswan/initsubnet.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/initsubnet.3
rename to src/libfreeswan/freeswan/initsubnet.3
diff --git a/src/libfreeswan/libfreeswan/initsubnet.c b/src/libfreeswan/freeswan/initsubnet.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/initsubnet.c
rename to src/libfreeswan/freeswan/initsubnet.c
diff --git a/src/libfreeswan/libfreeswan/internal.h b/src/libfreeswan/freeswan/internal.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/internal.h
rename to src/libfreeswan/freeswan/internal.h
diff --git a/src/libfreeswan/libfreeswan/ipcomp.h b/src/libfreeswan/freeswan/ipcomp.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipcomp.h
rename to src/libfreeswan/freeswan/ipcomp.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_ah.h b/src/libfreeswan/freeswan/ipsec_ah.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_ah.h
rename to src/libfreeswan/freeswan/ipsec_ah.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_alg.h b/src/libfreeswan/freeswan/ipsec_alg.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_alg.h
rename to src/libfreeswan/freeswan/ipsec_alg.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_encap.h b/src/libfreeswan/freeswan/ipsec_encap.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_encap.h
rename to src/libfreeswan/freeswan/ipsec_encap.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_eroute.h b/src/libfreeswan/freeswan/ipsec_eroute.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_eroute.h
rename to src/libfreeswan/freeswan/ipsec_eroute.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_errs.h b/src/libfreeswan/freeswan/ipsec_errs.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_errs.h
rename to src/libfreeswan/freeswan/ipsec_errs.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_esp.h b/src/libfreeswan/freeswan/ipsec_esp.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_esp.h
rename to src/libfreeswan/freeswan/ipsec_esp.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_ipe4.h b/src/libfreeswan/freeswan/ipsec_ipe4.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_ipe4.h
rename to src/libfreeswan/freeswan/ipsec_ipe4.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_kversion.h b/src/libfreeswan/freeswan/ipsec_kversion.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_kversion.h
rename to src/libfreeswan/freeswan/ipsec_kversion.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_life.h b/src/libfreeswan/freeswan/ipsec_life.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_life.h
rename to src/libfreeswan/freeswan/ipsec_life.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_md5h.h b/src/libfreeswan/freeswan/ipsec_md5h.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_md5h.h
rename to src/libfreeswan/freeswan/ipsec_md5h.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_param.h b/src/libfreeswan/freeswan/ipsec_param.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_param.h
rename to src/libfreeswan/freeswan/ipsec_param.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_policy.h b/src/libfreeswan/freeswan/ipsec_policy.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_policy.h
rename to src/libfreeswan/freeswan/ipsec_policy.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_proto.h b/src/libfreeswan/freeswan/ipsec_proto.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_proto.h
rename to src/libfreeswan/freeswan/ipsec_proto.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_radij.h b/src/libfreeswan/freeswan/ipsec_radij.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_radij.h
rename to src/libfreeswan/freeswan/ipsec_radij.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_rcv.h b/src/libfreeswan/freeswan/ipsec_rcv.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_rcv.h
rename to src/libfreeswan/freeswan/ipsec_rcv.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_sa.h b/src/libfreeswan/freeswan/ipsec_sa.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_sa.h
rename to src/libfreeswan/freeswan/ipsec_sa.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_sha1.h b/src/libfreeswan/freeswan/ipsec_sha1.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_sha1.h
rename to src/libfreeswan/freeswan/ipsec_sha1.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_stats.h b/src/libfreeswan/freeswan/ipsec_stats.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_stats.h
rename to src/libfreeswan/freeswan/ipsec_stats.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_tunnel.h b/src/libfreeswan/freeswan/ipsec_tunnel.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_tunnel.h
rename to src/libfreeswan/freeswan/ipsec_tunnel.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_xform.h b/src/libfreeswan/freeswan/ipsec_xform.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_xform.h
rename to src/libfreeswan/freeswan/ipsec_xform.h
diff --git a/src/libfreeswan/libfreeswan/ipsec_xmit.h b/src/libfreeswan/freeswan/ipsec_xmit.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/ipsec_xmit.h
rename to src/libfreeswan/freeswan/ipsec_xmit.h
diff --git a/src/libfreeswan/libfreeswan/keyblobtoid.3 b/src/libfreeswan/freeswan/keyblobtoid.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/keyblobtoid.3
rename to src/libfreeswan/freeswan/keyblobtoid.3
diff --git a/src/libfreeswan/libfreeswan/keyblobtoid.c b/src/libfreeswan/freeswan/keyblobtoid.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/keyblobtoid.c
rename to src/libfreeswan/freeswan/keyblobtoid.c
diff --git a/src/libfreeswan/libfreeswan/optionsfrom.3 b/src/libfreeswan/freeswan/optionsfrom.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/optionsfrom.3
rename to src/libfreeswan/freeswan/optionsfrom.3
diff --git a/src/libfreeswan/libfreeswan/optionsfrom.c b/src/libfreeswan/freeswan/optionsfrom.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/optionsfrom.c
rename to src/libfreeswan/freeswan/optionsfrom.c
diff --git a/src/libfreeswan/libfreeswan/pfkey_v2_build.c b/src/libfreeswan/freeswan/pfkey_v2_build.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/pfkey_v2_build.c
rename to src/libfreeswan/freeswan/pfkey_v2_build.c
diff --git a/src/libfreeswan/libfreeswan/pfkey_v2_debug.c b/src/libfreeswan/freeswan/pfkey_v2_debug.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/pfkey_v2_debug.c
rename to src/libfreeswan/freeswan/pfkey_v2_debug.c
diff --git a/src/libfreeswan/libfreeswan/pfkey_v2_ext_bits.c b/src/libfreeswan/freeswan/pfkey_v2_ext_bits.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/pfkey_v2_ext_bits.c
rename to src/libfreeswan/freeswan/pfkey_v2_ext_bits.c
diff --git a/src/libfreeswan/libfreeswan/pfkey_v2_parse.c b/src/libfreeswan/freeswan/pfkey_v2_parse.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/pfkey_v2_parse.c
rename to src/libfreeswan/freeswan/pfkey_v2_parse.c
diff --git a/src/libfreeswan/libfreeswan/portof.3 b/src/libfreeswan/freeswan/portof.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/portof.3
rename to src/libfreeswan/freeswan/portof.3
diff --git a/src/libfreeswan/libfreeswan/portof.c b/src/libfreeswan/freeswan/portof.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/portof.c
rename to src/libfreeswan/freeswan/portof.c
diff --git a/src/libfreeswan/libfreeswan/prng.3 b/src/libfreeswan/freeswan/prng.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/prng.3
rename to src/libfreeswan/freeswan/prng.3
diff --git a/src/libfreeswan/libfreeswan/prng.c b/src/libfreeswan/freeswan/prng.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/prng.c
rename to src/libfreeswan/freeswan/prng.c
diff --git a/src/libfreeswan/libfreeswan/radij.h b/src/libfreeswan/freeswan/radij.h
similarity index 100%
rename from src/libfreeswan/libfreeswan/radij.h
rename to src/libfreeswan/freeswan/radij.h
diff --git a/src/libfreeswan/libfreeswan/rangetoa.c b/src/libfreeswan/freeswan/rangetoa.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/rangetoa.c
rename to src/libfreeswan/freeswan/rangetoa.c
diff --git a/src/libfreeswan/libfreeswan/rangetosubnet.3 b/src/libfreeswan/freeswan/rangetosubnet.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/rangetosubnet.3
rename to src/libfreeswan/freeswan/rangetosubnet.3
diff --git a/src/libfreeswan/libfreeswan/rangetosubnet.c b/src/libfreeswan/freeswan/rangetosubnet.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/rangetosubnet.c
rename to src/libfreeswan/freeswan/rangetosubnet.c
diff --git a/src/libfreeswan/libfreeswan/sameaddr.3 b/src/libfreeswan/freeswan/sameaddr.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/sameaddr.3
rename to src/libfreeswan/freeswan/sameaddr.3
diff --git a/src/libfreeswan/libfreeswan/sameaddr.c b/src/libfreeswan/freeswan/sameaddr.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/sameaddr.c
rename to src/libfreeswan/freeswan/sameaddr.c
diff --git a/src/libfreeswan/libfreeswan/satoa.c b/src/libfreeswan/freeswan/satoa.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/satoa.c
rename to src/libfreeswan/freeswan/satoa.c
diff --git a/src/libfreeswan/libfreeswan/satot.c b/src/libfreeswan/freeswan/satot.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/satot.c
rename to src/libfreeswan/freeswan/satot.c
diff --git a/src/libfreeswan/libfreeswan/subnetof.3 b/src/libfreeswan/freeswan/subnetof.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/subnetof.3
rename to src/libfreeswan/freeswan/subnetof.3
diff --git a/src/libfreeswan/libfreeswan/subnetof.c b/src/libfreeswan/freeswan/subnetof.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/subnetof.c
rename to src/libfreeswan/freeswan/subnetof.c
diff --git a/src/libfreeswan/libfreeswan/subnettoa.c b/src/libfreeswan/freeswan/subnettoa.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/subnettoa.c
rename to src/libfreeswan/freeswan/subnettoa.c
diff --git a/src/libfreeswan/libfreeswan/subnettot.c b/src/libfreeswan/freeswan/subnettot.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/subnettot.c
rename to src/libfreeswan/freeswan/subnettot.c
diff --git a/src/libfreeswan/libfreeswan/subnettypeof.c b/src/libfreeswan/freeswan/subnettypeof.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/subnettypeof.c
rename to src/libfreeswan/freeswan/subnettypeof.c
diff --git a/src/libfreeswan/libfreeswan/ttoaddr.3 b/src/libfreeswan/freeswan/ttoaddr.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttoaddr.3
rename to src/libfreeswan/freeswan/ttoaddr.3
diff --git a/src/libfreeswan/libfreeswan/ttoaddr.c b/src/libfreeswan/freeswan/ttoaddr.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttoaddr.c
rename to src/libfreeswan/freeswan/ttoaddr.c
diff --git a/src/libfreeswan/libfreeswan/ttodata.3 b/src/libfreeswan/freeswan/ttodata.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttodata.3
rename to src/libfreeswan/freeswan/ttodata.3
diff --git a/src/libfreeswan/libfreeswan/ttodata.c b/src/libfreeswan/freeswan/ttodata.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttodata.c
rename to src/libfreeswan/freeswan/ttodata.c
diff --git a/src/libfreeswan/libfreeswan/ttoprotoport.c b/src/libfreeswan/freeswan/ttoprotoport.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttoprotoport.c
rename to src/libfreeswan/freeswan/ttoprotoport.c
diff --git a/src/libfreeswan/libfreeswan/ttosa.3 b/src/libfreeswan/freeswan/ttosa.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttosa.3
rename to src/libfreeswan/freeswan/ttosa.3
diff --git a/src/libfreeswan/libfreeswan/ttosa.c b/src/libfreeswan/freeswan/ttosa.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttosa.c
rename to src/libfreeswan/freeswan/ttosa.c
diff --git a/src/libfreeswan/libfreeswan/ttosubnet.c b/src/libfreeswan/freeswan/ttosubnet.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttosubnet.c
rename to src/libfreeswan/freeswan/ttosubnet.c
diff --git a/src/libfreeswan/libfreeswan/ttoul.3 b/src/libfreeswan/freeswan/ttoul.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttoul.3
rename to src/libfreeswan/freeswan/ttoul.3
diff --git a/src/libfreeswan/libfreeswan/ttoul.c b/src/libfreeswan/freeswan/ttoul.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/ttoul.c
rename to src/libfreeswan/freeswan/ttoul.c
diff --git a/src/libfreeswan/libfreeswan/ultoa.c b/src/libfreeswan/freeswan/ultoa.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/ultoa.c
rename to src/libfreeswan/freeswan/ultoa.c
diff --git a/src/libfreeswan/libfreeswan/ultot.c b/src/libfreeswan/freeswan/ultot.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/ultot.c
rename to src/libfreeswan/freeswan/ultot.c
diff --git a/src/libfreeswan/libfreeswan/version.3 b/src/libfreeswan/freeswan/version.3
similarity index 100%
rename from src/libfreeswan/libfreeswan/version.3
rename to src/libfreeswan/freeswan/version.3
diff --git a/src/libfreeswan/libfreeswan/version.in.c b/src/libfreeswan/freeswan/version.in.c
similarity index 100%
rename from src/libfreeswan/libfreeswan/version.in.c
rename to src/libfreeswan/freeswan/version.in.c
diff --git a/src/libfreeswan/libdes/.cvsignore b/src/libfreeswan/libcrypto/libdes/.cvsignore
similarity index 100%
rename from src/libfreeswan/libdes/.cvsignore
rename to src/libfreeswan/libcrypto/libdes/.cvsignore
diff --git a/src/libfreeswan/libdes/Makefile b/src/libfreeswan/libcrypto/libdes/Makefile
similarity index 97%
rename from src/libfreeswan/libdes/Makefile
rename to src/libfreeswan/libcrypto/libdes/Makefile
index e00bb0073..7b48beb19 100644
--- a/src/libfreeswan/libdes/Makefile
+++ b/src/libfreeswan/libcrypto/libdes/Makefile
@@ -1,13 +1,13 @@
-ifndef FREESWANSRCDIR
-FREESWANSRCDIR=../..
-endif
-
-include ${FREESWANSRCDIR}/Makefile.inc
-
-KLIPSD=${FREESWANSRCDIR}/linux
-SRCDIR=${KLIPSD}/crypto/ciphers/des
-
-VPATH =${SRCDIR}
+#ifndef FREESWANSRCDIR
+#FREESWANSRCDIR=../..
+#endif
+#
+#include ${FREESWANSRCDIR}/Makefile.inc
+#
+#KLIPSD=${FREESWANSRCDIR}/linux
+#SRCDIR=${KLIPSD}/crypto/ciphers/des
+#
+#VPATH =${SRCDIR}
 
 # You must select the correct terminal control system to be used to
 # turn character echo off when reading passwords.  There a 5 systems
diff --git a/src/libfreeswan/libdes/des.h b/src/libfreeswan/libcrypto/libdes/des.h
similarity index 100%
rename from src/libfreeswan/libdes/des.h
rename to src/libfreeswan/libcrypto/libdes/des.h
diff --git a/src/libfreeswan/libdes/des/COPYRIGHT b/src/libfreeswan/libcrypto/libdes/des/COPYRIGHT
similarity index 100%
rename from src/libfreeswan/libdes/des/COPYRIGHT
rename to src/libfreeswan/libcrypto/libdes/des/COPYRIGHT
diff --git a/src/libfreeswan/libdes/des/INSTALL b/src/libfreeswan/libcrypto/libdes/des/INSTALL
similarity index 100%
rename from src/libfreeswan/libdes/des/INSTALL
rename to src/libfreeswan/libcrypto/libdes/des/INSTALL
diff --git a/src/libfreeswan/libdes/des/Makefile.objs b/src/libfreeswan/libcrypto/libdes/des/Makefile.objs
similarity index 100%
rename from src/libfreeswan/libdes/des/Makefile.objs
rename to src/libfreeswan/libcrypto/libdes/des/Makefile.objs
diff --git a/src/libfreeswan/libdes/des/README b/src/libfreeswan/libcrypto/libdes/des/README
similarity index 100%
rename from src/libfreeswan/libdes/des/README
rename to src/libfreeswan/libcrypto/libdes/des/README
diff --git a/src/libfreeswan/libdes/des/README.freeswan b/src/libfreeswan/libcrypto/libdes/des/README.freeswan
similarity index 100%
rename from src/libfreeswan/libdes/des/README.freeswan
rename to src/libfreeswan/libcrypto/libdes/des/README.freeswan
diff --git a/src/libfreeswan/libdes/des/VERSION b/src/libfreeswan/libcrypto/libdes/des/VERSION
similarity index 100%
rename from src/libfreeswan/libdes/des/VERSION
rename to src/libfreeswan/libcrypto/libdes/des/VERSION
diff --git a/src/libfreeswan/libdes/des/asm/crypt586.pl b/src/libfreeswan/libcrypto/libdes/des/asm/crypt586.pl
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/crypt586.pl
rename to src/libfreeswan/libcrypto/libdes/des/asm/crypt586.pl
diff --git a/src/libfreeswan/libdes/des/asm/des-586.pl b/src/libfreeswan/libcrypto/libdes/des/asm/des-586.pl
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/des-586.pl
rename to src/libfreeswan/libcrypto/libdes/des/asm/des-586.pl
diff --git a/src/libfreeswan/libdes/des/asm/des686.pl b/src/libfreeswan/libcrypto/libdes/des/asm/des686.pl
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/des686.pl
rename to src/libfreeswan/libcrypto/libdes/des/asm/des686.pl
diff --git a/src/libfreeswan/libdes/des/asm/desboth.pl b/src/libfreeswan/libcrypto/libdes/des/asm/desboth.pl
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/desboth.pl
rename to src/libfreeswan/libcrypto/libdes/des/asm/desboth.pl
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/cbc.pl b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/cbc.pl
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/perlasm/cbc.pl
rename to src/libfreeswan/libcrypto/libdes/des/asm/perlasm/cbc.pl
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/readme b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/readme
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/perlasm/readme
rename to src/libfreeswan/libcrypto/libdes/des/asm/perlasm/readme
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/x86asm.pl b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86asm.pl
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/perlasm/x86asm.pl
rename to src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86asm.pl
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/x86ms.pl b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86ms.pl
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/perlasm/x86ms.pl
rename to src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86ms.pl
diff --git a/src/libfreeswan/libdes/des/asm/perlasm/x86unix.pl b/src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86unix.pl
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/perlasm/x86unix.pl
rename to src/libfreeswan/libcrypto/libdes/des/asm/perlasm/x86unix.pl
diff --git a/src/libfreeswan/libdes/des/asm/readme b/src/libfreeswan/libcrypto/libdes/des/asm/readme
similarity index 100%
rename from src/libfreeswan/libdes/des/asm/readme
rename to src/libfreeswan/libcrypto/libdes/des/asm/readme
diff --git a/src/libfreeswan/libdes/des/cbc_enc.c b/src/libfreeswan/libcrypto/libdes/des/cbc_enc.c
similarity index 100%
rename from src/libfreeswan/libdes/des/cbc_enc.c
rename to src/libfreeswan/libcrypto/libdes/des/cbc_enc.c
diff --git a/src/libfreeswan/libdes/des/des.doc b/src/libfreeswan/libcrypto/libdes/des/des.doc
similarity index 100%
rename from src/libfreeswan/libdes/des/des.doc
rename to src/libfreeswan/libcrypto/libdes/des/des.doc
diff --git a/src/libfreeswan/libdes/des/des_crypt.man b/src/libfreeswan/libcrypto/libdes/des/des_crypt.man
similarity index 100%
rename from src/libfreeswan/libdes/des/des_crypt.man
rename to src/libfreeswan/libcrypto/libdes/des/des_crypt.man
diff --git a/src/libfreeswan/libdes/des/des_enc.c b/src/libfreeswan/libcrypto/libdes/des/des_enc.c
similarity index 100%
rename from src/libfreeswan/libdes/des/des_enc.c
rename to src/libfreeswan/libcrypto/libdes/des/des_enc.c
diff --git a/src/libfreeswan/libdes/des/des_locl.h b/src/libfreeswan/libcrypto/libdes/des/des_locl.h
similarity index 100%
rename from src/libfreeswan/libdes/des/des_locl.h
rename to src/libfreeswan/libcrypto/libdes/des/des_locl.h
diff --git a/src/libfreeswan/libdes/des/des_opts.c b/src/libfreeswan/libcrypto/libdes/des/des_opts.c
similarity index 100%
rename from src/libfreeswan/libdes/des/des_opts.c
rename to src/libfreeswan/libcrypto/libdes/des/des_opts.c
diff --git a/src/libfreeswan/libdes/des/des_ver.h b/src/libfreeswan/libcrypto/libdes/des/des_ver.h
similarity index 100%
rename from src/libfreeswan/libdes/des/des_ver.h
rename to src/libfreeswan/libcrypto/libdes/des/des_ver.h
diff --git a/src/libfreeswan/libdes/des/destest.c b/src/libfreeswan/libcrypto/libdes/des/destest.c
similarity index 100%
rename from src/libfreeswan/libdes/des/destest.c
rename to src/libfreeswan/libcrypto/libdes/des/destest.c
diff --git a/src/libfreeswan/libdes/des/dx86unix.S b/src/libfreeswan/libcrypto/libdes/des/dx86unix.S
similarity index 100%
rename from src/libfreeswan/libdes/des/dx86unix.S
rename to src/libfreeswan/libcrypto/libdes/des/dx86unix.S
diff --git a/src/libfreeswan/libdes/des/ecb_enc.c b/src/libfreeswan/libcrypto/libdes/des/ecb_enc.c
similarity index 100%
rename from src/libfreeswan/libdes/des/ecb_enc.c
rename to src/libfreeswan/libcrypto/libdes/des/ecb_enc.c
diff --git a/src/libfreeswan/libdes/des/fcrypt.c b/src/libfreeswan/libcrypto/libdes/des/fcrypt.c
similarity index 100%
rename from src/libfreeswan/libdes/des/fcrypt.c
rename to src/libfreeswan/libcrypto/libdes/des/fcrypt.c
diff --git a/src/libfreeswan/libdes/des/fcrypt_b.c b/src/libfreeswan/libcrypto/libdes/des/fcrypt_b.c
similarity index 100%
rename from src/libfreeswan/libdes/des/fcrypt_b.c
rename to src/libfreeswan/libcrypto/libdes/des/fcrypt_b.c
diff --git a/src/libfreeswan/libdes/des/options.txt b/src/libfreeswan/libcrypto/libdes/des/options.txt
similarity index 100%
rename from src/libfreeswan/libdes/des/options.txt
rename to src/libfreeswan/libcrypto/libdes/des/options.txt
diff --git a/src/libfreeswan/libdes/des/podd.h b/src/libfreeswan/libcrypto/libdes/des/podd.h
similarity index 100%
rename from src/libfreeswan/libdes/des/podd.h
rename to src/libfreeswan/libcrypto/libdes/des/podd.h
diff --git a/src/libfreeswan/libdes/des/set_key.c b/src/libfreeswan/libcrypto/libdes/des/set_key.c
similarity index 100%
rename from src/libfreeswan/libdes/des/set_key.c
rename to src/libfreeswan/libcrypto/libdes/des/set_key.c
diff --git a/src/libfreeswan/libdes/des/sk.h b/src/libfreeswan/libcrypto/libdes/des/sk.h
similarity index 100%
rename from src/libfreeswan/libdes/des/sk.h
rename to src/libfreeswan/libcrypto/libdes/des/sk.h
diff --git a/src/libfreeswan/libdes/des/speed.c b/src/libfreeswan/libcrypto/libdes/des/speed.c
similarity index 100%
rename from src/libfreeswan/libdes/des/speed.c
rename to src/libfreeswan/libcrypto/libdes/des/speed.c
diff --git a/src/libfreeswan/libdes/des/spr.h b/src/libfreeswan/libcrypto/libdes/des/spr.h
similarity index 100%
rename from src/libfreeswan/libdes/des/spr.h
rename to src/libfreeswan/libcrypto/libdes/des/spr.h