diff --git a/src/freeswan/.cvsignore b/src/libfreeswan/freeswan/.cvsignore
similarity index 100%
rename from src/freeswan/.cvsignore
rename to src/libfreeswan/freeswan/.cvsignore
diff --git a/src/freeswan/Makefile b/src/libfreeswan/freeswan/Makefile
similarity index 100%
rename from src/freeswan/Makefile
rename to src/libfreeswan/freeswan/Makefile
diff --git a/src/freeswan/Makefile.objs b/src/libfreeswan/freeswan/Makefile.objs
similarity index 100%
rename from src/freeswan/Makefile.objs
rename to src/libfreeswan/freeswan/Makefile.objs
diff --git a/src/freeswan/addrtoa.c b/src/libfreeswan/freeswan/addrtoa.c
similarity index 100%
rename from src/freeswan/addrtoa.c
rename to src/libfreeswan/freeswan/addrtoa.c
diff --git a/src/freeswan/addrtot.c b/src/libfreeswan/freeswan/addrtot.c
similarity index 100%
rename from src/freeswan/addrtot.c
rename to src/libfreeswan/freeswan/addrtot.c
diff --git a/src/freeswan/addrtypeof.c b/src/libfreeswan/freeswan/addrtypeof.c
similarity index 100%
rename from src/freeswan/addrtypeof.c
rename to src/libfreeswan/freeswan/addrtypeof.c
diff --git a/src/freeswan/anyaddr.3 b/src/libfreeswan/freeswan/anyaddr.3
similarity index 100%
rename from src/freeswan/anyaddr.3
rename to src/libfreeswan/freeswan/anyaddr.3
diff --git a/src/freeswan/anyaddr.c b/src/libfreeswan/freeswan/anyaddr.c
similarity index 100%
rename from src/freeswan/anyaddr.c
rename to src/libfreeswan/freeswan/anyaddr.c
diff --git a/src/freeswan/atoaddr.3 b/src/libfreeswan/freeswan/atoaddr.3
similarity index 100%
rename from src/freeswan/atoaddr.3
rename to src/libfreeswan/freeswan/atoaddr.3
diff --git a/src/freeswan/atoaddr.c b/src/libfreeswan/freeswan/atoaddr.c
similarity index 100%
rename from src/freeswan/atoaddr.c
rename to src/libfreeswan/freeswan/atoaddr.c
diff --git a/src/freeswan/atoasr.3 b/src/libfreeswan/freeswan/atoasr.3
similarity index 100%
rename from src/freeswan/atoasr.3
rename to src/libfreeswan/freeswan/atoasr.3
diff --git a/src/freeswan/atoasr.c b/src/libfreeswan/freeswan/atoasr.c
similarity index 100%
rename from src/freeswan/atoasr.c
rename to src/libfreeswan/freeswan/atoasr.c
diff --git a/src/freeswan/atosa.3 b/src/libfreeswan/freeswan/atosa.3
similarity index 100%
rename from src/freeswan/atosa.3
rename to src/libfreeswan/freeswan/atosa.3
diff --git a/src/freeswan/atosa.c b/src/libfreeswan/freeswan/atosa.c
similarity index 100%
rename from src/freeswan/atosa.c
rename to src/libfreeswan/freeswan/atosa.c
diff --git a/src/freeswan/atosubnet.c b/src/libfreeswan/freeswan/atosubnet.c
similarity index 100%
rename from src/freeswan/atosubnet.c
rename to src/libfreeswan/freeswan/atosubnet.c
diff --git a/src/freeswan/atoul.3 b/src/libfreeswan/freeswan/atoul.3
similarity index 100%
rename from src/freeswan/atoul.3
rename to src/libfreeswan/freeswan/atoul.3
diff --git a/src/freeswan/atoul.c b/src/libfreeswan/freeswan/atoul.c
similarity index 100%
rename from src/freeswan/atoul.c
rename to src/libfreeswan/freeswan/atoul.c
diff --git a/src/freeswan/copyright.c b/src/libfreeswan/freeswan/copyright.c
similarity index 100%
rename from src/freeswan/copyright.c
rename to src/libfreeswan/freeswan/copyright.c
diff --git a/src/freeswan/datatot.c b/src/libfreeswan/freeswan/datatot.c
similarity index 100%
rename from src/freeswan/datatot.c
rename to src/libfreeswan/freeswan/datatot.c
diff --git a/src/freeswan.h b/src/libfreeswan/freeswan/freeswan.h
similarity index 100%
rename from src/freeswan.h
rename to src/libfreeswan/freeswan/freeswan.h
diff --git a/src/freeswan/goodmask.3 b/src/libfreeswan/freeswan/goodmask.3
similarity index 100%
rename from src/freeswan/goodmask.3
rename to src/libfreeswan/freeswan/goodmask.3
diff --git a/src/freeswan/goodmask.c b/src/libfreeswan/freeswan/goodmask.c
similarity index 100%
rename from src/freeswan/goodmask.c
rename to src/libfreeswan/freeswan/goodmask.c
diff --git a/src/freeswan/initaddr.3 b/src/libfreeswan/freeswan/initaddr.3
similarity index 100%
rename from src/freeswan/initaddr.3
rename to src/libfreeswan/freeswan/initaddr.3
diff --git a/src/freeswan/initaddr.c b/src/libfreeswan/freeswan/initaddr.c
similarity index 100%
rename from src/freeswan/initaddr.c
rename to src/libfreeswan/freeswan/initaddr.c
diff --git a/src/freeswan/initsaid.c b/src/libfreeswan/freeswan/initsaid.c
similarity index 100%
rename from src/freeswan/initsaid.c
rename to src/libfreeswan/freeswan/initsaid.c
diff --git a/src/freeswan/initsubnet.3 b/src/libfreeswan/freeswan/initsubnet.3
similarity index 100%
rename from src/freeswan/initsubnet.3
rename to src/libfreeswan/freeswan/initsubnet.3
diff --git a/src/freeswan/initsubnet.c b/src/libfreeswan/freeswan/initsubnet.c
similarity index 100%
rename from src/freeswan/initsubnet.c
rename to src/libfreeswan/freeswan/initsubnet.c
diff --git a/src/freeswan/internal.h b/src/libfreeswan/freeswan/internal.h
similarity index 100%
rename from src/freeswan/internal.h
rename to src/libfreeswan/freeswan/internal.h
diff --git a/src/freeswan/ipcomp.h b/src/libfreeswan/freeswan/ipcomp.h
similarity index 100%
rename from src/freeswan/ipcomp.h
rename to src/libfreeswan/freeswan/ipcomp.h
diff --git a/src/freeswan/ipsec_ah.h b/src/libfreeswan/freeswan/ipsec_ah.h
similarity index 100%
rename from src/freeswan/ipsec_ah.h
rename to src/libfreeswan/freeswan/ipsec_ah.h
diff --git a/src/freeswan/ipsec_alg.h b/src/libfreeswan/freeswan/ipsec_alg.h
similarity index 100%
rename from src/freeswan/ipsec_alg.h
rename to src/libfreeswan/freeswan/ipsec_alg.h
diff --git a/src/freeswan/ipsec_encap.h b/src/libfreeswan/freeswan/ipsec_encap.h
similarity index 100%
rename from src/freeswan/ipsec_encap.h
rename to src/libfreeswan/freeswan/ipsec_encap.h
diff --git a/src/freeswan/ipsec_eroute.h b/src/libfreeswan/freeswan/ipsec_eroute.h
similarity index 100%
rename from src/freeswan/ipsec_eroute.h
rename to src/libfreeswan/freeswan/ipsec_eroute.h
diff --git a/src/freeswan/ipsec_errs.h b/src/libfreeswan/freeswan/ipsec_errs.h
similarity index 100%
rename from src/freeswan/ipsec_errs.h
rename to src/libfreeswan/freeswan/ipsec_errs.h
diff --git a/src/freeswan/ipsec_esp.h b/src/libfreeswan/freeswan/ipsec_esp.h
similarity index 100%
rename from src/freeswan/ipsec_esp.h
rename to src/libfreeswan/freeswan/ipsec_esp.h
diff --git a/src/freeswan/ipsec_ipe4.h b/src/libfreeswan/freeswan/ipsec_ipe4.h
similarity index 100%
rename from src/freeswan/ipsec_ipe4.h
rename to src/libfreeswan/freeswan/ipsec_ipe4.h
diff --git a/src/freeswan/ipsec_kversion.h b/src/libfreeswan/freeswan/ipsec_kversion.h
similarity index 100%
rename from src/freeswan/ipsec_kversion.h
rename to src/libfreeswan/freeswan/ipsec_kversion.h
diff --git a/src/freeswan/ipsec_life.h b/src/libfreeswan/freeswan/ipsec_life.h
similarity index 100%
rename from src/freeswan/ipsec_life.h
rename to src/libfreeswan/freeswan/ipsec_life.h
diff --git a/src/freeswan/ipsec_md5h.h b/src/libfreeswan/freeswan/ipsec_md5h.h
similarity index 100%
rename from src/freeswan/ipsec_md5h.h
rename to src/libfreeswan/freeswan/ipsec_md5h.h
diff --git a/src/freeswan/ipsec_param.h b/src/libfreeswan/freeswan/ipsec_param.h
similarity index 100%
rename from src/freeswan/ipsec_param.h
rename to src/libfreeswan/freeswan/ipsec_param.h
diff --git a/src/freeswan/ipsec_policy.h b/src/libfreeswan/freeswan/ipsec_policy.h
similarity index 100%
rename from src/freeswan/ipsec_policy.h
rename to src/libfreeswan/freeswan/ipsec_policy.h
diff --git a/src/freeswan/ipsec_proto.h b/src/libfreeswan/freeswan/ipsec_proto.h
similarity index 100%
rename from src/freeswan/ipsec_proto.h
rename to src/libfreeswan/freeswan/ipsec_proto.h
diff --git a/src/freeswan/ipsec_radij.h b/src/libfreeswan/freeswan/ipsec_radij.h
similarity index 100%
rename from src/freeswan/ipsec_radij.h
rename to src/libfreeswan/freeswan/ipsec_radij.h
diff --git a/src/freeswan/ipsec_rcv.h b/src/libfreeswan/freeswan/ipsec_rcv.h
similarity index 100%
rename from src/freeswan/ipsec_rcv.h
rename to src/libfreeswan/freeswan/ipsec_rcv.h
diff --git a/src/freeswan/ipsec_sa.h b/src/libfreeswan/freeswan/ipsec_sa.h
similarity index 100%
rename from src/freeswan/ipsec_sa.h
rename to src/libfreeswan/freeswan/ipsec_sa.h
diff --git a/src/freeswan/ipsec_sha1.h b/src/libfreeswan/freeswan/ipsec_sha1.h
similarity index 100%
rename from src/freeswan/ipsec_sha1.h
rename to src/libfreeswan/freeswan/ipsec_sha1.h
diff --git a/src/freeswan/ipsec_stats.h b/src/libfreeswan/freeswan/ipsec_stats.h
similarity index 100%
rename from src/freeswan/ipsec_stats.h
rename to src/libfreeswan/freeswan/ipsec_stats.h
diff --git a/src/freeswan/ipsec_tunnel.h b/src/libfreeswan/freeswan/ipsec_tunnel.h
similarity index 100%
rename from src/freeswan/ipsec_tunnel.h
rename to src/libfreeswan/freeswan/ipsec_tunnel.h
diff --git a/src/freeswan/ipsec_xform.h b/src/libfreeswan/freeswan/ipsec_xform.h
similarity index 100%
rename from src/freeswan/ipsec_xform.h
rename to src/libfreeswan/freeswan/ipsec_xform.h
diff --git a/src/freeswan/ipsec_xmit.h b/src/libfreeswan/freeswan/ipsec_xmit.h
similarity index 100%
rename from src/freeswan/ipsec_xmit.h
rename to src/libfreeswan/freeswan/ipsec_xmit.h
diff --git a/src/freeswan/keyblobtoid.3 b/src/libfreeswan/freeswan/keyblobtoid.3
similarity index 100%
rename from src/freeswan/keyblobtoid.3
rename to src/libfreeswan/freeswan/keyblobtoid.3
diff --git a/src/freeswan/keyblobtoid.c b/src/libfreeswan/freeswan/keyblobtoid.c
similarity index 100%
rename from src/freeswan/keyblobtoid.c
rename to src/libfreeswan/freeswan/keyblobtoid.c
diff --git a/src/freeswan/optionsfrom.3 b/src/libfreeswan/freeswan/optionsfrom.3
similarity index 100%
rename from src/freeswan/optionsfrom.3
rename to src/libfreeswan/freeswan/optionsfrom.3
diff --git a/src/freeswan/optionsfrom.c b/src/libfreeswan/freeswan/optionsfrom.c
similarity index 100%
rename from src/freeswan/optionsfrom.c
rename to src/libfreeswan/freeswan/optionsfrom.c
diff --git a/src/freeswan/pfkey_v2_build.c b/src/libfreeswan/freeswan/pfkey_v2_build.c
similarity index 100%
rename from src/freeswan/pfkey_v2_build.c
rename to src/libfreeswan/freeswan/pfkey_v2_build.c
diff --git a/src/freeswan/pfkey_v2_debug.c b/src/libfreeswan/freeswan/pfkey_v2_debug.c
similarity index 100%
rename from src/freeswan/pfkey_v2_debug.c
rename to src/libfreeswan/freeswan/pfkey_v2_debug.c
diff --git a/src/freeswan/pfkey_v2_ext_bits.c b/src/libfreeswan/freeswan/pfkey_v2_ext_bits.c
similarity index 100%
rename from src/freeswan/pfkey_v2_ext_bits.c
rename to src/libfreeswan/freeswan/pfkey_v2_ext_bits.c
diff --git a/src/freeswan/pfkey_v2_parse.c b/src/libfreeswan/freeswan/pfkey_v2_parse.c
similarity index 100%
rename from src/freeswan/pfkey_v2_parse.c
rename to src/libfreeswan/freeswan/pfkey_v2_parse.c
diff --git a/src/freeswan/portof.3 b/src/libfreeswan/freeswan/portof.3
similarity index 100%
rename from src/freeswan/portof.3
rename to src/libfreeswan/freeswan/portof.3
diff --git a/src/freeswan/portof.c b/src/libfreeswan/freeswan/portof.c
similarity index 100%
rename from src/freeswan/portof.c
rename to src/libfreeswan/freeswan/portof.c
diff --git a/src/freeswan/prng.3 b/src/libfreeswan/freeswan/prng.3
similarity index 100%
rename from src/freeswan/prng.3
rename to src/libfreeswan/freeswan/prng.3
diff --git a/src/freeswan/prng.c b/src/libfreeswan/freeswan/prng.c
similarity index 100%
rename from src/freeswan/prng.c
rename to src/libfreeswan/freeswan/prng.c
diff --git a/src/freeswan/radij.h b/src/libfreeswan/freeswan/radij.h
similarity index 100%
rename from src/freeswan/radij.h
rename to src/libfreeswan/freeswan/radij.h
diff --git a/src/freeswan/rangetoa.c b/src/libfreeswan/freeswan/rangetoa.c
similarity index 100%
rename from src/freeswan/rangetoa.c
rename to src/libfreeswan/freeswan/rangetoa.c
diff --git a/src/freeswan/rangetosubnet.3 b/src/libfreeswan/freeswan/rangetosubnet.3
similarity index 100%
rename from src/freeswan/rangetosubnet.3
rename to src/libfreeswan/freeswan/rangetosubnet.3
diff --git a/src/freeswan/rangetosubnet.c b/src/libfreeswan/freeswan/rangetosubnet.c
similarity index 100%
rename from src/freeswan/rangetosubnet.c
rename to src/libfreeswan/freeswan/rangetosubnet.c
diff --git a/src/freeswan/sameaddr.3 b/src/libfreeswan/freeswan/sameaddr.3
similarity index 100%
rename from src/freeswan/sameaddr.3
rename to src/libfreeswan/freeswan/sameaddr.3
diff --git a/src/freeswan/sameaddr.c b/src/libfreeswan/freeswan/sameaddr.c
similarity index 100%
rename from src/freeswan/sameaddr.c
rename to src/libfreeswan/freeswan/sameaddr.c
diff --git a/src/freeswan/satoa.c b/src/libfreeswan/freeswan/satoa.c
similarity index 100%
rename from src/freeswan/satoa.c
rename to src/libfreeswan/freeswan/satoa.c
diff --git a/src/freeswan/satot.c b/src/libfreeswan/freeswan/satot.c
similarity index 100%
rename from src/freeswan/satot.c
rename to src/libfreeswan/freeswan/satot.c
diff --git a/src/freeswan/subnetof.3 b/src/libfreeswan/freeswan/subnetof.3
similarity index 100%
rename from src/freeswan/subnetof.3
rename to src/libfreeswan/freeswan/subnetof.3
diff --git a/src/freeswan/subnetof.c b/src/libfreeswan/freeswan/subnetof.c
similarity index 100%
rename from src/freeswan/subnetof.c
rename to src/libfreeswan/freeswan/subnetof.c
diff --git a/src/freeswan/subnettoa.c b/src/libfreeswan/freeswan/subnettoa.c
similarity index 100%
rename from src/freeswan/subnettoa.c
rename to src/libfreeswan/freeswan/subnettoa.c
diff --git a/src/freeswan/subnettot.c b/src/libfreeswan/freeswan/subnettot.c
similarity index 100%
rename from src/freeswan/subnettot.c
rename to src/libfreeswan/freeswan/subnettot.c
diff --git a/src/freeswan/subnettypeof.c b/src/libfreeswan/freeswan/subnettypeof.c
similarity index 100%
rename from src/freeswan/subnettypeof.c
rename to src/libfreeswan/freeswan/subnettypeof.c
diff --git a/src/freeswan/ttoaddr.3 b/src/libfreeswan/freeswan/ttoaddr.3
similarity index 100%
rename from src/freeswan/ttoaddr.3
rename to src/libfreeswan/freeswan/ttoaddr.3
diff --git a/src/freeswan/ttoaddr.c b/src/libfreeswan/freeswan/ttoaddr.c
similarity index 100%
rename from src/freeswan/ttoaddr.c
rename to src/libfreeswan/freeswan/ttoaddr.c
diff --git a/src/freeswan/ttodata.3 b/src/libfreeswan/freeswan/ttodata.3
similarity index 100%
rename from src/freeswan/ttodata.3
rename to src/libfreeswan/freeswan/ttodata.3
diff --git a/src/freeswan/ttodata.c b/src/libfreeswan/freeswan/ttodata.c
similarity index 100%
rename from src/freeswan/ttodata.c
rename to src/libfreeswan/freeswan/ttodata.c
diff --git a/src/freeswan/ttoprotoport.c b/src/libfreeswan/freeswan/ttoprotoport.c
similarity index 100%
rename from src/freeswan/ttoprotoport.c
rename to src/libfreeswan/freeswan/ttoprotoport.c
diff --git a/src/freeswan/ttosa.3 b/src/libfreeswan/freeswan/ttosa.3
similarity index 100%
rename from src/freeswan/ttosa.3
rename to src/libfreeswan/freeswan/ttosa.3
diff --git a/src/freeswan/ttosa.c b/src/libfreeswan/freeswan/ttosa.c
similarity index 100%
rename from src/freeswan/ttosa.c
rename to src/libfreeswan/freeswan/ttosa.c
diff --git a/src/freeswan/ttosubnet.c b/src/libfreeswan/freeswan/ttosubnet.c
similarity index 100%
rename from src/freeswan/ttosubnet.c
rename to src/libfreeswan/freeswan/ttosubnet.c
diff --git a/src/freeswan/ttoul.3 b/src/libfreeswan/freeswan/ttoul.3
similarity index 100%
rename from src/freeswan/ttoul.3
rename to src/libfreeswan/freeswan/ttoul.3
diff --git a/src/freeswan/ttoul.c b/src/libfreeswan/freeswan/ttoul.c
similarity index 100%
rename from src/freeswan/ttoul.c
rename to src/libfreeswan/freeswan/ttoul.c
diff --git a/src/freeswan/ultoa.c b/src/libfreeswan/freeswan/ultoa.c
similarity index 100%
rename from src/freeswan/ultoa.c
rename to src/libfreeswan/freeswan/ultoa.c
diff --git a/src/freeswan/ultot.c b/src/libfreeswan/freeswan/ultot.c
similarity index 100%
rename from src/freeswan/ultot.c
rename to src/libfreeswan/freeswan/ultot.c
diff --git a/src/freeswan/version.3 b/src/libfreeswan/freeswan/version.3
similarity index 100%
rename from src/freeswan/version.3
rename to src/libfreeswan/freeswan/version.3
diff --git a/src/freeswan/version.in.c b/src/libfreeswan/freeswan/version.in.c
similarity index 100%
rename from src/freeswan/version.in.c
rename to src/libfreeswan/freeswan/version.in.c