diff --git a/crypto/heimdal/ChangeLog b/ChangeLog
similarity index 100%
rename from crypto/heimdal/ChangeLog
rename to ChangeLog
diff --git a/crypto/heimdal/ChangeLog.1998 b/ChangeLog.1998
similarity index 100%
rename from crypto/heimdal/ChangeLog.1998
rename to ChangeLog.1998
diff --git a/crypto/heimdal/ChangeLog.1999 b/ChangeLog.1999
similarity index 100%
rename from crypto/heimdal/ChangeLog.1999
rename to ChangeLog.1999
diff --git a/crypto/heimdal/ChangeLog.2000 b/ChangeLog.2000
similarity index 100%
rename from crypto/heimdal/ChangeLog.2000
rename to ChangeLog.2000
diff --git a/crypto/heimdal/ChangeLog.2001 b/ChangeLog.2001
similarity index 100%
rename from crypto/heimdal/ChangeLog.2001
rename to ChangeLog.2001
diff --git a/crypto/heimdal/ChangeLog.2002 b/ChangeLog.2002
similarity index 100%
rename from crypto/heimdal/ChangeLog.2002
rename to ChangeLog.2002
diff --git a/crypto/heimdal/ChangeLog.2003 b/ChangeLog.2003
similarity index 100%
rename from crypto/heimdal/ChangeLog.2003
rename to ChangeLog.2003
diff --git a/crypto/heimdal/ChangeLog.2004 b/ChangeLog.2004
similarity index 100%
rename from crypto/heimdal/ChangeLog.2004
rename to ChangeLog.2004
diff --git a/crypto/heimdal/ChangeLog.2005 b/ChangeLog.2005
similarity index 100%
rename from crypto/heimdal/ChangeLog.2005
rename to ChangeLog.2005
diff --git a/crypto/heimdal/ChangeLog.2006 b/ChangeLog.2006
similarity index 100%
rename from crypto/heimdal/ChangeLog.2006
rename to ChangeLog.2006
diff --git a/crypto/heimdal/LICENSE b/LICENSE
similarity index 100%
rename from crypto/heimdal/LICENSE
rename to LICENSE
diff --git a/crypto/heimdal/Makefile.am b/Makefile.am
similarity index 100%
rename from crypto/heimdal/Makefile.am
rename to Makefile.am
diff --git a/crypto/heimdal/Makefile.am.common b/Makefile.am.common
similarity index 100%
rename from crypto/heimdal/Makefile.am.common
rename to Makefile.am.common
diff --git a/crypto/heimdal/Makefile.in b/Makefile.in
similarity index 100%
rename from crypto/heimdal/Makefile.in
rename to Makefile.in
diff --git a/crypto/heimdal/NEWS b/NEWS
similarity index 100%
rename from crypto/heimdal/NEWS
rename to NEWS
diff --git a/crypto/heimdal/README b/README
similarity index 100%
rename from crypto/heimdal/README
rename to README
diff --git a/crypto/heimdal/acinclude.m4 b/acinclude.m4
similarity index 100%
rename from crypto/heimdal/acinclude.m4
rename to acinclude.m4
diff --git a/crypto/heimdal/aclocal.m4 b/aclocal.m4
similarity index 100%
rename from crypto/heimdal/aclocal.m4
rename to aclocal.m4
diff --git a/crypto/heimdal/admin/ChangeLog b/admin/ChangeLog
similarity index 100%
rename from crypto/heimdal/admin/ChangeLog
rename to admin/ChangeLog
diff --git a/crypto/heimdal/admin/Makefile.am b/admin/Makefile.am
similarity index 100%
rename from crypto/heimdal/admin/Makefile.am
rename to admin/Makefile.am
diff --git a/crypto/heimdal/admin/Makefile.in b/admin/Makefile.in
similarity index 100%
rename from crypto/heimdal/admin/Makefile.in
rename to admin/Makefile.in
diff --git a/crypto/heimdal/admin/add.c b/admin/add.c
similarity index 100%
rename from crypto/heimdal/admin/add.c
rename to admin/add.c
diff --git a/crypto/heimdal/admin/change.c b/admin/change.c
similarity index 100%
rename from crypto/heimdal/admin/change.c
rename to admin/change.c
diff --git a/crypto/heimdal/admin/copy.c b/admin/copy.c
similarity index 100%
rename from crypto/heimdal/admin/copy.c
rename to admin/copy.c
diff --git a/crypto/heimdal/admin/get.c b/admin/get.c
similarity index 100%
rename from crypto/heimdal/admin/get.c
rename to admin/get.c
diff --git a/crypto/heimdal/admin/ktutil-commands.in b/admin/ktutil-commands.in
similarity index 100%
rename from crypto/heimdal/admin/ktutil-commands.in
rename to admin/ktutil-commands.in
diff --git a/crypto/heimdal/admin/ktutil.8 b/admin/ktutil.8
similarity index 100%
rename from crypto/heimdal/admin/ktutil.8
rename to admin/ktutil.8
diff --git a/crypto/heimdal/admin/ktutil.c b/admin/ktutil.c
similarity index 100%
rename from crypto/heimdal/admin/ktutil.c
rename to admin/ktutil.c
diff --git a/crypto/heimdal/admin/ktutil_locl.h b/admin/ktutil_locl.h
similarity index 100%
rename from crypto/heimdal/admin/ktutil_locl.h
rename to admin/ktutil_locl.h
diff --git a/crypto/heimdal/admin/list.c b/admin/list.c
similarity index 100%
rename from crypto/heimdal/admin/list.c
rename to admin/list.c
diff --git a/crypto/heimdal/admin/purge.c b/admin/purge.c
similarity index 100%
rename from crypto/heimdal/admin/purge.c
rename to admin/purge.c
diff --git a/crypto/heimdal/admin/remove.c b/admin/remove.c
similarity index 100%
rename from crypto/heimdal/admin/remove.c
rename to admin/remove.c
diff --git a/crypto/heimdal/admin/rename.c b/admin/rename.c
similarity index 100%
rename from crypto/heimdal/admin/rename.c
rename to admin/rename.c
diff --git a/crypto/heimdal/appl/Makefile.am b/appl/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/Makefile.am
rename to appl/Makefile.am
diff --git a/crypto/heimdal/appl/Makefile.in b/appl/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/Makefile.in
rename to appl/Makefile.in
diff --git a/crypto/heimdal/appl/afsutil/ChangeLog b/appl/afsutil/ChangeLog
similarity index 100%
rename from crypto/heimdal/appl/afsutil/ChangeLog
rename to appl/afsutil/ChangeLog
diff --git a/crypto/heimdal/appl/afsutil/Makefile.am b/appl/afsutil/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/afsutil/Makefile.am
rename to appl/afsutil/Makefile.am
diff --git a/crypto/heimdal/appl/afsutil/Makefile.in b/appl/afsutil/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/afsutil/Makefile.in
rename to appl/afsutil/Makefile.in
diff --git a/crypto/heimdal/appl/afsutil/afslog.1 b/appl/afsutil/afslog.1
similarity index 100%
rename from crypto/heimdal/appl/afsutil/afslog.1
rename to appl/afsutil/afslog.1
diff --git a/crypto/heimdal/appl/afsutil/afslog.c b/appl/afsutil/afslog.c
similarity index 100%
rename from crypto/heimdal/appl/afsutil/afslog.c
rename to appl/afsutil/afslog.c
diff --git a/crypto/heimdal/appl/afsutil/pagsh.1 b/appl/afsutil/pagsh.1
similarity index 100%
rename from crypto/heimdal/appl/afsutil/pagsh.1
rename to appl/afsutil/pagsh.1
diff --git a/crypto/heimdal/appl/afsutil/pagsh.c b/appl/afsutil/pagsh.c
similarity index 100%
rename from crypto/heimdal/appl/afsutil/pagsh.c
rename to appl/afsutil/pagsh.c
diff --git a/crypto/heimdal/appl/ftp/ChangeLog b/appl/ftp/ChangeLog
similarity index 100%
rename from crypto/heimdal/appl/ftp/ChangeLog
rename to appl/ftp/ChangeLog
diff --git a/crypto/heimdal/appl/ftp/Makefile.am b/appl/ftp/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/ftp/Makefile.am
rename to appl/ftp/Makefile.am
diff --git a/crypto/heimdal/appl/ftp/Makefile.in b/appl/ftp/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/ftp/Makefile.in
rename to appl/ftp/Makefile.in
diff --git a/crypto/heimdal/appl/ftp/common/Makefile.am b/appl/ftp/common/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/ftp/common/Makefile.am
rename to appl/ftp/common/Makefile.am
diff --git a/crypto/heimdal/appl/ftp/common/Makefile.in b/appl/ftp/common/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/ftp/common/Makefile.in
rename to appl/ftp/common/Makefile.in
diff --git a/crypto/heimdal/appl/ftp/common/buffer.c b/appl/ftp/common/buffer.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/common/buffer.c
rename to appl/ftp/common/buffer.c
diff --git a/crypto/heimdal/appl/ftp/common/common.h b/appl/ftp/common/common.h
similarity index 100%
rename from crypto/heimdal/appl/ftp/common/common.h
rename to appl/ftp/common/common.h
diff --git a/crypto/heimdal/appl/ftp/common/sockbuf.c b/appl/ftp/common/sockbuf.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/common/sockbuf.c
rename to appl/ftp/common/sockbuf.c
diff --git a/crypto/heimdal/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/Makefile.am
rename to appl/ftp/ftp/Makefile.am
diff --git a/crypto/heimdal/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/Makefile.in
rename to appl/ftp/ftp/Makefile.in
diff --git a/crypto/heimdal/appl/ftp/ftp/cmds.c b/appl/ftp/ftp/cmds.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/cmds.c
rename to appl/ftp/ftp/cmds.c
diff --git a/crypto/heimdal/appl/ftp/ftp/cmdtab.c b/appl/ftp/ftp/cmdtab.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/cmdtab.c
rename to appl/ftp/ftp/cmdtab.c
diff --git a/crypto/heimdal/appl/ftp/ftp/domacro.c b/appl/ftp/ftp/domacro.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/domacro.c
rename to appl/ftp/ftp/domacro.c
diff --git a/crypto/heimdal/appl/ftp/ftp/extern.h b/appl/ftp/ftp/extern.h
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/extern.h
rename to appl/ftp/ftp/extern.h
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp.1 b/appl/ftp/ftp/ftp.1
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/ftp.1
rename to appl/ftp/ftp/ftp.1
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp.c b/appl/ftp/ftp/ftp.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/ftp.c
rename to appl/ftp/ftp/ftp.c
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h b/appl/ftp/ftp/ftp_locl.h
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/ftp_locl.h
rename to appl/ftp/ftp/ftp_locl.h
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_var.h b/appl/ftp/ftp/ftp_var.h
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/ftp_var.h
rename to appl/ftp/ftp/ftp_var.h
diff --git a/crypto/heimdal/appl/ftp/ftp/globals.c b/appl/ftp/ftp/globals.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/globals.c
rename to appl/ftp/ftp/globals.c
diff --git a/crypto/heimdal/appl/ftp/ftp/gssapi.c b/appl/ftp/ftp/gssapi.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/gssapi.c
rename to appl/ftp/ftp/gssapi.c
diff --git a/crypto/heimdal/appl/ftp/ftp/kauth.c b/appl/ftp/ftp/kauth.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/kauth.c
rename to appl/ftp/ftp/kauth.c
diff --git a/crypto/heimdal/appl/ftp/ftp/krb4.c b/appl/ftp/ftp/krb4.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/krb4.c
rename to appl/ftp/ftp/krb4.c
diff --git a/crypto/heimdal/appl/ftp/ftp/main.c b/appl/ftp/ftp/main.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/main.c
rename to appl/ftp/ftp/main.c
diff --git a/crypto/heimdal/appl/ftp/ftp/pathnames.h b/appl/ftp/ftp/pathnames.h
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/pathnames.h
rename to appl/ftp/ftp/pathnames.h
diff --git a/crypto/heimdal/appl/ftp/ftp/ruserpass.c b/appl/ftp/ftp/ruserpass.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/ruserpass.c
rename to appl/ftp/ftp/ruserpass.c
diff --git a/crypto/heimdal/appl/ftp/ftp/security.c b/appl/ftp/ftp/security.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/security.c
rename to appl/ftp/ftp/security.c
diff --git a/crypto/heimdal/appl/ftp/ftp/security.h b/appl/ftp/ftp/security.h
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftp/security.h
rename to appl/ftp/ftp/security.h
diff --git a/crypto/heimdal/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/Makefile.am
rename to appl/ftp/ftpd/Makefile.am
diff --git a/crypto/heimdal/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/Makefile.in
rename to appl/ftp/ftpd/Makefile.in
diff --git a/crypto/heimdal/appl/ftp/ftpd/extern.h b/appl/ftp/ftpd/extern.h
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/extern.h
rename to appl/ftp/ftpd/extern.h
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpcmd.c b/appl/ftp/ftpd/ftpcmd.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/ftpcmd.c
rename to appl/ftp/ftpd/ftpcmd.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y b/appl/ftp/ftpd/ftpcmd.y
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/ftpcmd.y
rename to appl/ftp/ftpd/ftpcmd.y
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpd.8 b/appl/ftp/ftpd/ftpd.8
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/ftpd.8
rename to appl/ftp/ftpd/ftpd.8
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/ftpd.c
rename to appl/ftp/ftpd/ftpd.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h b/appl/ftp/ftpd/ftpd_locl.h
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h
rename to appl/ftp/ftpd/ftpd_locl.h
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpusers.5 b/appl/ftp/ftpd/ftpusers.5
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/ftpusers.5
rename to appl/ftp/ftpd/ftpusers.5
diff --git a/crypto/heimdal/appl/ftp/ftpd/gss_userok.c b/appl/ftp/ftpd/gss_userok.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/gss_userok.c
rename to appl/ftp/ftpd/gss_userok.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/gssapi.c b/appl/ftp/ftpd/gssapi.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/gssapi.c
rename to appl/ftp/ftpd/gssapi.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/kauth.c b/appl/ftp/ftpd/kauth.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/kauth.c
rename to appl/ftp/ftpd/kauth.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/klist.c b/appl/ftp/ftpd/klist.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/klist.c
rename to appl/ftp/ftpd/klist.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/krb4.c b/appl/ftp/ftpd/krb4.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/krb4.c
rename to appl/ftp/ftpd/krb4.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/logwtmp.c b/appl/ftp/ftpd/logwtmp.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/logwtmp.c
rename to appl/ftp/ftpd/logwtmp.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/ls.c b/appl/ftp/ftpd/ls.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/ls.c
rename to appl/ftp/ftpd/ls.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/pathnames.h b/appl/ftp/ftpd/pathnames.h
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/pathnames.h
rename to appl/ftp/ftpd/pathnames.h
diff --git a/crypto/heimdal/appl/ftp/ftpd/popen.c b/appl/ftp/ftpd/popen.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/popen.c
rename to appl/ftp/ftpd/popen.c
diff --git a/crypto/heimdal/appl/ftp/ftpd/security.c b/appl/ftp/ftpd/security.c
similarity index 100%
rename from crypto/heimdal/appl/ftp/ftpd/security.c
rename to appl/ftp/ftpd/security.c
diff --git a/crypto/heimdal/appl/gssmask/Makefile.am b/appl/gssmask/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/gssmask/Makefile.am
rename to appl/gssmask/Makefile.am
diff --git a/crypto/heimdal/appl/gssmask/Makefile.in b/appl/gssmask/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/gssmask/Makefile.in
rename to appl/gssmask/Makefile.in
diff --git a/crypto/heimdal/appl/gssmask/common.c b/appl/gssmask/common.c
similarity index 100%
rename from crypto/heimdal/appl/gssmask/common.c
rename to appl/gssmask/common.c
diff --git a/crypto/heimdal/appl/gssmask/common.h b/appl/gssmask/common.h
similarity index 100%
rename from crypto/heimdal/appl/gssmask/common.h
rename to appl/gssmask/common.h
diff --git a/crypto/heimdal/appl/gssmask/gssmaestro.c b/appl/gssmask/gssmaestro.c
similarity index 100%
rename from crypto/heimdal/appl/gssmask/gssmaestro.c
rename to appl/gssmask/gssmaestro.c
diff --git a/crypto/heimdal/appl/gssmask/gssmask.c b/appl/gssmask/gssmask.c
similarity index 100%
rename from crypto/heimdal/appl/gssmask/gssmask.c
rename to appl/gssmask/gssmask.c
diff --git a/crypto/heimdal/appl/gssmask/protocol.h b/appl/gssmask/protocol.h
similarity index 100%
rename from crypto/heimdal/appl/gssmask/protocol.h
rename to appl/gssmask/protocol.h
diff --git a/crypto/heimdal/appl/kf/Makefile.am b/appl/kf/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/kf/Makefile.am
rename to appl/kf/Makefile.am
diff --git a/crypto/heimdal/appl/kf/Makefile.in b/appl/kf/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/kf/Makefile.in
rename to appl/kf/Makefile.in
diff --git a/crypto/heimdal/appl/kf/kf.1 b/appl/kf/kf.1
similarity index 100%
rename from crypto/heimdal/appl/kf/kf.1
rename to appl/kf/kf.1
diff --git a/crypto/heimdal/appl/kf/kf.c b/appl/kf/kf.c
similarity index 100%
rename from crypto/heimdal/appl/kf/kf.c
rename to appl/kf/kf.c
diff --git a/crypto/heimdal/appl/kf/kf_locl.h b/appl/kf/kf_locl.h
similarity index 100%
rename from crypto/heimdal/appl/kf/kf_locl.h
rename to appl/kf/kf_locl.h
diff --git a/crypto/heimdal/appl/kf/kfd.8 b/appl/kf/kfd.8
similarity index 100%
rename from crypto/heimdal/appl/kf/kfd.8
rename to appl/kf/kfd.8
diff --git a/crypto/heimdal/appl/kf/kfd.c b/appl/kf/kfd.c
similarity index 100%
rename from crypto/heimdal/appl/kf/kfd.c
rename to appl/kf/kfd.c
diff --git a/crypto/heimdal/appl/login/ChangeLog b/appl/login/ChangeLog
similarity index 100%
rename from crypto/heimdal/appl/login/ChangeLog
rename to appl/login/ChangeLog
diff --git a/crypto/heimdal/appl/login/Makefile.am b/appl/login/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/login/Makefile.am
rename to appl/login/Makefile.am
diff --git a/crypto/heimdal/appl/login/Makefile.in b/appl/login/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/login/Makefile.in
rename to appl/login/Makefile.in
diff --git a/crypto/heimdal/appl/login/conf.c b/appl/login/conf.c
similarity index 100%
rename from crypto/heimdal/appl/login/conf.c
rename to appl/login/conf.c
diff --git a/crypto/heimdal/appl/login/env.c b/appl/login/env.c
similarity index 100%
rename from crypto/heimdal/appl/login/env.c
rename to appl/login/env.c
diff --git a/crypto/heimdal/appl/login/limits_conf.c b/appl/login/limits_conf.c
similarity index 100%
rename from crypto/heimdal/appl/login/limits_conf.c
rename to appl/login/limits_conf.c
diff --git a/crypto/heimdal/appl/login/login.1 b/appl/login/login.1
similarity index 100%
rename from crypto/heimdal/appl/login/login.1
rename to appl/login/login.1
diff --git a/crypto/heimdal/appl/login/login.access.5 b/appl/login/login.access.5
similarity index 100%
rename from crypto/heimdal/appl/login/login.access.5
rename to appl/login/login.access.5
diff --git a/crypto/heimdal/appl/login/login.c b/appl/login/login.c
similarity index 100%
rename from crypto/heimdal/appl/login/login.c
rename to appl/login/login.c
diff --git a/crypto/heimdal/appl/login/login_access.c b/appl/login/login_access.c
similarity index 100%
rename from crypto/heimdal/appl/login/login_access.c
rename to appl/login/login_access.c
diff --git a/crypto/heimdal/appl/login/login_locl.h b/appl/login/login_locl.h
similarity index 100%
rename from crypto/heimdal/appl/login/login_locl.h
rename to appl/login/login_locl.h
diff --git a/crypto/heimdal/appl/login/login_protos.h b/appl/login/login_protos.h
similarity index 100%
rename from crypto/heimdal/appl/login/login_protos.h
rename to appl/login/login_protos.h
diff --git a/crypto/heimdal/appl/login/loginpaths.h b/appl/login/loginpaths.h
similarity index 100%
rename from crypto/heimdal/appl/login/loginpaths.h
rename to appl/login/loginpaths.h
diff --git a/crypto/heimdal/appl/login/osfc2.c b/appl/login/osfc2.c
similarity index 100%
rename from crypto/heimdal/appl/login/osfc2.c
rename to appl/login/osfc2.c
diff --git a/crypto/heimdal/appl/login/read_string.c b/appl/login/read_string.c
similarity index 100%
rename from crypto/heimdal/appl/login/read_string.c
rename to appl/login/read_string.c
diff --git a/crypto/heimdal/appl/login/shadow.c b/appl/login/shadow.c
similarity index 100%
rename from crypto/heimdal/appl/login/shadow.c
rename to appl/login/shadow.c
diff --git a/crypto/heimdal/appl/login/stty_default.c b/appl/login/stty_default.c
similarity index 100%
rename from crypto/heimdal/appl/login/stty_default.c
rename to appl/login/stty_default.c
diff --git a/crypto/heimdal/appl/login/tty.c b/appl/login/tty.c
similarity index 100%
rename from crypto/heimdal/appl/login/tty.c
rename to appl/login/tty.c
diff --git a/crypto/heimdal/appl/login/utmp_login.c b/appl/login/utmp_login.c
similarity index 100%
rename from crypto/heimdal/appl/login/utmp_login.c
rename to appl/login/utmp_login.c
diff --git a/crypto/heimdal/appl/login/utmpx_login.c b/appl/login/utmpx_login.c
similarity index 100%
rename from crypto/heimdal/appl/login/utmpx_login.c
rename to appl/login/utmpx_login.c
diff --git a/crypto/heimdal/appl/push/ChangeLog b/appl/push/ChangeLog
similarity index 100%
rename from crypto/heimdal/appl/push/ChangeLog
rename to appl/push/ChangeLog
diff --git a/crypto/heimdal/appl/push/Makefile.am b/appl/push/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/push/Makefile.am
rename to appl/push/Makefile.am
diff --git a/crypto/heimdal/appl/push/Makefile.in b/appl/push/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/push/Makefile.in
rename to appl/push/Makefile.in
diff --git a/crypto/heimdal/appl/push/pfrom.1 b/appl/push/pfrom.1
similarity index 100%
rename from crypto/heimdal/appl/push/pfrom.1
rename to appl/push/pfrom.1
diff --git a/crypto/heimdal/appl/push/pfrom.in b/appl/push/pfrom.in
similarity index 100%
rename from crypto/heimdal/appl/push/pfrom.in
rename to appl/push/pfrom.in
diff --git a/crypto/heimdal/appl/push/push.8 b/appl/push/push.8
similarity index 100%
rename from crypto/heimdal/appl/push/push.8
rename to appl/push/push.8
diff --git a/crypto/heimdal/appl/push/push.c b/appl/push/push.c
similarity index 100%
rename from crypto/heimdal/appl/push/push.c
rename to appl/push/push.c
diff --git a/crypto/heimdal/appl/push/push_locl.h b/appl/push/push_locl.h
similarity index 100%
rename from crypto/heimdal/appl/push/push_locl.h
rename to appl/push/push_locl.h
diff --git a/crypto/heimdal/appl/rcp/ChangeLog b/appl/rcp/ChangeLog
similarity index 100%
rename from crypto/heimdal/appl/rcp/ChangeLog
rename to appl/rcp/ChangeLog
diff --git a/crypto/heimdal/appl/rcp/Makefile.am b/appl/rcp/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/rcp/Makefile.am
rename to appl/rcp/Makefile.am
diff --git a/crypto/heimdal/appl/rcp/Makefile.in b/appl/rcp/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/rcp/Makefile.in
rename to appl/rcp/Makefile.in
diff --git a/crypto/heimdal/appl/rcp/extern.h b/appl/rcp/extern.h
similarity index 100%
rename from crypto/heimdal/appl/rcp/extern.h
rename to appl/rcp/extern.h
diff --git a/crypto/heimdal/appl/rcp/rcp.1 b/appl/rcp/rcp.1
similarity index 100%
rename from crypto/heimdal/appl/rcp/rcp.1
rename to appl/rcp/rcp.1
diff --git a/crypto/heimdal/appl/rcp/rcp.c b/appl/rcp/rcp.c
similarity index 100%
rename from crypto/heimdal/appl/rcp/rcp.c
rename to appl/rcp/rcp.c
diff --git a/crypto/heimdal/appl/rcp/rcp_locl.h b/appl/rcp/rcp_locl.h
similarity index 100%
rename from crypto/heimdal/appl/rcp/rcp_locl.h
rename to appl/rcp/rcp_locl.h
diff --git a/crypto/heimdal/appl/rcp/util.c b/appl/rcp/util.c
similarity index 100%
rename from crypto/heimdal/appl/rcp/util.c
rename to appl/rcp/util.c
diff --git a/crypto/heimdal/appl/rsh/ChangeLog b/appl/rsh/ChangeLog
similarity index 100%
rename from crypto/heimdal/appl/rsh/ChangeLog
rename to appl/rsh/ChangeLog
diff --git a/crypto/heimdal/appl/rsh/Makefile.am b/appl/rsh/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/rsh/Makefile.am
rename to appl/rsh/Makefile.am
diff --git a/crypto/heimdal/appl/rsh/Makefile.in b/appl/rsh/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/rsh/Makefile.in
rename to appl/rsh/Makefile.in
diff --git a/crypto/heimdal/appl/rsh/common.c b/appl/rsh/common.c
similarity index 100%
rename from crypto/heimdal/appl/rsh/common.c
rename to appl/rsh/common.c
diff --git a/crypto/heimdal/appl/rsh/limits_conf.c b/appl/rsh/limits_conf.c
similarity index 100%
rename from crypto/heimdal/appl/rsh/limits_conf.c
rename to appl/rsh/limits_conf.c
diff --git a/crypto/heimdal/appl/rsh/login_access.c b/appl/rsh/login_access.c
similarity index 100%
rename from crypto/heimdal/appl/rsh/login_access.c
rename to appl/rsh/login_access.c
diff --git a/crypto/heimdal/appl/rsh/rsh.1 b/appl/rsh/rsh.1
similarity index 100%
rename from crypto/heimdal/appl/rsh/rsh.1
rename to appl/rsh/rsh.1
diff --git a/crypto/heimdal/appl/rsh/rsh.c b/appl/rsh/rsh.c
similarity index 100%
rename from crypto/heimdal/appl/rsh/rsh.c
rename to appl/rsh/rsh.c
diff --git a/crypto/heimdal/appl/rsh/rsh_locl.h b/appl/rsh/rsh_locl.h
similarity index 100%
rename from crypto/heimdal/appl/rsh/rsh_locl.h
rename to appl/rsh/rsh_locl.h
diff --git a/crypto/heimdal/appl/rsh/rshd.8 b/appl/rsh/rshd.8
similarity index 100%
rename from crypto/heimdal/appl/rsh/rshd.8
rename to appl/rsh/rshd.8
diff --git a/crypto/heimdal/appl/rsh/rshd.c b/appl/rsh/rshd.c
similarity index 100%
rename from crypto/heimdal/appl/rsh/rshd.c
rename to appl/rsh/rshd.c
diff --git a/crypto/heimdal/appl/su/ChangeLog b/appl/su/ChangeLog
similarity index 100%
rename from crypto/heimdal/appl/su/ChangeLog
rename to appl/su/ChangeLog
diff --git a/crypto/heimdal/appl/su/Makefile.am b/appl/su/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/su/Makefile.am
rename to appl/su/Makefile.am
diff --git a/crypto/heimdal/appl/su/Makefile.in b/appl/su/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/su/Makefile.in
rename to appl/su/Makefile.in
diff --git a/crypto/heimdal/appl/su/su.1 b/appl/su/su.1
similarity index 100%
rename from crypto/heimdal/appl/su/su.1
rename to appl/su/su.1
diff --git a/crypto/heimdal/appl/su/su.c b/appl/su/su.c
similarity index 100%
rename from crypto/heimdal/appl/su/su.c
rename to appl/su/su.c
diff --git a/crypto/heimdal/appl/su/supaths.h b/appl/su/supaths.h
similarity index 100%
rename from crypto/heimdal/appl/su/supaths.h
rename to appl/su/supaths.h
diff --git a/crypto/heimdal/appl/telnet/ChangeLog b/appl/telnet/ChangeLog
similarity index 100%
rename from crypto/heimdal/appl/telnet/ChangeLog
rename to appl/telnet/ChangeLog
diff --git a/crypto/heimdal/appl/telnet/Makefile.am b/appl/telnet/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/telnet/Makefile.am
rename to appl/telnet/Makefile.am
diff --git a/crypto/heimdal/appl/telnet/Makefile.in b/appl/telnet/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/telnet/Makefile.in
rename to appl/telnet/Makefile.in
diff --git a/crypto/heimdal/appl/telnet/README.ORIG b/appl/telnet/README.ORIG
similarity index 100%
rename from crypto/heimdal/appl/telnet/README.ORIG
rename to appl/telnet/README.ORIG
diff --git a/crypto/heimdal/appl/telnet/arpa/telnet.h b/appl/telnet/arpa/telnet.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/arpa/telnet.h
rename to appl/telnet/arpa/telnet.h
diff --git a/crypto/heimdal/appl/telnet/libtelnet/Makefile.am b/appl/telnet/libtelnet/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/Makefile.am
rename to appl/telnet/libtelnet/Makefile.am
diff --git a/crypto/heimdal/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/Makefile.in
rename to appl/telnet/libtelnet/Makefile.in
diff --git a/crypto/heimdal/appl/telnet/libtelnet/auth-proto.h b/appl/telnet/libtelnet/auth-proto.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/auth-proto.h
rename to appl/telnet/libtelnet/auth-proto.h
diff --git a/crypto/heimdal/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/auth.c
rename to appl/telnet/libtelnet/auth.c
diff --git a/crypto/heimdal/appl/telnet/libtelnet/auth.h b/appl/telnet/libtelnet/auth.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/auth.h
rename to appl/telnet/libtelnet/auth.h
diff --git a/crypto/heimdal/appl/telnet/libtelnet/enc-proto.h b/appl/telnet/libtelnet/enc-proto.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/enc-proto.h
rename to appl/telnet/libtelnet/enc-proto.h
diff --git a/crypto/heimdal/appl/telnet/libtelnet/enc_des.c b/appl/telnet/libtelnet/enc_des.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/enc_des.c
rename to appl/telnet/libtelnet/enc_des.c
diff --git a/crypto/heimdal/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/encrypt.c
rename to appl/telnet/libtelnet/encrypt.c
diff --git a/crypto/heimdal/appl/telnet/libtelnet/encrypt.h b/appl/telnet/libtelnet/encrypt.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/encrypt.h
rename to appl/telnet/libtelnet/encrypt.h
diff --git a/crypto/heimdal/appl/telnet/libtelnet/genget.c b/appl/telnet/libtelnet/genget.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/genget.c
rename to appl/telnet/libtelnet/genget.c
diff --git a/crypto/heimdal/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/kerberos.c
rename to appl/telnet/libtelnet/kerberos.c
diff --git a/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/kerberos5.c
rename to appl/telnet/libtelnet/kerberos5.c
diff --git a/crypto/heimdal/appl/telnet/libtelnet/krb4encpwd.c b/appl/telnet/libtelnet/krb4encpwd.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/krb4encpwd.c
rename to appl/telnet/libtelnet/krb4encpwd.c
diff --git a/crypto/heimdal/appl/telnet/libtelnet/misc-proto.h b/appl/telnet/libtelnet/misc-proto.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/misc-proto.h
rename to appl/telnet/libtelnet/misc-proto.h
diff --git a/crypto/heimdal/appl/telnet/libtelnet/misc.c b/appl/telnet/libtelnet/misc.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/misc.c
rename to appl/telnet/libtelnet/misc.c
diff --git a/crypto/heimdal/appl/telnet/libtelnet/misc.h b/appl/telnet/libtelnet/misc.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/misc.h
rename to appl/telnet/libtelnet/misc.h
diff --git a/crypto/heimdal/appl/telnet/libtelnet/rsaencpwd.c b/appl/telnet/libtelnet/rsaencpwd.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/rsaencpwd.c
rename to appl/telnet/libtelnet/rsaencpwd.c
diff --git a/crypto/heimdal/appl/telnet/libtelnet/spx.c b/appl/telnet/libtelnet/spx.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/libtelnet/spx.c
rename to appl/telnet/libtelnet/spx.c
diff --git a/crypto/heimdal/appl/telnet/telnet.state b/appl/telnet/telnet.state
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet.state
rename to appl/telnet/telnet.state
diff --git a/crypto/heimdal/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/Makefile.am
rename to appl/telnet/telnet/Makefile.am
diff --git a/crypto/heimdal/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/Makefile.in
rename to appl/telnet/telnet/Makefile.in
diff --git a/crypto/heimdal/appl/telnet/telnet/authenc.c b/appl/telnet/telnet/authenc.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/authenc.c
rename to appl/telnet/telnet/authenc.c
diff --git a/crypto/heimdal/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/commands.c
rename to appl/telnet/telnet/commands.c
diff --git a/crypto/heimdal/appl/telnet/telnet/defines.h b/appl/telnet/telnet/defines.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/defines.h
rename to appl/telnet/telnet/defines.h
diff --git a/crypto/heimdal/appl/telnet/telnet/externs.h b/appl/telnet/telnet/externs.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/externs.h
rename to appl/telnet/telnet/externs.h
diff --git a/crypto/heimdal/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/main.c
rename to appl/telnet/telnet/main.c
diff --git a/crypto/heimdal/appl/telnet/telnet/network.c b/appl/telnet/telnet/network.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/network.c
rename to appl/telnet/telnet/network.c
diff --git a/crypto/heimdal/appl/telnet/telnet/ring.c b/appl/telnet/telnet/ring.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/ring.c
rename to appl/telnet/telnet/ring.c
diff --git a/crypto/heimdal/appl/telnet/telnet/ring.h b/appl/telnet/telnet/ring.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/ring.h
rename to appl/telnet/telnet/ring.h
diff --git a/crypto/heimdal/appl/telnet/telnet/sys_bsd.c b/appl/telnet/telnet/sys_bsd.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/sys_bsd.c
rename to appl/telnet/telnet/sys_bsd.c
diff --git a/crypto/heimdal/appl/telnet/telnet/telnet.1 b/appl/telnet/telnet/telnet.1
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/telnet.1
rename to appl/telnet/telnet/telnet.1
diff --git a/crypto/heimdal/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/telnet.c
rename to appl/telnet/telnet/telnet.c
diff --git a/crypto/heimdal/appl/telnet/telnet/telnet_locl.h b/appl/telnet/telnet/telnet_locl.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/telnet_locl.h
rename to appl/telnet/telnet/telnet_locl.h
diff --git a/crypto/heimdal/appl/telnet/telnet/terminal.c b/appl/telnet/telnet/terminal.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/terminal.c
rename to appl/telnet/telnet/terminal.c
diff --git a/crypto/heimdal/appl/telnet/telnet/types.h b/appl/telnet/telnet/types.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/types.h
rename to appl/telnet/telnet/types.h
diff --git a/crypto/heimdal/appl/telnet/telnet/utilities.c b/appl/telnet/telnet/utilities.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnet/utilities.c
rename to appl/telnet/telnet/utilities.c
diff --git a/crypto/heimdal/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/Makefile.am
rename to appl/telnet/telnetd/Makefile.am
diff --git a/crypto/heimdal/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/Makefile.in
rename to appl/telnet/telnetd/Makefile.in
diff --git a/crypto/heimdal/appl/telnet/telnetd/authenc.c b/appl/telnet/telnetd/authenc.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/authenc.c
rename to appl/telnet/telnetd/authenc.c
diff --git a/crypto/heimdal/appl/telnet/telnetd/defs.h b/appl/telnet/telnetd/defs.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/defs.h
rename to appl/telnet/telnetd/defs.h
diff --git a/crypto/heimdal/appl/telnet/telnetd/ext.h b/appl/telnet/telnetd/ext.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/ext.h
rename to appl/telnet/telnetd/ext.h
diff --git a/crypto/heimdal/appl/telnet/telnetd/global.c b/appl/telnet/telnetd/global.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/global.c
rename to appl/telnet/telnetd/global.c
diff --git a/crypto/heimdal/appl/telnet/telnetd/slc.c b/appl/telnet/telnetd/slc.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/slc.c
rename to appl/telnet/telnetd/slc.c
diff --git a/crypto/heimdal/appl/telnet/telnetd/state.c b/appl/telnet/telnetd/state.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/state.c
rename to appl/telnet/telnetd/state.c
diff --git a/crypto/heimdal/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/sys_term.c
rename to appl/telnet/telnetd/sys_term.c
diff --git a/crypto/heimdal/appl/telnet/telnetd/telnetd.8 b/appl/telnet/telnetd/telnetd.8
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/telnetd.8
rename to appl/telnet/telnetd/telnetd.8
diff --git a/crypto/heimdal/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/telnetd.c
rename to appl/telnet/telnetd/telnetd.c
diff --git a/crypto/heimdal/appl/telnet/telnetd/telnetd.h b/appl/telnet/telnetd/telnetd.h
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/telnetd.h
rename to appl/telnet/telnetd/telnetd.h
diff --git a/crypto/heimdal/appl/telnet/telnetd/termstat.c b/appl/telnet/telnetd/termstat.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/termstat.c
rename to appl/telnet/telnetd/termstat.c
diff --git a/crypto/heimdal/appl/telnet/telnetd/utility.c b/appl/telnet/telnetd/utility.c
similarity index 100%
rename from crypto/heimdal/appl/telnet/telnetd/utility.c
rename to appl/telnet/telnetd/utility.c
diff --git a/crypto/heimdal/appl/test/Makefile.am b/appl/test/Makefile.am
similarity index 100%
rename from crypto/heimdal/appl/test/Makefile.am
rename to appl/test/Makefile.am
diff --git a/crypto/heimdal/appl/test/Makefile.in b/appl/test/Makefile.in
similarity index 100%
rename from crypto/heimdal/appl/test/Makefile.in
rename to appl/test/Makefile.in
diff --git a/crypto/heimdal/appl/test/common.c b/appl/test/common.c
similarity index 100%
rename from crypto/heimdal/appl/test/common.c
rename to appl/test/common.c
diff --git a/crypto/heimdal/appl/test/gss_common.c b/appl/test/gss_common.c
similarity index 100%
rename from crypto/heimdal/appl/test/gss_common.c
rename to appl/test/gss_common.c
diff --git a/crypto/heimdal/appl/test/gss_common.h b/appl/test/gss_common.h
similarity index 100%
rename from crypto/heimdal/appl/test/gss_common.h
rename to appl/test/gss_common.h
diff --git a/crypto/heimdal/appl/test/gssapi_client.c b/appl/test/gssapi_client.c
similarity index 100%
rename from crypto/heimdal/appl/test/gssapi_client.c
rename to appl/test/gssapi_client.c
diff --git a/crypto/heimdal/appl/test/gssapi_server.c b/appl/test/gssapi_server.c
similarity index 100%
rename from crypto/heimdal/appl/test/gssapi_server.c
rename to appl/test/gssapi_server.c
diff --git a/crypto/heimdal/appl/test/http_client.c b/appl/test/http_client.c
similarity index 100%
rename from crypto/heimdal/appl/test/http_client.c
rename to appl/test/http_client.c
diff --git a/crypto/heimdal/appl/test/nt_gss_client.c b/appl/test/nt_gss_client.c
similarity index 100%
rename from crypto/heimdal/appl/test/nt_gss_client.c
rename to appl/test/nt_gss_client.c
diff --git a/crypto/heimdal/appl/test/nt_gss_common.c b/appl/test/nt_gss_common.c
similarity index 100%
rename from crypto/heimdal/appl/test/nt_gss_common.c
rename to appl/test/nt_gss_common.c
diff --git a/crypto/heimdal/appl/test/nt_gss_common.h b/appl/test/nt_gss_common.h
similarity index 100%
rename from crypto/heimdal/appl/test/nt_gss_common.h
rename to appl/test/nt_gss_common.h
diff --git a/crypto/heimdal/appl/test/nt_gss_server.c b/appl/test/nt_gss_server.c
similarity index 100%
rename from crypto/heimdal/appl/test/nt_gss_server.c
rename to appl/test/nt_gss_server.c
diff --git a/crypto/heimdal/appl/test/tcp_client.c b/appl/test/tcp_client.c
similarity index 100%
rename from crypto/heimdal/appl/test/tcp_client.c
rename to appl/test/tcp_client.c
diff --git a/crypto/heimdal/appl/test/tcp_server.c b/appl/test/tcp_server.c
similarity index 100%
rename from crypto/heimdal/appl/test/tcp_server.c
rename to appl/test/tcp_server.c
diff --git a/crypto/heimdal/appl/test/test_locl.h b/appl/test/test_locl.h
similarity index 100%
rename from crypto/heimdal/appl/test/test_locl.h
rename to appl/test/test_locl.h
diff --git a/crypto/heimdal/appl/test/uu_client.c b/appl/test/uu_client.c
similarity index 100%
rename from crypto/heimdal/appl/test/uu_client.c
rename to appl/test/uu_client.c
diff --git a/crypto/heimdal/appl/test/uu_server.c b/appl/test/uu_server.c
similarity index 100%
rename from crypto/heimdal/appl/test/uu_server.c
rename to appl/test/uu_server.c
diff --git a/crypto/heimdal/autogen.sh b/autogen.sh
similarity index 100%
rename from crypto/heimdal/autogen.sh
rename to autogen.sh
diff --git a/crypto/heimdal/cf/ChangeLog b/cf/ChangeLog
similarity index 100%
rename from crypto/heimdal/cf/ChangeLog
rename to cf/ChangeLog
diff --git a/crypto/heimdal/cf/Makefile.am.common b/cf/Makefile.am.common
similarity index 100%
rename from crypto/heimdal/cf/Makefile.am.common
rename to cf/Makefile.am.common
diff --git a/crypto/heimdal/cf/aix.m4 b/cf/aix.m4
similarity index 100%
rename from crypto/heimdal/cf/aix.m4
rename to cf/aix.m4
diff --git a/crypto/heimdal/cf/auth-modules.m4 b/cf/auth-modules.m4
similarity index 100%
rename from crypto/heimdal/cf/auth-modules.m4
rename to cf/auth-modules.m4
diff --git a/crypto/heimdal/cf/autobuild.m4 b/cf/autobuild.m4
similarity index 100%
rename from crypto/heimdal/cf/autobuild.m4
rename to cf/autobuild.m4
diff --git a/crypto/heimdal/cf/broken-getaddrinfo.m4 b/cf/broken-getaddrinfo.m4
similarity index 100%
rename from crypto/heimdal/cf/broken-getaddrinfo.m4
rename to cf/broken-getaddrinfo.m4
diff --git a/crypto/heimdal/cf/broken-getnameinfo.m4 b/cf/broken-getnameinfo.m4
similarity index 100%
rename from crypto/heimdal/cf/broken-getnameinfo.m4
rename to cf/broken-getnameinfo.m4
diff --git a/crypto/heimdal/cf/broken-glob.m4 b/cf/broken-glob.m4
similarity index 100%
rename from crypto/heimdal/cf/broken-glob.m4
rename to cf/broken-glob.m4
diff --git a/crypto/heimdal/cf/broken-realloc.m4 b/cf/broken-realloc.m4
similarity index 100%
rename from crypto/heimdal/cf/broken-realloc.m4
rename to cf/broken-realloc.m4
diff --git a/crypto/heimdal/cf/broken-snprintf.m4 b/cf/broken-snprintf.m4
similarity index 100%
rename from crypto/heimdal/cf/broken-snprintf.m4
rename to cf/broken-snprintf.m4
diff --git a/crypto/heimdal/cf/broken.m4 b/cf/broken.m4
similarity index 100%
rename from crypto/heimdal/cf/broken.m4
rename to cf/broken.m4
diff --git a/crypto/heimdal/cf/broken2.m4 b/cf/broken2.m4
similarity index 100%
rename from crypto/heimdal/cf/broken2.m4
rename to cf/broken2.m4
diff --git a/crypto/heimdal/cf/c-attribute.m4 b/cf/c-attribute.m4
similarity index 100%
rename from crypto/heimdal/cf/c-attribute.m4
rename to cf/c-attribute.m4
diff --git a/crypto/heimdal/cf/c-function.m4 b/cf/c-function.m4
similarity index 100%
rename from crypto/heimdal/cf/c-function.m4
rename to cf/c-function.m4
diff --git a/crypto/heimdal/cf/capabilities.m4 b/cf/capabilities.m4
similarity index 100%
rename from crypto/heimdal/cf/capabilities.m4
rename to cf/capabilities.m4
diff --git a/crypto/heimdal/cf/check-compile-et.m4 b/cf/check-compile-et.m4
similarity index 100%
rename from crypto/heimdal/cf/check-compile-et.m4
rename to cf/check-compile-et.m4
diff --git a/crypto/heimdal/cf/check-declaration.m4 b/cf/check-declaration.m4
similarity index 100%
rename from crypto/heimdal/cf/check-declaration.m4
rename to cf/check-declaration.m4
diff --git a/crypto/heimdal/cf/check-getpwnam_r-posix.m4 b/cf/check-getpwnam_r-posix.m4
similarity index 100%
rename from crypto/heimdal/cf/check-getpwnam_r-posix.m4
rename to cf/check-getpwnam_r-posix.m4
diff --git a/crypto/heimdal/cf/check-man.m4 b/cf/check-man.m4
similarity index 100%
rename from crypto/heimdal/cf/check-man.m4
rename to cf/check-man.m4
diff --git a/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4 b/cf/check-netinet-ip-and-tcp.m4
similarity index 100%
rename from crypto/heimdal/cf/check-netinet-ip-and-tcp.m4
rename to cf/check-netinet-ip-and-tcp.m4
diff --git a/crypto/heimdal/cf/check-type-extra.m4 b/cf/check-type-extra.m4
similarity index 100%
rename from crypto/heimdal/cf/check-type-extra.m4
rename to cf/check-type-extra.m4
diff --git a/crypto/heimdal/cf/check-var.m4 b/cf/check-var.m4
similarity index 100%
rename from crypto/heimdal/cf/check-var.m4
rename to cf/check-var.m4
diff --git a/crypto/heimdal/cf/check-x.m4 b/cf/check-x.m4
similarity index 100%
rename from crypto/heimdal/cf/check-x.m4
rename to cf/check-x.m4
diff --git a/crypto/heimdal/cf/check-xau.m4 b/cf/check-xau.m4
similarity index 100%
rename from crypto/heimdal/cf/check-xau.m4
rename to cf/check-xau.m4
diff --git a/crypto/heimdal/cf/crypto.m4 b/cf/crypto.m4
similarity index 100%
rename from crypto/heimdal/cf/crypto.m4
rename to cf/crypto.m4
diff --git a/crypto/heimdal/cf/db.m4 b/cf/db.m4
similarity index 100%
rename from crypto/heimdal/cf/db.m4
rename to cf/db.m4
diff --git a/crypto/heimdal/cf/destdirs.m4 b/cf/destdirs.m4
similarity index 100%
rename from crypto/heimdal/cf/destdirs.m4
rename to cf/destdirs.m4
diff --git a/crypto/heimdal/cf/dlopen.m4 b/cf/dlopen.m4
similarity index 100%
rename from crypto/heimdal/cf/dlopen.m4
rename to cf/dlopen.m4
diff --git a/crypto/heimdal/cf/find-func-no-libs.m4 b/cf/find-func-no-libs.m4
similarity index 100%
rename from crypto/heimdal/cf/find-func-no-libs.m4
rename to cf/find-func-no-libs.m4
diff --git a/crypto/heimdal/cf/find-func-no-libs2.m4 b/cf/find-func-no-libs2.m4
similarity index 100%
rename from crypto/heimdal/cf/find-func-no-libs2.m4
rename to cf/find-func-no-libs2.m4
diff --git a/crypto/heimdal/cf/find-func.m4 b/cf/find-func.m4
similarity index 100%
rename from crypto/heimdal/cf/find-func.m4
rename to cf/find-func.m4
diff --git a/crypto/heimdal/cf/find-if-not-broken.m4 b/cf/find-if-not-broken.m4
similarity index 100%
rename from crypto/heimdal/cf/find-if-not-broken.m4
rename to cf/find-if-not-broken.m4
diff --git a/crypto/heimdal/cf/framework-security.m4 b/cf/framework-security.m4
similarity index 100%
rename from crypto/heimdal/cf/framework-security.m4
rename to cf/framework-security.m4
diff --git a/crypto/heimdal/cf/have-pragma-weak.m4 b/cf/have-pragma-weak.m4
similarity index 100%
rename from crypto/heimdal/cf/have-pragma-weak.m4
rename to cf/have-pragma-weak.m4
diff --git a/crypto/heimdal/cf/have-struct-field.m4 b/cf/have-struct-field.m4
similarity index 100%
rename from crypto/heimdal/cf/have-struct-field.m4
rename to cf/have-struct-field.m4
diff --git a/crypto/heimdal/cf/have-type.m4 b/cf/have-type.m4
similarity index 100%
rename from crypto/heimdal/cf/have-type.m4
rename to cf/have-type.m4
diff --git a/crypto/heimdal/cf/have-types.m4 b/cf/have-types.m4
similarity index 100%
rename from crypto/heimdal/cf/have-types.m4
rename to cf/have-types.m4
diff --git a/crypto/heimdal/cf/install-catman.sh b/cf/install-catman.sh
similarity index 100%
rename from crypto/heimdal/cf/install-catman.sh
rename to cf/install-catman.sh
diff --git a/crypto/heimdal/cf/irix.m4 b/cf/irix.m4
similarity index 100%
rename from crypto/heimdal/cf/irix.m4
rename to cf/irix.m4
diff --git a/crypto/heimdal/cf/krb-bigendian.m4 b/cf/krb-bigendian.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-bigendian.m4
rename to cf/krb-bigendian.m4
diff --git a/crypto/heimdal/cf/krb-func-getcwd-broken.m4 b/cf/krb-func-getcwd-broken.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-func-getcwd-broken.m4
rename to cf/krb-func-getcwd-broken.m4
diff --git a/crypto/heimdal/cf/krb-func-getlogin.m4 b/cf/krb-func-getlogin.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-func-getlogin.m4
rename to cf/krb-func-getlogin.m4
diff --git a/crypto/heimdal/cf/krb-ipv6.m4 b/cf/krb-ipv6.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-ipv6.m4
rename to cf/krb-ipv6.m4
diff --git a/crypto/heimdal/cf/krb-prog-ln-s.m4 b/cf/krb-prog-ln-s.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-prog-ln-s.m4
rename to cf/krb-prog-ln-s.m4
diff --git a/crypto/heimdal/cf/krb-prog-ranlib.m4 b/cf/krb-prog-ranlib.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-prog-ranlib.m4
rename to cf/krb-prog-ranlib.m4
diff --git a/crypto/heimdal/cf/krb-prog-yacc.m4 b/cf/krb-prog-yacc.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-prog-yacc.m4
rename to cf/krb-prog-yacc.m4
diff --git a/crypto/heimdal/cf/krb-readline.m4 b/cf/krb-readline.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-readline.m4
rename to cf/krb-readline.m4
diff --git a/crypto/heimdal/cf/krb-struct-spwd.m4 b/cf/krb-struct-spwd.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-struct-spwd.m4
rename to cf/krb-struct-spwd.m4
diff --git a/crypto/heimdal/cf/krb-struct-winsize.m4 b/cf/krb-struct-winsize.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-struct-winsize.m4
rename to cf/krb-struct-winsize.m4
diff --git a/crypto/heimdal/cf/krb-sys-aix.m4 b/cf/krb-sys-aix.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-sys-aix.m4
rename to cf/krb-sys-aix.m4
diff --git a/crypto/heimdal/cf/krb-sys-nextstep.m4 b/cf/krb-sys-nextstep.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-sys-nextstep.m4
rename to cf/krb-sys-nextstep.m4
diff --git a/crypto/heimdal/cf/krb-version.m4 b/cf/krb-version.m4
similarity index 100%
rename from crypto/heimdal/cf/krb-version.m4
rename to cf/krb-version.m4
diff --git a/crypto/heimdal/cf/largefile.m4 b/cf/largefile.m4
similarity index 100%
rename from crypto/heimdal/cf/largefile.m4
rename to cf/largefile.m4
diff --git a/crypto/heimdal/cf/make-proto.pl b/cf/make-proto.pl
similarity index 100%
rename from crypto/heimdal/cf/make-proto.pl
rename to cf/make-proto.pl
diff --git a/crypto/heimdal/cf/mips-abi.m4 b/cf/mips-abi.m4
similarity index 100%
rename from crypto/heimdal/cf/mips-abi.m4
rename to cf/mips-abi.m4
diff --git a/crypto/heimdal/cf/misc.m4 b/cf/misc.m4
similarity index 100%
rename from crypto/heimdal/cf/misc.m4
rename to cf/misc.m4
diff --git a/crypto/heimdal/cf/need-proto.m4 b/cf/need-proto.m4
similarity index 100%
rename from crypto/heimdal/cf/need-proto.m4
rename to cf/need-proto.m4
diff --git a/crypto/heimdal/cf/osfc2.m4 b/cf/osfc2.m4
similarity index 100%
rename from crypto/heimdal/cf/osfc2.m4
rename to cf/osfc2.m4
diff --git a/crypto/heimdal/cf/otp.m4 b/cf/otp.m4
similarity index 100%
rename from crypto/heimdal/cf/otp.m4
rename to cf/otp.m4
diff --git a/crypto/heimdal/cf/proto-compat.m4 b/cf/proto-compat.m4
similarity index 100%
rename from crypto/heimdal/cf/proto-compat.m4
rename to cf/proto-compat.m4
diff --git a/crypto/heimdal/cf/pthreads.m4 b/cf/pthreads.m4
similarity index 100%
rename from crypto/heimdal/cf/pthreads.m4
rename to cf/pthreads.m4
diff --git a/crypto/heimdal/cf/resolv.m4 b/cf/resolv.m4
similarity index 100%
rename from crypto/heimdal/cf/resolv.m4
rename to cf/resolv.m4
diff --git a/crypto/heimdal/cf/retsigtype.m4 b/cf/retsigtype.m4
similarity index 100%
rename from crypto/heimdal/cf/retsigtype.m4
rename to cf/retsigtype.m4
diff --git a/crypto/heimdal/cf/roken-frag.m4 b/cf/roken-frag.m4
similarity index 100%
rename from crypto/heimdal/cf/roken-frag.m4
rename to cf/roken-frag.m4
diff --git a/crypto/heimdal/cf/roken.m4 b/cf/roken.m4
similarity index 100%
rename from crypto/heimdal/cf/roken.m4
rename to cf/roken.m4
diff --git a/crypto/heimdal/cf/socket-wrapper.m4 b/cf/socket-wrapper.m4
similarity index 100%
rename from crypto/heimdal/cf/socket-wrapper.m4
rename to cf/socket-wrapper.m4
diff --git a/crypto/heimdal/cf/sunos.m4 b/cf/sunos.m4
similarity index 100%
rename from crypto/heimdal/cf/sunos.m4
rename to cf/sunos.m4
diff --git a/crypto/heimdal/cf/telnet.m4 b/cf/telnet.m4
similarity index 100%
rename from crypto/heimdal/cf/telnet.m4
rename to cf/telnet.m4
diff --git a/crypto/heimdal/cf/test-package.m4 b/cf/test-package.m4
similarity index 100%
rename from crypto/heimdal/cf/test-package.m4
rename to cf/test-package.m4
diff --git a/crypto/heimdal/cf/valgrind-suppressions b/cf/valgrind-suppressions
similarity index 100%
rename from crypto/heimdal/cf/valgrind-suppressions
rename to cf/valgrind-suppressions
diff --git a/crypto/heimdal/cf/vararray.m4 b/cf/vararray.m4
similarity index 100%
rename from crypto/heimdal/cf/vararray.m4
rename to cf/vararray.m4
diff --git a/crypto/heimdal/cf/version-script.m4 b/cf/version-script.m4
similarity index 100%
rename from crypto/heimdal/cf/version-script.m4
rename to cf/version-script.m4
diff --git a/crypto/heimdal/cf/wflags.m4 b/cf/wflags.m4
similarity index 100%
rename from crypto/heimdal/cf/wflags.m4
rename to cf/wflags.m4
diff --git a/crypto/heimdal/cf/win32.m4 b/cf/win32.m4
similarity index 100%
rename from crypto/heimdal/cf/win32.m4
rename to cf/win32.m4
diff --git a/crypto/heimdal/cf/with-all.m4 b/cf/with-all.m4
similarity index 100%
rename from crypto/heimdal/cf/with-all.m4
rename to cf/with-all.m4
diff --git a/crypto/heimdal/compile b/compile
similarity index 100%
rename from crypto/heimdal/compile
rename to compile
diff --git a/crypto/heimdal/config.guess b/config.guess
similarity index 100%
rename from crypto/heimdal/config.guess
rename to config.guess
diff --git a/crypto/heimdal/config.sub b/config.sub
similarity index 100%
rename from crypto/heimdal/config.sub
rename to config.sub
diff --git a/crypto/heimdal/configure b/configure
similarity index 100%
rename from crypto/heimdal/configure
rename to configure
diff --git a/crypto/heimdal/configure.in b/configure.in
similarity index 100%
rename from crypto/heimdal/configure.in
rename to configure.in
diff --git a/crypto/heimdal/doc/Makefile.am b/doc/Makefile.am
similarity index 100%
rename from crypto/heimdal/doc/Makefile.am
rename to doc/Makefile.am
diff --git a/crypto/heimdal/doc/Makefile.in b/doc/Makefile.in
similarity index 100%
rename from crypto/heimdal/doc/Makefile.in
rename to doc/Makefile.in
diff --git a/crypto/heimdal/doc/ack.texi b/doc/ack.texi
similarity index 100%
rename from crypto/heimdal/doc/ack.texi
rename to doc/ack.texi
diff --git a/crypto/heimdal/doc/apps.texi b/doc/apps.texi
similarity index 100%
rename from crypto/heimdal/doc/apps.texi
rename to doc/apps.texi
diff --git a/crypto/heimdal/doc/doxytmpl.dxy b/doc/doxytmpl.dxy
similarity index 100%
rename from crypto/heimdal/doc/doxytmpl.dxy
rename to doc/doxytmpl.dxy
diff --git a/crypto/heimdal/doc/hcrypto.din b/doc/hcrypto.din
similarity index 100%
rename from crypto/heimdal/doc/hcrypto.din
rename to doc/hcrypto.din
diff --git a/crypto/heimdal/doc/heimdal.css b/doc/heimdal.css
similarity index 100%
rename from crypto/heimdal/doc/heimdal.css
rename to doc/heimdal.css
diff --git a/crypto/heimdal/doc/heimdal.texi b/doc/heimdal.texi
similarity index 100%
rename from crypto/heimdal/doc/heimdal.texi
rename to doc/heimdal.texi
diff --git a/crypto/heimdal/doc/hx509.din b/doc/hx509.din
similarity index 100%
rename from crypto/heimdal/doc/hx509.din
rename to doc/hx509.din
diff --git a/crypto/heimdal/doc/hx509.texi b/doc/hx509.texi
similarity index 100%
rename from crypto/heimdal/doc/hx509.texi
rename to doc/hx509.texi
diff --git a/crypto/heimdal/doc/init-creds b/doc/init-creds
similarity index 100%
rename from crypto/heimdal/doc/init-creds
rename to doc/init-creds
diff --git a/crypto/heimdal/doc/install.texi b/doc/install.texi
similarity index 100%
rename from crypto/heimdal/doc/install.texi
rename to doc/install.texi
diff --git a/crypto/heimdal/doc/intro.texi b/doc/intro.texi
similarity index 100%
rename from crypto/heimdal/doc/intro.texi
rename to doc/intro.texi
diff --git a/crypto/heimdal/doc/kerberos4.texi b/doc/kerberos4.texi
similarity index 100%
rename from crypto/heimdal/doc/kerberos4.texi
rename to doc/kerberos4.texi
diff --git a/crypto/heimdal/doc/krb5.din b/doc/krb5.din
similarity index 100%
rename from crypto/heimdal/doc/krb5.din
rename to doc/krb5.din
diff --git a/crypto/heimdal/doc/latin1.tex b/doc/latin1.tex
similarity index 100%
rename from crypto/heimdal/doc/latin1.tex
rename to doc/latin1.tex
diff --git a/crypto/heimdal/doc/layman.asc b/doc/layman.asc
similarity index 100%
rename from crypto/heimdal/doc/layman.asc
rename to doc/layman.asc
diff --git a/crypto/heimdal/doc/mdate-sh b/doc/mdate-sh
similarity index 100%
rename from crypto/heimdal/doc/mdate-sh
rename to doc/mdate-sh
diff --git a/crypto/heimdal/doc/migration.texi b/doc/migration.texi
similarity index 100%
rename from crypto/heimdal/doc/migration.texi
rename to doc/migration.texi
diff --git a/crypto/heimdal/doc/misc.texi b/doc/misc.texi
similarity index 100%
rename from crypto/heimdal/doc/misc.texi
rename to doc/misc.texi
diff --git a/crypto/heimdal/doc/ntlm.din b/doc/ntlm.din
similarity index 100%
rename from crypto/heimdal/doc/ntlm.din
rename to doc/ntlm.din
diff --git a/crypto/heimdal/doc/programming.texi b/doc/programming.texi
similarity index 100%
rename from crypto/heimdal/doc/programming.texi
rename to doc/programming.texi
diff --git a/crypto/heimdal/doc/setup.texi b/doc/setup.texi
similarity index 100%
rename from crypto/heimdal/doc/setup.texi
rename to doc/setup.texi
diff --git a/crypto/heimdal/doc/vars.texi b/doc/vars.texi
similarity index 100%
rename from crypto/heimdal/doc/vars.texi
rename to doc/vars.texi
diff --git a/crypto/heimdal/doc/vars.tin b/doc/vars.tin
similarity index 100%
rename from crypto/heimdal/doc/vars.tin
rename to doc/vars.tin
diff --git a/crypto/heimdal/doc/whatis.texi b/doc/whatis.texi
similarity index 100%
rename from crypto/heimdal/doc/whatis.texi
rename to doc/whatis.texi
diff --git a/crypto/heimdal/doc/win2k.texi b/doc/win2k.texi
similarity index 100%
rename from crypto/heimdal/doc/win2k.texi
rename to doc/win2k.texi
diff --git a/crypto/heimdal/etc/Makefile.am b/etc/Makefile.am
similarity index 100%
rename from crypto/heimdal/etc/Makefile.am
rename to etc/Makefile.am
diff --git a/crypto/heimdal/etc/Makefile.in b/etc/Makefile.in
similarity index 100%
rename from crypto/heimdal/etc/Makefile.in
rename to etc/Makefile.in
diff --git a/crypto/heimdal/etc/services.append b/etc/services.append
similarity index 100%
rename from crypto/heimdal/etc/services.append
rename to etc/services.append
diff --git a/crypto/heimdal/include/Makefile.am b/include/Makefile.am
similarity index 100%
rename from crypto/heimdal/include/Makefile.am
rename to include/Makefile.am
diff --git a/crypto/heimdal/include/Makefile.in b/include/Makefile.in
similarity index 100%
rename from crypto/heimdal/include/Makefile.in
rename to include/Makefile.in
diff --git a/crypto/heimdal/include/bits.c b/include/bits.c
similarity index 100%
rename from crypto/heimdal/include/bits.c
rename to include/bits.c
diff --git a/crypto/heimdal/include/config.h.in b/include/config.h.in
similarity index 100%
rename from crypto/heimdal/include/config.h.in
rename to include/config.h.in
diff --git a/crypto/heimdal/include/gssapi/Makefile.am b/include/gssapi/Makefile.am
similarity index 100%
rename from crypto/heimdal/include/gssapi/Makefile.am
rename to include/gssapi/Makefile.am
diff --git a/crypto/heimdal/include/gssapi/Makefile.in b/include/gssapi/Makefile.in
similarity index 100%
rename from crypto/heimdal/include/gssapi/Makefile.in
rename to include/gssapi/Makefile.in
diff --git a/crypto/heimdal/include/hcrypto/Makefile.am b/include/hcrypto/Makefile.am
similarity index 100%
rename from crypto/heimdal/include/hcrypto/Makefile.am
rename to include/hcrypto/Makefile.am
diff --git a/crypto/heimdal/include/hcrypto/Makefile.in b/include/hcrypto/Makefile.in
similarity index 100%
rename from crypto/heimdal/include/hcrypto/Makefile.in
rename to include/hcrypto/Makefile.in
diff --git a/crypto/heimdal/include/kadm5/Makefile.am b/include/kadm5/Makefile.am
similarity index 100%
rename from crypto/heimdal/include/kadm5/Makefile.am
rename to include/kadm5/Makefile.am
diff --git a/crypto/heimdal/include/kadm5/Makefile.in b/include/kadm5/Makefile.in
similarity index 100%
rename from crypto/heimdal/include/kadm5/Makefile.in
rename to include/kadm5/Makefile.in
diff --git a/crypto/heimdal/include/make_crypto.c b/include/make_crypto.c
similarity index 100%
rename from crypto/heimdal/include/make_crypto.c
rename to include/make_crypto.c
diff --git a/crypto/heimdal/install-sh b/install-sh
similarity index 100%
rename from crypto/heimdal/install-sh
rename to install-sh
diff --git a/crypto/heimdal/kadmin/ChangeLog b/kadmin/ChangeLog
similarity index 100%
rename from crypto/heimdal/kadmin/ChangeLog
rename to kadmin/ChangeLog
diff --git a/crypto/heimdal/kadmin/Makefile.am b/kadmin/Makefile.am
similarity index 100%
rename from crypto/heimdal/kadmin/Makefile.am
rename to kadmin/Makefile.am
diff --git a/crypto/heimdal/kadmin/Makefile.in b/kadmin/Makefile.in
similarity index 100%
rename from crypto/heimdal/kadmin/Makefile.in
rename to kadmin/Makefile.in
diff --git a/crypto/heimdal/kadmin/add-random-users.c b/kadmin/add-random-users.c
similarity index 100%
rename from crypto/heimdal/kadmin/add-random-users.c
rename to kadmin/add-random-users.c
diff --git a/crypto/heimdal/kadmin/add_enctype.c b/kadmin/add_enctype.c
similarity index 100%
rename from crypto/heimdal/kadmin/add_enctype.c
rename to kadmin/add_enctype.c
diff --git a/crypto/heimdal/kadmin/ank.c b/kadmin/ank.c
similarity index 100%
rename from crypto/heimdal/kadmin/ank.c
rename to kadmin/ank.c
diff --git a/crypto/heimdal/kadmin/check.c b/kadmin/check.c
similarity index 100%
rename from crypto/heimdal/kadmin/check.c
rename to kadmin/check.c
diff --git a/crypto/heimdal/kadmin/cpw.c b/kadmin/cpw.c
similarity index 100%
rename from crypto/heimdal/kadmin/cpw.c
rename to kadmin/cpw.c
diff --git a/crypto/heimdal/kadmin/del.c b/kadmin/del.c
similarity index 100%
rename from crypto/heimdal/kadmin/del.c
rename to kadmin/del.c
diff --git a/crypto/heimdal/kadmin/del_enctype.c b/kadmin/del_enctype.c
similarity index 100%
rename from crypto/heimdal/kadmin/del_enctype.c
rename to kadmin/del_enctype.c
diff --git a/crypto/heimdal/kadmin/dump.c b/kadmin/dump.c
similarity index 100%
rename from crypto/heimdal/kadmin/dump.c
rename to kadmin/dump.c
diff --git a/crypto/heimdal/kadmin/ext.c b/kadmin/ext.c
similarity index 100%
rename from crypto/heimdal/kadmin/ext.c
rename to kadmin/ext.c
diff --git a/crypto/heimdal/kadmin/get.c b/kadmin/get.c
similarity index 100%
rename from crypto/heimdal/kadmin/get.c
rename to kadmin/get.c
diff --git a/crypto/heimdal/kadmin/init.c b/kadmin/init.c
similarity index 100%
rename from crypto/heimdal/kadmin/init.c
rename to kadmin/init.c
diff --git a/crypto/heimdal/kadmin/kadm_conn.c b/kadmin/kadm_conn.c
similarity index 100%
rename from crypto/heimdal/kadmin/kadm_conn.c
rename to kadmin/kadm_conn.c
diff --git a/crypto/heimdal/kadmin/kadmin-commands.in b/kadmin/kadmin-commands.in
similarity index 100%
rename from crypto/heimdal/kadmin/kadmin-commands.in
rename to kadmin/kadmin-commands.in
diff --git a/crypto/heimdal/kadmin/kadmin.8 b/kadmin/kadmin.8
similarity index 100%
rename from crypto/heimdal/kadmin/kadmin.8
rename to kadmin/kadmin.8
diff --git a/crypto/heimdal/kadmin/kadmin.c b/kadmin/kadmin.c
similarity index 100%
rename from crypto/heimdal/kadmin/kadmin.c
rename to kadmin/kadmin.c
diff --git a/crypto/heimdal/kadmin/kadmin_locl.h b/kadmin/kadmin_locl.h
similarity index 100%
rename from crypto/heimdal/kadmin/kadmin_locl.h
rename to kadmin/kadmin_locl.h
diff --git a/crypto/heimdal/kadmin/kadmind.8 b/kadmin/kadmind.8
similarity index 100%
rename from crypto/heimdal/kadmin/kadmind.8
rename to kadmin/kadmind.8
diff --git a/crypto/heimdal/kadmin/kadmind.c b/kadmin/kadmind.c
similarity index 100%
rename from crypto/heimdal/kadmin/kadmind.c
rename to kadmin/kadmind.c
diff --git a/crypto/heimdal/kadmin/load.c b/kadmin/load.c
similarity index 100%
rename from crypto/heimdal/kadmin/load.c
rename to kadmin/load.c
diff --git a/crypto/heimdal/kadmin/mod.c b/kadmin/mod.c
similarity index 100%
rename from crypto/heimdal/kadmin/mod.c
rename to kadmin/mod.c
diff --git a/crypto/heimdal/kadmin/pw_quality.c b/kadmin/pw_quality.c
similarity index 100%
rename from crypto/heimdal/kadmin/pw_quality.c
rename to kadmin/pw_quality.c
diff --git a/crypto/heimdal/kadmin/random_password.c b/kadmin/random_password.c
similarity index 100%
rename from crypto/heimdal/kadmin/random_password.c
rename to kadmin/random_password.c
diff --git a/crypto/heimdal/kadmin/rename.c b/kadmin/rename.c
similarity index 100%
rename from crypto/heimdal/kadmin/rename.c
rename to kadmin/rename.c
diff --git a/crypto/heimdal/kadmin/server.c b/kadmin/server.c
similarity index 100%
rename from crypto/heimdal/kadmin/server.c
rename to kadmin/server.c
diff --git a/crypto/heimdal/kadmin/stash.c b/kadmin/stash.c
similarity index 100%
rename from crypto/heimdal/kadmin/stash.c
rename to kadmin/stash.c
diff --git a/crypto/heimdal/kadmin/test_util.c b/kadmin/test_util.c
similarity index 100%
rename from crypto/heimdal/kadmin/test_util.c
rename to kadmin/test_util.c
diff --git a/crypto/heimdal/kadmin/util.c b/kadmin/util.c
similarity index 100%
rename from crypto/heimdal/kadmin/util.c
rename to kadmin/util.c
diff --git a/crypto/heimdal/kadmin/version4.c b/kadmin/version4.c
similarity index 100%
rename from crypto/heimdal/kadmin/version4.c
rename to kadmin/version4.c
diff --git a/crypto/heimdal/kcm/Makefile.am b/kcm/Makefile.am
similarity index 100%
rename from crypto/heimdal/kcm/Makefile.am
rename to kcm/Makefile.am
diff --git a/crypto/heimdal/kcm/Makefile.in b/kcm/Makefile.in
similarity index 100%
rename from crypto/heimdal/kcm/Makefile.in
rename to kcm/Makefile.in
diff --git a/crypto/heimdal/kcm/acl.c b/kcm/acl.c
similarity index 100%
rename from crypto/heimdal/kcm/acl.c
rename to kcm/acl.c
diff --git a/crypto/heimdal/kcm/acquire.c b/kcm/acquire.c
similarity index 100%
rename from crypto/heimdal/kcm/acquire.c
rename to kcm/acquire.c
diff --git a/crypto/heimdal/kcm/cache.c b/kcm/cache.c
similarity index 100%
rename from crypto/heimdal/kcm/cache.c
rename to kcm/cache.c
diff --git a/crypto/heimdal/kcm/client.c b/kcm/client.c
similarity index 100%
rename from crypto/heimdal/kcm/client.c
rename to kcm/client.c
diff --git a/crypto/heimdal/kcm/config.c b/kcm/config.c
similarity index 100%
rename from crypto/heimdal/kcm/config.c
rename to kcm/config.c
diff --git a/crypto/heimdal/kcm/connect.c b/kcm/connect.c
similarity index 100%
rename from crypto/heimdal/kcm/connect.c
rename to kcm/connect.c
diff --git a/crypto/heimdal/kcm/cursor.c b/kcm/cursor.c
similarity index 100%
rename from crypto/heimdal/kcm/cursor.c
rename to kcm/cursor.c
diff --git a/crypto/heimdal/kcm/events.c b/kcm/events.c
similarity index 100%
rename from crypto/heimdal/kcm/events.c
rename to kcm/events.c
diff --git a/crypto/heimdal/kcm/glue.c b/kcm/glue.c
similarity index 100%
rename from crypto/heimdal/kcm/glue.c
rename to kcm/glue.c
diff --git a/crypto/heimdal/kcm/headers.h b/kcm/headers.h
similarity index 100%
rename from crypto/heimdal/kcm/headers.h
rename to kcm/headers.h
diff --git a/crypto/heimdal/kcm/kcm.8 b/kcm/kcm.8
similarity index 100%
rename from crypto/heimdal/kcm/kcm.8
rename to kcm/kcm.8
diff --git a/crypto/heimdal/kcm/kcm_locl.h b/kcm/kcm_locl.h
similarity index 100%
rename from crypto/heimdal/kcm/kcm_locl.h
rename to kcm/kcm_locl.h
diff --git a/crypto/heimdal/kcm/kcm_protos.h b/kcm/kcm_protos.h
similarity index 100%
rename from crypto/heimdal/kcm/kcm_protos.h
rename to kcm/kcm_protos.h
diff --git a/crypto/heimdal/kcm/log.c b/kcm/log.c
similarity index 100%
rename from crypto/heimdal/kcm/log.c
rename to kcm/log.c
diff --git a/crypto/heimdal/kcm/main.c b/kcm/main.c
similarity index 100%
rename from crypto/heimdal/kcm/main.c
rename to kcm/main.c
diff --git a/crypto/heimdal/kcm/protocol.c b/kcm/protocol.c
similarity index 100%
rename from crypto/heimdal/kcm/protocol.c
rename to kcm/protocol.c
diff --git a/crypto/heimdal/kcm/renew.c b/kcm/renew.c
similarity index 100%
rename from crypto/heimdal/kcm/renew.c
rename to kcm/renew.c
diff --git a/crypto/heimdal/kdc/524.c b/kdc/524.c
similarity index 100%
rename from crypto/heimdal/kdc/524.c
rename to kdc/524.c
diff --git a/crypto/heimdal/kdc/Makefile.am b/kdc/Makefile.am
similarity index 100%
rename from crypto/heimdal/kdc/Makefile.am
rename to kdc/Makefile.am
diff --git a/crypto/heimdal/kdc/Makefile.in b/kdc/Makefile.in
similarity index 100%
rename from crypto/heimdal/kdc/Makefile.in
rename to kdc/Makefile.in
diff --git a/crypto/heimdal/kdc/config.c b/kdc/config.c
similarity index 100%
rename from crypto/heimdal/kdc/config.c
rename to kdc/config.c
diff --git a/crypto/heimdal/kdc/connect.c b/kdc/connect.c
similarity index 100%
rename from crypto/heimdal/kdc/connect.c
rename to kdc/connect.c
diff --git a/crypto/heimdal/kdc/default_config.c b/kdc/default_config.c
similarity index 100%
rename from crypto/heimdal/kdc/default_config.c
rename to kdc/default_config.c
diff --git a/crypto/heimdal/kdc/digest.c b/kdc/digest.c
similarity index 100%
rename from crypto/heimdal/kdc/digest.c
rename to kdc/digest.c
diff --git a/crypto/heimdal/kdc/headers.h b/kdc/headers.h
similarity index 100%
rename from crypto/heimdal/kdc/headers.h
rename to kdc/headers.h
diff --git a/crypto/heimdal/kdc/hprop.8 b/kdc/hprop.8
similarity index 100%
rename from crypto/heimdal/kdc/hprop.8
rename to kdc/hprop.8
diff --git a/crypto/heimdal/kdc/hprop.c b/kdc/hprop.c
similarity index 100%
rename from crypto/heimdal/kdc/hprop.c
rename to kdc/hprop.c
diff --git a/crypto/heimdal/kdc/hprop.h b/kdc/hprop.h
similarity index 100%
rename from crypto/heimdal/kdc/hprop.h
rename to kdc/hprop.h
diff --git a/crypto/heimdal/kdc/hpropd.8 b/kdc/hpropd.8
similarity index 100%
rename from crypto/heimdal/kdc/hpropd.8
rename to kdc/hpropd.8
diff --git a/crypto/heimdal/kdc/hpropd.c b/kdc/hpropd.c
similarity index 100%
rename from crypto/heimdal/kdc/hpropd.c
rename to kdc/hpropd.c
diff --git a/crypto/heimdal/kdc/kadb.h b/kdc/kadb.h
similarity index 100%
rename from crypto/heimdal/kdc/kadb.h
rename to kdc/kadb.h
diff --git a/crypto/heimdal/kdc/kaserver.c b/kdc/kaserver.c
similarity index 100%
rename from crypto/heimdal/kdc/kaserver.c
rename to kdc/kaserver.c
diff --git a/crypto/heimdal/kdc/kdc-private.h b/kdc/kdc-private.h
similarity index 100%
rename from crypto/heimdal/kdc/kdc-private.h
rename to kdc/kdc-private.h
diff --git a/crypto/heimdal/kdc/kdc-protos.h b/kdc/kdc-protos.h
similarity index 100%
rename from crypto/heimdal/kdc/kdc-protos.h
rename to kdc/kdc-protos.h
diff --git a/crypto/heimdal/kdc/kdc-replay.c b/kdc/kdc-replay.c
similarity index 100%
rename from crypto/heimdal/kdc/kdc-replay.c
rename to kdc/kdc-replay.c
diff --git a/crypto/heimdal/kdc/kdc.8 b/kdc/kdc.8
similarity index 100%
rename from crypto/heimdal/kdc/kdc.8
rename to kdc/kdc.8
diff --git a/crypto/heimdal/kdc/kdc.h b/kdc/kdc.h
similarity index 100%
rename from crypto/heimdal/kdc/kdc.h
rename to kdc/kdc.h
diff --git a/crypto/heimdal/kdc/kdc_locl.h b/kdc/kdc_locl.h
similarity index 100%
rename from crypto/heimdal/kdc/kdc_locl.h
rename to kdc/kdc_locl.h
diff --git a/crypto/heimdal/kdc/kerberos4.c b/kdc/kerberos4.c
similarity index 100%
rename from crypto/heimdal/kdc/kerberos4.c
rename to kdc/kerberos4.c
diff --git a/crypto/heimdal/kdc/kerberos5.c b/kdc/kerberos5.c
similarity index 100%
rename from crypto/heimdal/kdc/kerberos5.c
rename to kdc/kerberos5.c
diff --git a/crypto/heimdal/kdc/krb5tgs.c b/kdc/krb5tgs.c
similarity index 100%
rename from crypto/heimdal/kdc/krb5tgs.c
rename to kdc/krb5tgs.c
diff --git a/crypto/heimdal/kdc/kstash.8 b/kdc/kstash.8
similarity index 100%
rename from crypto/heimdal/kdc/kstash.8
rename to kdc/kstash.8
diff --git a/crypto/heimdal/kdc/kstash.c b/kdc/kstash.c
similarity index 100%
rename from crypto/heimdal/kdc/kstash.c
rename to kdc/kstash.c
diff --git a/crypto/heimdal/kdc/kx509.c b/kdc/kx509.c
similarity index 100%
rename from crypto/heimdal/kdc/kx509.c
rename to kdc/kx509.c
diff --git a/crypto/heimdal/kdc/log.c b/kdc/log.c
similarity index 100%
rename from crypto/heimdal/kdc/log.c
rename to kdc/log.c
diff --git a/crypto/heimdal/kdc/main.c b/kdc/main.c
similarity index 100%
rename from crypto/heimdal/kdc/main.c
rename to kdc/main.c
diff --git a/crypto/heimdal/kdc/misc.c b/kdc/misc.c
similarity index 100%
rename from crypto/heimdal/kdc/misc.c
rename to kdc/misc.c
diff --git a/crypto/heimdal/kdc/mit_dump.c b/kdc/mit_dump.c
similarity index 100%
rename from crypto/heimdal/kdc/mit_dump.c
rename to kdc/mit_dump.c
diff --git a/crypto/heimdal/kdc/pkinit.c b/kdc/pkinit.c
similarity index 100%
rename from crypto/heimdal/kdc/pkinit.c
rename to kdc/pkinit.c
diff --git a/crypto/heimdal/kdc/process.c b/kdc/process.c
similarity index 100%
rename from crypto/heimdal/kdc/process.c
rename to kdc/process.c
diff --git a/crypto/heimdal/kdc/rx.h b/kdc/rx.h
similarity index 100%
rename from crypto/heimdal/kdc/rx.h
rename to kdc/rx.h
diff --git a/crypto/heimdal/kdc/set_dbinfo.c b/kdc/set_dbinfo.c
similarity index 100%
rename from crypto/heimdal/kdc/set_dbinfo.c
rename to kdc/set_dbinfo.c
diff --git a/crypto/heimdal/kdc/string2key.8 b/kdc/string2key.8
similarity index 100%
rename from crypto/heimdal/kdc/string2key.8
rename to kdc/string2key.8
diff --git a/crypto/heimdal/kdc/string2key.c b/kdc/string2key.c
similarity index 100%
rename from crypto/heimdal/kdc/string2key.c
rename to kdc/string2key.c
diff --git a/crypto/heimdal/kdc/v4_dump.c b/kdc/v4_dump.c
similarity index 100%
rename from crypto/heimdal/kdc/v4_dump.c
rename to kdc/v4_dump.c
diff --git a/crypto/heimdal/kdc/version-script.map b/kdc/version-script.map
similarity index 100%
rename from crypto/heimdal/kdc/version-script.map
rename to kdc/version-script.map
diff --git a/crypto/heimdal/kdc/windc.c b/kdc/windc.c
similarity index 100%
rename from crypto/heimdal/kdc/windc.c
rename to kdc/windc.c
diff --git a/crypto/heimdal/kdc/windc_plugin.h b/kdc/windc_plugin.h
similarity index 100%
rename from crypto/heimdal/kdc/windc_plugin.h
rename to kdc/windc_plugin.h
diff --git a/crypto/heimdal/kpasswd/Makefile.am b/kpasswd/Makefile.am
similarity index 100%
rename from crypto/heimdal/kpasswd/Makefile.am
rename to kpasswd/Makefile.am
diff --git a/crypto/heimdal/kpasswd/Makefile.in b/kpasswd/Makefile.in
similarity index 100%
rename from crypto/heimdal/kpasswd/Makefile.in
rename to kpasswd/Makefile.in
diff --git a/crypto/heimdal/kpasswd/kpasswd-generator.c b/kpasswd/kpasswd-generator.c
similarity index 100%
rename from crypto/heimdal/kpasswd/kpasswd-generator.c
rename to kpasswd/kpasswd-generator.c
diff --git a/crypto/heimdal/kpasswd/kpasswd.1 b/kpasswd/kpasswd.1
similarity index 100%
rename from crypto/heimdal/kpasswd/kpasswd.1
rename to kpasswd/kpasswd.1
diff --git a/crypto/heimdal/kpasswd/kpasswd.c b/kpasswd/kpasswd.c
similarity index 100%
rename from crypto/heimdal/kpasswd/kpasswd.c
rename to kpasswd/kpasswd.c
diff --git a/crypto/heimdal/kpasswd/kpasswd_locl.h b/kpasswd/kpasswd_locl.h
similarity index 100%
rename from crypto/heimdal/kpasswd/kpasswd_locl.h
rename to kpasswd/kpasswd_locl.h
diff --git a/crypto/heimdal/kpasswd/kpasswdd.8 b/kpasswd/kpasswdd.8
similarity index 100%
rename from crypto/heimdal/kpasswd/kpasswdd.8
rename to kpasswd/kpasswdd.8
diff --git a/crypto/heimdal/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
similarity index 100%
rename from crypto/heimdal/kpasswd/kpasswdd.c
rename to kpasswd/kpasswdd.c
diff --git a/crypto/heimdal/krb5.conf b/krb5.conf
similarity index 100%
rename from crypto/heimdal/krb5.conf
rename to krb5.conf
diff --git a/crypto/heimdal/kuser/Makefile.am b/kuser/Makefile.am
similarity index 100%
rename from crypto/heimdal/kuser/Makefile.am
rename to kuser/Makefile.am
diff --git a/crypto/heimdal/kuser/Makefile.in b/kuser/Makefile.in
similarity index 100%
rename from crypto/heimdal/kuser/Makefile.in
rename to kuser/Makefile.in
diff --git a/crypto/heimdal/kuser/copy_cred_cache.1 b/kuser/copy_cred_cache.1
similarity index 100%
rename from crypto/heimdal/kuser/copy_cred_cache.1
rename to kuser/copy_cred_cache.1
diff --git a/crypto/heimdal/kuser/copy_cred_cache.c b/kuser/copy_cred_cache.c
similarity index 100%
rename from crypto/heimdal/kuser/copy_cred_cache.c
rename to kuser/copy_cred_cache.c
diff --git a/crypto/heimdal/kuser/generate-requests.c b/kuser/generate-requests.c
similarity index 100%
rename from crypto/heimdal/kuser/generate-requests.c
rename to kuser/generate-requests.c
diff --git a/crypto/heimdal/kuser/kauth_options.c b/kuser/kauth_options.c
similarity index 100%
rename from crypto/heimdal/kuser/kauth_options.c
rename to kuser/kauth_options.c
diff --git a/crypto/heimdal/kuser/kdecode_ticket.c b/kuser/kdecode_ticket.c
similarity index 100%
rename from crypto/heimdal/kuser/kdecode_ticket.c
rename to kuser/kdecode_ticket.c
diff --git a/crypto/heimdal/kuser/kdestroy.1 b/kuser/kdestroy.1
similarity index 100%
rename from crypto/heimdal/kuser/kdestroy.1
rename to kuser/kdestroy.1
diff --git a/crypto/heimdal/kuser/kdestroy.c b/kuser/kdestroy.c
similarity index 100%
rename from crypto/heimdal/kuser/kdestroy.c
rename to kuser/kdestroy.c
diff --git a/crypto/heimdal/kuser/kdigest-commands.in b/kuser/kdigest-commands.in
similarity index 100%
rename from crypto/heimdal/kuser/kdigest-commands.in
rename to kuser/kdigest-commands.in
diff --git a/crypto/heimdal/kuser/kdigest.c b/kuser/kdigest.c
similarity index 100%
rename from crypto/heimdal/kuser/kdigest.c
rename to kuser/kdigest.c
diff --git a/crypto/heimdal/kuser/kgetcred.1 b/kuser/kgetcred.1
similarity index 100%
rename from crypto/heimdal/kuser/kgetcred.1
rename to kuser/kgetcred.1
diff --git a/crypto/heimdal/kuser/kgetcred.c b/kuser/kgetcred.c
similarity index 100%
rename from crypto/heimdal/kuser/kgetcred.c
rename to kuser/kgetcred.c
diff --git a/crypto/heimdal/kuser/kimpersonate.1 b/kuser/kimpersonate.1
similarity index 100%
rename from crypto/heimdal/kuser/kimpersonate.1
rename to kuser/kimpersonate.1
diff --git a/crypto/heimdal/kuser/kimpersonate.c b/kuser/kimpersonate.c
similarity index 100%
rename from crypto/heimdal/kuser/kimpersonate.c
rename to kuser/kimpersonate.c
diff --git a/crypto/heimdal/kuser/kinit.1 b/kuser/kinit.1
similarity index 100%
rename from crypto/heimdal/kuser/kinit.1
rename to kuser/kinit.1
diff --git a/crypto/heimdal/kuser/kinit.c b/kuser/kinit.c
similarity index 100%
rename from crypto/heimdal/kuser/kinit.c
rename to kuser/kinit.c
diff --git a/crypto/heimdal/kuser/kinit_options.c b/kuser/kinit_options.c
similarity index 100%
rename from crypto/heimdal/kuser/kinit_options.c
rename to kuser/kinit_options.c
diff --git a/crypto/heimdal/kuser/klist.1 b/kuser/klist.1
similarity index 100%
rename from crypto/heimdal/kuser/klist.1
rename to kuser/klist.1
diff --git a/crypto/heimdal/kuser/klist.c b/kuser/klist.c
similarity index 100%
rename from crypto/heimdal/kuser/klist.c
rename to kuser/klist.c
diff --git a/crypto/heimdal/kuser/kuser_locl.h b/kuser/kuser_locl.h
similarity index 100%
rename from crypto/heimdal/kuser/kuser_locl.h
rename to kuser/kuser_locl.h
diff --git a/crypto/heimdal/kuser/kverify.c b/kuser/kverify.c
similarity index 100%
rename from crypto/heimdal/kuser/kverify.c
rename to kuser/kverify.c
diff --git a/crypto/heimdal/lib/45/45_locl.h b/lib/45/45_locl.h
similarity index 100%
rename from crypto/heimdal/lib/45/45_locl.h
rename to lib/45/45_locl.h
diff --git a/crypto/heimdal/lib/45/Makefile.am b/lib/45/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/45/Makefile.am
rename to lib/45/Makefile.am
diff --git a/crypto/heimdal/lib/45/Makefile.in b/lib/45/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/45/Makefile.in
rename to lib/45/Makefile.in
diff --git a/crypto/heimdal/lib/45/get_ad_tkt.c b/lib/45/get_ad_tkt.c
similarity index 100%
rename from crypto/heimdal/lib/45/get_ad_tkt.c
rename to lib/45/get_ad_tkt.c
diff --git a/crypto/heimdal/lib/45/mk_req.c b/lib/45/mk_req.c
similarity index 100%
rename from crypto/heimdal/lib/45/mk_req.c
rename to lib/45/mk_req.c
diff --git a/crypto/heimdal/lib/Makefile.am b/lib/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/Makefile.am
rename to lib/Makefile.am
diff --git a/crypto/heimdal/lib/Makefile.in b/lib/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/Makefile.in
rename to lib/Makefile.in
diff --git a/crypto/heimdal/lib/asn1/CMS.asn1 b/lib/asn1/CMS.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/CMS.asn1
rename to lib/asn1/CMS.asn1
diff --git a/crypto/heimdal/lib/asn1/ChangeLog b/lib/asn1/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/asn1/ChangeLog
rename to lib/asn1/ChangeLog
diff --git a/crypto/heimdal/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/asn1/Makefile.am
rename to lib/asn1/Makefile.am
diff --git a/crypto/heimdal/lib/asn1/Makefile.in b/lib/asn1/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/asn1/Makefile.in
rename to lib/asn1/Makefile.in
diff --git a/crypto/heimdal/lib/asn1/asn1-common.h b/lib/asn1/asn1-common.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/asn1-common.h
rename to lib/asn1/asn1-common.h
diff --git a/crypto/heimdal/lib/asn1/asn1_err.et b/lib/asn1/asn1_err.et
similarity index 100%
rename from crypto/heimdal/lib/asn1/asn1_err.et
rename to lib/asn1/asn1_err.et
diff --git a/crypto/heimdal/lib/asn1/asn1_gen.c b/lib/asn1/asn1_gen.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/asn1_gen.c
rename to lib/asn1/asn1_gen.c
diff --git a/crypto/heimdal/lib/asn1/asn1_print.c b/lib/asn1/asn1_print.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/asn1_print.c
rename to lib/asn1/asn1_print.c
diff --git a/crypto/heimdal/lib/asn1/asn1_queue.h b/lib/asn1/asn1_queue.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/asn1_queue.h
rename to lib/asn1/asn1_queue.h
diff --git a/crypto/heimdal/lib/asn1/canthandle.asn1 b/lib/asn1/canthandle.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/canthandle.asn1
rename to lib/asn1/canthandle.asn1
diff --git a/crypto/heimdal/lib/asn1/check-common.c b/lib/asn1/check-common.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/check-common.c
rename to lib/asn1/check-common.c
diff --git a/crypto/heimdal/lib/asn1/check-common.h b/lib/asn1/check-common.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/check-common.h
rename to lib/asn1/check-common.h
diff --git a/crypto/heimdal/lib/asn1/check-der.c b/lib/asn1/check-der.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/check-der.c
rename to lib/asn1/check-der.c
diff --git a/crypto/heimdal/lib/asn1/check-gen.c b/lib/asn1/check-gen.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/check-gen.c
rename to lib/asn1/check-gen.c
diff --git a/crypto/heimdal/lib/asn1/check-timegm.c b/lib/asn1/check-timegm.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/check-timegm.c
rename to lib/asn1/check-timegm.c
diff --git a/crypto/heimdal/lib/asn1/der-protos.h b/lib/asn1/der-protos.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/der-protos.h
rename to lib/asn1/der-protos.h
diff --git a/crypto/heimdal/lib/asn1/der.c b/lib/asn1/der.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/der.c
rename to lib/asn1/der.c
diff --git a/crypto/heimdal/lib/asn1/der.h b/lib/asn1/der.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/der.h
rename to lib/asn1/der.h
diff --git a/crypto/heimdal/lib/asn1/der_cmp.c b/lib/asn1/der_cmp.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/der_cmp.c
rename to lib/asn1/der_cmp.c
diff --git a/crypto/heimdal/lib/asn1/der_copy.c b/lib/asn1/der_copy.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/der_copy.c
rename to lib/asn1/der_copy.c
diff --git a/crypto/heimdal/lib/asn1/der_format.c b/lib/asn1/der_format.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/der_format.c
rename to lib/asn1/der_format.c
diff --git a/crypto/heimdal/lib/asn1/der_free.c b/lib/asn1/der_free.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/der_free.c
rename to lib/asn1/der_free.c
diff --git a/crypto/heimdal/lib/asn1/der_get.c b/lib/asn1/der_get.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/der_get.c
rename to lib/asn1/der_get.c
diff --git a/crypto/heimdal/lib/asn1/der_length.c b/lib/asn1/der_length.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/der_length.c
rename to lib/asn1/der_length.c
diff --git a/crypto/heimdal/lib/asn1/der_locl.h b/lib/asn1/der_locl.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/der_locl.h
rename to lib/asn1/der_locl.h
diff --git a/crypto/heimdal/lib/asn1/der_put.c b/lib/asn1/der_put.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/der_put.c
rename to lib/asn1/der_put.c
diff --git a/crypto/heimdal/lib/asn1/digest.asn1 b/lib/asn1/digest.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/digest.asn1
rename to lib/asn1/digest.asn1
diff --git a/crypto/heimdal/lib/asn1/extra.c b/lib/asn1/extra.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/extra.c
rename to lib/asn1/extra.c
diff --git a/crypto/heimdal/lib/asn1/gen.c b/lib/asn1/gen.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen.c
rename to lib/asn1/gen.c
diff --git a/crypto/heimdal/lib/asn1/gen.h b/lib/asn1/gen.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen.h
rename to lib/asn1/gen.h
diff --git a/crypto/heimdal/lib/asn1/gen_copy.c b/lib/asn1/gen_copy.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen_copy.c
rename to lib/asn1/gen_copy.c
diff --git a/crypto/heimdal/lib/asn1/gen_decode.c b/lib/asn1/gen_decode.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen_decode.c
rename to lib/asn1/gen_decode.c
diff --git a/crypto/heimdal/lib/asn1/gen_encode.c b/lib/asn1/gen_encode.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen_encode.c
rename to lib/asn1/gen_encode.c
diff --git a/crypto/heimdal/lib/asn1/gen_free.c b/lib/asn1/gen_free.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen_free.c
rename to lib/asn1/gen_free.c
diff --git a/crypto/heimdal/lib/asn1/gen_glue.c b/lib/asn1/gen_glue.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen_glue.c
rename to lib/asn1/gen_glue.c
diff --git a/crypto/heimdal/lib/asn1/gen_length.c b/lib/asn1/gen_length.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen_length.c
rename to lib/asn1/gen_length.c
diff --git a/crypto/heimdal/lib/asn1/gen_locl.h b/lib/asn1/gen_locl.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen_locl.h
rename to lib/asn1/gen_locl.h
diff --git a/crypto/heimdal/lib/asn1/gen_seq.c b/lib/asn1/gen_seq.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/gen_seq.c
rename to lib/asn1/gen_seq.c
diff --git a/crypto/heimdal/lib/asn1/hash.c b/lib/asn1/hash.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/hash.c
rename to lib/asn1/hash.c
diff --git a/crypto/heimdal/lib/asn1/hash.h b/lib/asn1/hash.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/hash.h
rename to lib/asn1/hash.h
diff --git a/crypto/heimdal/lib/asn1/heim_asn1.h b/lib/asn1/heim_asn1.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/heim_asn1.h
rename to lib/asn1/heim_asn1.h
diff --git a/crypto/heimdal/lib/asn1/k5.asn1 b/lib/asn1/k5.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/k5.asn1
rename to lib/asn1/k5.asn1
diff --git a/crypto/heimdal/lib/asn1/kx509.asn1 b/lib/asn1/kx509.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/kx509.asn1
rename to lib/asn1/kx509.asn1
diff --git a/crypto/heimdal/lib/asn1/lex.c b/lib/asn1/lex.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/lex.c
rename to lib/asn1/lex.c
diff --git a/crypto/heimdal/lib/asn1/lex.h b/lib/asn1/lex.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/lex.h
rename to lib/asn1/lex.h
diff --git a/crypto/heimdal/lib/asn1/lex.l b/lib/asn1/lex.l
similarity index 100%
rename from crypto/heimdal/lib/asn1/lex.l
rename to lib/asn1/lex.l
diff --git a/crypto/heimdal/lib/asn1/main.c b/lib/asn1/main.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/main.c
rename to lib/asn1/main.c
diff --git a/crypto/heimdal/lib/asn1/parse.c b/lib/asn1/parse.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/parse.c
rename to lib/asn1/parse.c
diff --git a/crypto/heimdal/lib/asn1/parse.h b/lib/asn1/parse.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/parse.h
rename to lib/asn1/parse.h
diff --git a/crypto/heimdal/lib/asn1/parse.y b/lib/asn1/parse.y
similarity index 100%
rename from crypto/heimdal/lib/asn1/parse.y
rename to lib/asn1/parse.y
diff --git a/crypto/heimdal/lib/asn1/pkcs12.asn1 b/lib/asn1/pkcs12.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/pkcs12.asn1
rename to lib/asn1/pkcs12.asn1
diff --git a/crypto/heimdal/lib/asn1/pkcs8.asn1 b/lib/asn1/pkcs8.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/pkcs8.asn1
rename to lib/asn1/pkcs8.asn1
diff --git a/crypto/heimdal/lib/asn1/pkcs9.asn1 b/lib/asn1/pkcs9.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/pkcs9.asn1
rename to lib/asn1/pkcs9.asn1
diff --git a/crypto/heimdal/lib/asn1/pkinit.asn1 b/lib/asn1/pkinit.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/pkinit.asn1
rename to lib/asn1/pkinit.asn1
diff --git a/crypto/heimdal/lib/asn1/rfc2459.asn1 b/lib/asn1/rfc2459.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/rfc2459.asn1
rename to lib/asn1/rfc2459.asn1
diff --git a/crypto/heimdal/lib/asn1/setchgpw2.asn1 b/lib/asn1/setchgpw2.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/setchgpw2.asn1
rename to lib/asn1/setchgpw2.asn1
diff --git a/crypto/heimdal/lib/asn1/symbol.c b/lib/asn1/symbol.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/symbol.c
rename to lib/asn1/symbol.c
diff --git a/crypto/heimdal/lib/asn1/symbol.h b/lib/asn1/symbol.h
similarity index 100%
rename from crypto/heimdal/lib/asn1/symbol.h
rename to lib/asn1/symbol.h
diff --git a/crypto/heimdal/lib/asn1/test.asn1 b/lib/asn1/test.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/test.asn1
rename to lib/asn1/test.asn1
diff --git a/crypto/heimdal/lib/asn1/test.gen b/lib/asn1/test.gen
similarity index 100%
rename from crypto/heimdal/lib/asn1/test.gen
rename to lib/asn1/test.gen
diff --git a/crypto/heimdal/lib/asn1/timegm.c b/lib/asn1/timegm.c
similarity index 100%
rename from crypto/heimdal/lib/asn1/timegm.c
rename to lib/asn1/timegm.c
diff --git a/crypto/heimdal/lib/asn1/x509.asn1 b/lib/asn1/x509.asn1
similarity index 100%
rename from crypto/heimdal/lib/asn1/x509.asn1
rename to lib/asn1/x509.asn1
diff --git a/crypto/heimdal/lib/auth/ChangeLog b/lib/auth/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/auth/ChangeLog
rename to lib/auth/ChangeLog
diff --git a/crypto/heimdal/lib/auth/Makefile.am b/lib/auth/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/auth/Makefile.am
rename to lib/auth/Makefile.am
diff --git a/crypto/heimdal/lib/auth/Makefile.in b/lib/auth/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/auth/Makefile.in
rename to lib/auth/Makefile.in
diff --git a/crypto/heimdal/lib/auth/afskauthlib/Makefile.am b/lib/auth/afskauthlib/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/auth/afskauthlib/Makefile.am
rename to lib/auth/afskauthlib/Makefile.am
diff --git a/crypto/heimdal/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/auth/afskauthlib/Makefile.in
rename to lib/auth/afskauthlib/Makefile.in
diff --git a/crypto/heimdal/lib/auth/afskauthlib/verify.c b/lib/auth/afskauthlib/verify.c
similarity index 100%
rename from crypto/heimdal/lib/auth/afskauthlib/verify.c
rename to lib/auth/afskauthlib/verify.c
diff --git a/crypto/heimdal/lib/auth/pam/Makefile.am b/lib/auth/pam/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/auth/pam/Makefile.am
rename to lib/auth/pam/Makefile.am
diff --git a/crypto/heimdal/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/auth/pam/Makefile.in
rename to lib/auth/pam/Makefile.in
diff --git a/crypto/heimdal/lib/auth/pam/pam.c b/lib/auth/pam/pam.c
similarity index 100%
rename from crypto/heimdal/lib/auth/pam/pam.c
rename to lib/auth/pam/pam.c
diff --git a/crypto/heimdal/lib/auth/pam/pam.conf.add b/lib/auth/pam/pam.conf.add
similarity index 100%
rename from crypto/heimdal/lib/auth/pam/pam.conf.add
rename to lib/auth/pam/pam.conf.add
diff --git a/crypto/heimdal/lib/auth/sia/Makefile.am b/lib/auth/sia/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/Makefile.am
rename to lib/auth/sia/Makefile.am
diff --git a/crypto/heimdal/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/Makefile.in
rename to lib/auth/sia/Makefile.in
diff --git a/crypto/heimdal/lib/auth/sia/krb4+c2_matrix.conf b/lib/auth/sia/krb4+c2_matrix.conf
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/krb4+c2_matrix.conf
rename to lib/auth/sia/krb4+c2_matrix.conf
diff --git a/crypto/heimdal/lib/auth/sia/krb4_matrix.conf b/lib/auth/sia/krb4_matrix.conf
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/krb4_matrix.conf
rename to lib/auth/sia/krb4_matrix.conf
diff --git a/crypto/heimdal/lib/auth/sia/krb5+c2_matrix.conf b/lib/auth/sia/krb5+c2_matrix.conf
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/krb5+c2_matrix.conf
rename to lib/auth/sia/krb5+c2_matrix.conf
diff --git a/crypto/heimdal/lib/auth/sia/krb5_matrix.conf b/lib/auth/sia/krb5_matrix.conf
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/krb5_matrix.conf
rename to lib/auth/sia/krb5_matrix.conf
diff --git a/crypto/heimdal/lib/auth/sia/make-rpath b/lib/auth/sia/make-rpath
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/make-rpath
rename to lib/auth/sia/make-rpath
diff --git a/crypto/heimdal/lib/auth/sia/posix_getpw.c b/lib/auth/sia/posix_getpw.c
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/posix_getpw.c
rename to lib/auth/sia/posix_getpw.c
diff --git a/crypto/heimdal/lib/auth/sia/security.patch b/lib/auth/sia/security.patch
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/security.patch
rename to lib/auth/sia/security.patch
diff --git a/crypto/heimdal/lib/auth/sia/sia.c b/lib/auth/sia/sia.c
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/sia.c
rename to lib/auth/sia/sia.c
diff --git a/crypto/heimdal/lib/auth/sia/sia_locl.h b/lib/auth/sia/sia_locl.h
similarity index 100%
rename from crypto/heimdal/lib/auth/sia/sia_locl.h
rename to lib/auth/sia/sia_locl.h
diff --git a/crypto/heimdal/lib/com_err/ChangeLog b/lib/com_err/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/com_err/ChangeLog
rename to lib/com_err/ChangeLog
diff --git a/crypto/heimdal/lib/com_err/Makefile.am b/lib/com_err/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/com_err/Makefile.am
rename to lib/com_err/Makefile.am
diff --git a/crypto/heimdal/lib/com_err/Makefile.in b/lib/com_err/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/com_err/Makefile.in
rename to lib/com_err/Makefile.in
diff --git a/crypto/heimdal/lib/com_err/com_err.c b/lib/com_err/com_err.c
similarity index 100%
rename from crypto/heimdal/lib/com_err/com_err.c
rename to lib/com_err/com_err.c
diff --git a/crypto/heimdal/lib/com_err/com_err.h b/lib/com_err/com_err.h
similarity index 100%
rename from crypto/heimdal/lib/com_err/com_err.h
rename to lib/com_err/com_err.h
diff --git a/crypto/heimdal/lib/com_err/com_right.h b/lib/com_err/com_right.h
similarity index 100%
rename from crypto/heimdal/lib/com_err/com_right.h
rename to lib/com_err/com_right.h
diff --git a/crypto/heimdal/lib/com_err/compile_et.c b/lib/com_err/compile_et.c
similarity index 100%
rename from crypto/heimdal/lib/com_err/compile_et.c
rename to lib/com_err/compile_et.c
diff --git a/crypto/heimdal/lib/com_err/compile_et.h b/lib/com_err/compile_et.h
similarity index 100%
rename from crypto/heimdal/lib/com_err/compile_et.h
rename to lib/com_err/compile_et.h
diff --git a/crypto/heimdal/lib/com_err/error.c b/lib/com_err/error.c
similarity index 100%
rename from crypto/heimdal/lib/com_err/error.c
rename to lib/com_err/error.c
diff --git a/crypto/heimdal/lib/com_err/lex.c b/lib/com_err/lex.c
similarity index 100%
rename from crypto/heimdal/lib/com_err/lex.c
rename to lib/com_err/lex.c
diff --git a/crypto/heimdal/lib/com_err/lex.h b/lib/com_err/lex.h
similarity index 100%
rename from crypto/heimdal/lib/com_err/lex.h
rename to lib/com_err/lex.h
diff --git a/crypto/heimdal/lib/com_err/lex.l b/lib/com_err/lex.l
similarity index 100%
rename from crypto/heimdal/lib/com_err/lex.l
rename to lib/com_err/lex.l
diff --git a/crypto/heimdal/lib/com_err/parse.c b/lib/com_err/parse.c
similarity index 100%
rename from crypto/heimdal/lib/com_err/parse.c
rename to lib/com_err/parse.c
diff --git a/crypto/heimdal/lib/com_err/parse.h b/lib/com_err/parse.h
similarity index 100%
rename from crypto/heimdal/lib/com_err/parse.h
rename to lib/com_err/parse.h
diff --git a/crypto/heimdal/lib/com_err/parse.y b/lib/com_err/parse.y
similarity index 100%
rename from crypto/heimdal/lib/com_err/parse.y
rename to lib/com_err/parse.y
diff --git a/crypto/heimdal/lib/com_err/roken_rename.h b/lib/com_err/roken_rename.h
similarity index 100%
rename from crypto/heimdal/lib/com_err/roken_rename.h
rename to lib/com_err/roken_rename.h
diff --git a/crypto/heimdal/lib/com_err/version-script.map b/lib/com_err/version-script.map
similarity index 100%
rename from crypto/heimdal/lib/com_err/version-script.map
rename to lib/com_err/version-script.map
diff --git a/crypto/heimdal/lib/gssapi/8003.c b/lib/gssapi/8003.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/8003.c
rename to lib/gssapi/8003.c
diff --git a/crypto/heimdal/lib/gssapi/ChangeLog b/lib/gssapi/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ChangeLog
rename to lib/gssapi/ChangeLog
diff --git a/crypto/heimdal/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/gssapi/Makefile.am
rename to lib/gssapi/Makefile.am
diff --git a/crypto/heimdal/lib/gssapi/Makefile.in b/lib/gssapi/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/gssapi/Makefile.in
rename to lib/gssapi/Makefile.in
diff --git a/crypto/heimdal/lib/gssapi/accept_sec_context.c b/lib/gssapi/accept_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/accept_sec_context.c
rename to lib/gssapi/accept_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/acquire_cred.c b/lib/gssapi/acquire_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/acquire_cred.c
rename to lib/gssapi/acquire_cred.c
diff --git a/crypto/heimdal/lib/gssapi/add_cred.c b/lib/gssapi/add_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/add_cred.c
rename to lib/gssapi/add_cred.c
diff --git a/crypto/heimdal/lib/gssapi/add_oid_set_member.c b/lib/gssapi/add_oid_set_member.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/add_oid_set_member.c
rename to lib/gssapi/add_oid_set_member.c
diff --git a/crypto/heimdal/lib/gssapi/address_to_krb5addr.c b/lib/gssapi/address_to_krb5addr.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/address_to_krb5addr.c
rename to lib/gssapi/address_to_krb5addr.c
diff --git a/crypto/heimdal/lib/gssapi/arcfour.c b/lib/gssapi/arcfour.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/arcfour.c
rename to lib/gssapi/arcfour.c
diff --git a/crypto/heimdal/lib/gssapi/arcfour.h b/lib/gssapi/arcfour.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/arcfour.h
rename to lib/gssapi/arcfour.h
diff --git a/crypto/heimdal/lib/gssapi/canonicalize_name.c b/lib/gssapi/canonicalize_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/canonicalize_name.c
rename to lib/gssapi/canonicalize_name.c
diff --git a/crypto/heimdal/lib/gssapi/compare_name.c b/lib/gssapi/compare_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/compare_name.c
rename to lib/gssapi/compare_name.c
diff --git a/crypto/heimdal/lib/gssapi/compat.c b/lib/gssapi/compat.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/compat.c
rename to lib/gssapi/compat.c
diff --git a/crypto/heimdal/lib/gssapi/context_time.c b/lib/gssapi/context_time.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/context_time.c
rename to lib/gssapi/context_time.c
diff --git a/crypto/heimdal/lib/gssapi/copy_ccache.c b/lib/gssapi/copy_ccache.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/copy_ccache.c
rename to lib/gssapi/copy_ccache.c
diff --git a/crypto/heimdal/lib/gssapi/create_emtpy_oid_set.c b/lib/gssapi/create_emtpy_oid_set.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/create_emtpy_oid_set.c
rename to lib/gssapi/create_emtpy_oid_set.c
diff --git a/crypto/heimdal/lib/gssapi/decapsulate.c b/lib/gssapi/decapsulate.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/decapsulate.c
rename to lib/gssapi/decapsulate.c
diff --git a/crypto/heimdal/lib/gssapi/delete_sec_context.c b/lib/gssapi/delete_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/delete_sec_context.c
rename to lib/gssapi/delete_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/display_name.c b/lib/gssapi/display_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/display_name.c
rename to lib/gssapi/display_name.c
diff --git a/crypto/heimdal/lib/gssapi/display_status.c b/lib/gssapi/display_status.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/display_status.c
rename to lib/gssapi/display_status.c
diff --git a/crypto/heimdal/lib/gssapi/duplicate_name.c b/lib/gssapi/duplicate_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/duplicate_name.c
rename to lib/gssapi/duplicate_name.c
diff --git a/crypto/heimdal/lib/gssapi/encapsulate.c b/lib/gssapi/encapsulate.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/encapsulate.c
rename to lib/gssapi/encapsulate.c
diff --git a/crypto/heimdal/lib/gssapi/export_name.c b/lib/gssapi/export_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/export_name.c
rename to lib/gssapi/export_name.c
diff --git a/crypto/heimdal/lib/gssapi/export_sec_context.c b/lib/gssapi/export_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/export_sec_context.c
rename to lib/gssapi/export_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/external.c b/lib/gssapi/external.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/external.c
rename to lib/gssapi/external.c
diff --git a/crypto/heimdal/lib/gssapi/get_mic.c b/lib/gssapi/get_mic.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/get_mic.c
rename to lib/gssapi/get_mic.c
diff --git a/crypto/heimdal/lib/gssapi/gss-commands.in b/lib/gssapi/gss-commands.in
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gss-commands.in
rename to lib/gssapi/gss-commands.in
diff --git a/crypto/heimdal/lib/gssapi/gss.c b/lib/gssapi/gss.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gss.c
rename to lib/gssapi/gss.c
diff --git a/crypto/heimdal/lib/gssapi/gss_acquire_cred.3 b/lib/gssapi/gss_acquire_cred.3
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gss_acquire_cred.3
rename to lib/gssapi/gss_acquire_cred.3
diff --git a/crypto/heimdal/lib/gssapi/gssapi.3 b/lib/gssapi/gssapi.3
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gssapi.3
rename to lib/gssapi/gssapi.3
diff --git a/crypto/heimdal/lib/gssapi/gssapi.h b/lib/gssapi/gssapi.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gssapi.h
rename to lib/gssapi/gssapi.h
diff --git a/crypto/heimdal/lib/gssapi/gssapi/gssapi.h b/lib/gssapi/gssapi/gssapi.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gssapi/gssapi.h
rename to lib/gssapi/gssapi/gssapi.h
diff --git a/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h b/lib/gssapi/gssapi/gssapi_krb5.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
rename to lib/gssapi/gssapi/gssapi_krb5.h
diff --git a/crypto/heimdal/lib/gssapi/gssapi/gssapi_spnego.h b/lib/gssapi/gssapi/gssapi_spnego.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gssapi/gssapi_spnego.h
rename to lib/gssapi/gssapi/gssapi_spnego.h
diff --git a/crypto/heimdal/lib/gssapi/gssapi_locl.h b/lib/gssapi/gssapi_locl.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gssapi_locl.h
rename to lib/gssapi/gssapi_locl.h
diff --git a/crypto/heimdal/lib/gssapi/gssapi_mech.h b/lib/gssapi/gssapi_mech.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/gssapi_mech.h
rename to lib/gssapi/gssapi_mech.h
diff --git a/crypto/heimdal/lib/gssapi/import_name.c b/lib/gssapi/import_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/import_name.c
rename to lib/gssapi/import_name.c
diff --git a/crypto/heimdal/lib/gssapi/import_sec_context.c b/lib/gssapi/import_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/import_sec_context.c
rename to lib/gssapi/import_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/indicate_mechs.c b/lib/gssapi/indicate_mechs.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/indicate_mechs.c
rename to lib/gssapi/indicate_mechs.c
diff --git a/crypto/heimdal/lib/gssapi/init.c b/lib/gssapi/init.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/init.c
rename to lib/gssapi/init.c
diff --git a/crypto/heimdal/lib/gssapi/init_sec_context.c b/lib/gssapi/init_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/init_sec_context.c
rename to lib/gssapi/init_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/inquire_context.c b/lib/gssapi/inquire_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/inquire_context.c
rename to lib/gssapi/inquire_context.c
diff --git a/crypto/heimdal/lib/gssapi/inquire_cred.c b/lib/gssapi/inquire_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/inquire_cred.c
rename to lib/gssapi/inquire_cred.c
diff --git a/crypto/heimdal/lib/gssapi/inquire_cred_by_mech.c b/lib/gssapi/inquire_cred_by_mech.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/inquire_cred_by_mech.c
rename to lib/gssapi/inquire_cred_by_mech.c
diff --git a/crypto/heimdal/lib/gssapi/inquire_mechs_for_name.c b/lib/gssapi/inquire_mechs_for_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/inquire_mechs_for_name.c
rename to lib/gssapi/inquire_mechs_for_name.c
diff --git a/crypto/heimdal/lib/gssapi/inquire_names_for_mech.c b/lib/gssapi/inquire_names_for_mech.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/inquire_names_for_mech.c
rename to lib/gssapi/inquire_names_for_mech.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/8003.c b/lib/gssapi/krb5/8003.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/8003.c
rename to lib/gssapi/krb5/8003.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/accept_sec_context.c
rename to lib/gssapi/krb5/accept_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/acquire_cred.c b/lib/gssapi/krb5/acquire_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/acquire_cred.c
rename to lib/gssapi/krb5/acquire_cred.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/add_cred.c b/lib/gssapi/krb5/add_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/add_cred.c
rename to lib/gssapi/krb5/add_cred.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/address_to_krb5addr.c b/lib/gssapi/krb5/address_to_krb5addr.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/address_to_krb5addr.c
rename to lib/gssapi/krb5/address_to_krb5addr.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/arcfour.c b/lib/gssapi/krb5/arcfour.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/arcfour.c
rename to lib/gssapi/krb5/arcfour.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/canonicalize_name.c b/lib/gssapi/krb5/canonicalize_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/canonicalize_name.c
rename to lib/gssapi/krb5/canonicalize_name.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/ccache_name.c b/lib/gssapi/krb5/ccache_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/ccache_name.c
rename to lib/gssapi/krb5/ccache_name.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/cfx.c b/lib/gssapi/krb5/cfx.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/cfx.c
rename to lib/gssapi/krb5/cfx.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/cfx.h b/lib/gssapi/krb5/cfx.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/cfx.h
rename to lib/gssapi/krb5/cfx.h
diff --git a/crypto/heimdal/lib/gssapi/krb5/compare_name.c b/lib/gssapi/krb5/compare_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/compare_name.c
rename to lib/gssapi/krb5/compare_name.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/compat.c b/lib/gssapi/krb5/compat.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/compat.c
rename to lib/gssapi/krb5/compat.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/context_time.c b/lib/gssapi/krb5/context_time.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/context_time.c
rename to lib/gssapi/krb5/context_time.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/copy_ccache.c b/lib/gssapi/krb5/copy_ccache.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/copy_ccache.c
rename to lib/gssapi/krb5/copy_ccache.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/decapsulate.c b/lib/gssapi/krb5/decapsulate.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/decapsulate.c
rename to lib/gssapi/krb5/decapsulate.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/delete_sec_context.c b/lib/gssapi/krb5/delete_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/delete_sec_context.c
rename to lib/gssapi/krb5/delete_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/display_name.c b/lib/gssapi/krb5/display_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/display_name.c
rename to lib/gssapi/krb5/display_name.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/display_status.c b/lib/gssapi/krb5/display_status.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/display_status.c
rename to lib/gssapi/krb5/display_status.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/duplicate_name.c b/lib/gssapi/krb5/duplicate_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/duplicate_name.c
rename to lib/gssapi/krb5/duplicate_name.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/encapsulate.c b/lib/gssapi/krb5/encapsulate.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/encapsulate.c
rename to lib/gssapi/krb5/encapsulate.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/export_name.c b/lib/gssapi/krb5/export_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/export_name.c
rename to lib/gssapi/krb5/export_name.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/export_sec_context.c b/lib/gssapi/krb5/export_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/export_sec_context.c
rename to lib/gssapi/krb5/export_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/external.c b/lib/gssapi/krb5/external.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/external.c
rename to lib/gssapi/krb5/external.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/get_mic.c
rename to lib/gssapi/krb5/get_mic.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/gkrb5_err.et b/lib/gssapi/krb5/gkrb5_err.et
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/gkrb5_err.et
rename to lib/gssapi/krb5/gkrb5_err.et
diff --git a/crypto/heimdal/lib/gssapi/krb5/gsskrb5-private.h b/lib/gssapi/krb5/gsskrb5-private.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/gsskrb5-private.h
rename to lib/gssapi/krb5/gsskrb5-private.h
diff --git a/crypto/heimdal/lib/gssapi/krb5/gsskrb5_locl.h b/lib/gssapi/krb5/gsskrb5_locl.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/gsskrb5_locl.h
rename to lib/gssapi/krb5/gsskrb5_locl.h
diff --git a/crypto/heimdal/lib/gssapi/krb5/import_name.c b/lib/gssapi/krb5/import_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/import_name.c
rename to lib/gssapi/krb5/import_name.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/import_sec_context.c b/lib/gssapi/krb5/import_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/import_sec_context.c
rename to lib/gssapi/krb5/import_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/indicate_mechs.c b/lib/gssapi/krb5/indicate_mechs.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/indicate_mechs.c
rename to lib/gssapi/krb5/indicate_mechs.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/init.c b/lib/gssapi/krb5/init.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/init.c
rename to lib/gssapi/krb5/init.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/init_sec_context.c
rename to lib/gssapi/krb5/init_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/inquire_context.c b/lib/gssapi/krb5/inquire_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/inquire_context.c
rename to lib/gssapi/krb5/inquire_context.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/inquire_cred.c b/lib/gssapi/krb5/inquire_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/inquire_cred.c
rename to lib/gssapi/krb5/inquire_cred.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c b/lib/gssapi/krb5/inquire_cred_by_mech.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c
rename to lib/gssapi/krb5/inquire_cred_by_mech.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c b/lib/gssapi/krb5/inquire_cred_by_oid.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c
rename to lib/gssapi/krb5/inquire_cred_by_oid.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c b/lib/gssapi/krb5/inquire_mechs_for_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c
rename to lib/gssapi/krb5/inquire_mechs_for_name.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/inquire_names_for_mech.c b/lib/gssapi/krb5/inquire_names_for_mech.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/inquire_names_for_mech.c
rename to lib/gssapi/krb5/inquire_names_for_mech.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c b/lib/gssapi/krb5/inquire_sec_context_by_oid.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c
rename to lib/gssapi/krb5/inquire_sec_context_by_oid.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/prf.c b/lib/gssapi/krb5/prf.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/prf.c
rename to lib/gssapi/krb5/prf.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/process_context_token.c b/lib/gssapi/krb5/process_context_token.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/process_context_token.c
rename to lib/gssapi/krb5/process_context_token.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/release_buffer.c b/lib/gssapi/krb5/release_buffer.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/release_buffer.c
rename to lib/gssapi/krb5/release_buffer.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/release_cred.c b/lib/gssapi/krb5/release_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/release_cred.c
rename to lib/gssapi/krb5/release_cred.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/release_name.c b/lib/gssapi/krb5/release_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/release_name.c
rename to lib/gssapi/krb5/release_name.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/sequence.c b/lib/gssapi/krb5/sequence.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/sequence.c
rename to lib/gssapi/krb5/sequence.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/set_cred_option.c b/lib/gssapi/krb5/set_cred_option.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/set_cred_option.c
rename to lib/gssapi/krb5/set_cred_option.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/set_sec_context_option.c b/lib/gssapi/krb5/set_sec_context_option.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/set_sec_context_option.c
rename to lib/gssapi/krb5/set_sec_context_option.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/test_cfx.c b/lib/gssapi/krb5/test_cfx.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/test_cfx.c
rename to lib/gssapi/krb5/test_cfx.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/ticket_flags.c b/lib/gssapi/krb5/ticket_flags.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/ticket_flags.c
rename to lib/gssapi/krb5/ticket_flags.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/unwrap.c
rename to lib/gssapi/krb5/unwrap.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/v1.c b/lib/gssapi/krb5/v1.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/v1.c
rename to lib/gssapi/krb5/v1.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/verify_mic.c
rename to lib/gssapi/krb5/verify_mic.c
diff --git a/crypto/heimdal/lib/gssapi/krb5/wrap.c b/lib/gssapi/krb5/wrap.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/krb5/wrap.c
rename to lib/gssapi/krb5/wrap.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/accept_sec_context.c b/lib/gssapi/ntlm/accept_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/accept_sec_context.c
rename to lib/gssapi/ntlm/accept_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/acquire_cred.c b/lib/gssapi/ntlm/acquire_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/acquire_cred.c
rename to lib/gssapi/ntlm/acquire_cred.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/add_cred.c b/lib/gssapi/ntlm/add_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/add_cred.c
rename to lib/gssapi/ntlm/add_cred.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/canonicalize_name.c b/lib/gssapi/ntlm/canonicalize_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/canonicalize_name.c
rename to lib/gssapi/ntlm/canonicalize_name.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/compare_name.c b/lib/gssapi/ntlm/compare_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/compare_name.c
rename to lib/gssapi/ntlm/compare_name.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/context_time.c b/lib/gssapi/ntlm/context_time.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/context_time.c
rename to lib/gssapi/ntlm/context_time.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/crypto.c b/lib/gssapi/ntlm/crypto.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/crypto.c
rename to lib/gssapi/ntlm/crypto.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/delete_sec_context.c b/lib/gssapi/ntlm/delete_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/delete_sec_context.c
rename to lib/gssapi/ntlm/delete_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/digest.c b/lib/gssapi/ntlm/digest.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/digest.c
rename to lib/gssapi/ntlm/digest.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/display_name.c b/lib/gssapi/ntlm/display_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/display_name.c
rename to lib/gssapi/ntlm/display_name.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/display_status.c b/lib/gssapi/ntlm/display_status.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/display_status.c
rename to lib/gssapi/ntlm/display_status.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/duplicate_name.c b/lib/gssapi/ntlm/duplicate_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/duplicate_name.c
rename to lib/gssapi/ntlm/duplicate_name.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/export_name.c b/lib/gssapi/ntlm/export_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/export_name.c
rename to lib/gssapi/ntlm/export_name.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/export_sec_context.c b/lib/gssapi/ntlm/export_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/export_sec_context.c
rename to lib/gssapi/ntlm/export_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/external.c b/lib/gssapi/ntlm/external.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/external.c
rename to lib/gssapi/ntlm/external.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/import_name.c b/lib/gssapi/ntlm/import_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/import_name.c
rename to lib/gssapi/ntlm/import_name.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/import_sec_context.c b/lib/gssapi/ntlm/import_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/import_sec_context.c
rename to lib/gssapi/ntlm/import_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/indicate_mechs.c b/lib/gssapi/ntlm/indicate_mechs.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/indicate_mechs.c
rename to lib/gssapi/ntlm/indicate_mechs.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/init_sec_context.c b/lib/gssapi/ntlm/init_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/init_sec_context.c
rename to lib/gssapi/ntlm/init_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/inquire_context.c b/lib/gssapi/ntlm/inquire_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/inquire_context.c
rename to lib/gssapi/ntlm/inquire_context.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/inquire_cred.c b/lib/gssapi/ntlm/inquire_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/inquire_cred.c
rename to lib/gssapi/ntlm/inquire_cred.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/inquire_cred_by_mech.c b/lib/gssapi/ntlm/inquire_cred_by_mech.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/inquire_cred_by_mech.c
rename to lib/gssapi/ntlm/inquire_cred_by_mech.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/inquire_mechs_for_name.c b/lib/gssapi/ntlm/inquire_mechs_for_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/inquire_mechs_for_name.c
rename to lib/gssapi/ntlm/inquire_mechs_for_name.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/inquire_names_for_mech.c b/lib/gssapi/ntlm/inquire_names_for_mech.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/inquire_names_for_mech.c
rename to lib/gssapi/ntlm/inquire_names_for_mech.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/ntlm-private.h b/lib/gssapi/ntlm/ntlm-private.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/ntlm-private.h
rename to lib/gssapi/ntlm/ntlm-private.h
diff --git a/crypto/heimdal/lib/gssapi/ntlm/ntlm.h b/lib/gssapi/ntlm/ntlm.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/ntlm.h
rename to lib/gssapi/ntlm/ntlm.h
diff --git a/crypto/heimdal/lib/gssapi/ntlm/process_context_token.c b/lib/gssapi/ntlm/process_context_token.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/process_context_token.c
rename to lib/gssapi/ntlm/process_context_token.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/release_cred.c b/lib/gssapi/ntlm/release_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/release_cred.c
rename to lib/gssapi/ntlm/release_cred.c
diff --git a/crypto/heimdal/lib/gssapi/ntlm/release_name.c b/lib/gssapi/ntlm/release_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/ntlm/release_name.c
rename to lib/gssapi/ntlm/release_name.c
diff --git a/crypto/heimdal/lib/gssapi/process_context_token.c b/lib/gssapi/process_context_token.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/process_context_token.c
rename to lib/gssapi/process_context_token.c
diff --git a/crypto/heimdal/lib/gssapi/release_buffer.c b/lib/gssapi/release_buffer.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/release_buffer.c
rename to lib/gssapi/release_buffer.c
diff --git a/crypto/heimdal/lib/gssapi/release_cred.c b/lib/gssapi/release_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/release_cred.c
rename to lib/gssapi/release_cred.c
diff --git a/crypto/heimdal/lib/gssapi/release_name.c b/lib/gssapi/release_name.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/release_name.c
rename to lib/gssapi/release_name.c
diff --git a/crypto/heimdal/lib/gssapi/release_oid_set.c b/lib/gssapi/release_oid_set.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/release_oid_set.c
rename to lib/gssapi/release_oid_set.c
diff --git a/crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c b/lib/gssapi/spnego/accept_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c
rename to lib/gssapi/spnego/accept_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/spnego/compat.c b/lib/gssapi/spnego/compat.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/spnego/compat.c
rename to lib/gssapi/spnego/compat.c
diff --git a/crypto/heimdal/lib/gssapi/spnego/context_stubs.c b/lib/gssapi/spnego/context_stubs.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/spnego/context_stubs.c
rename to lib/gssapi/spnego/context_stubs.c
diff --git a/crypto/heimdal/lib/gssapi/spnego/cred_stubs.c b/lib/gssapi/spnego/cred_stubs.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/spnego/cred_stubs.c
rename to lib/gssapi/spnego/cred_stubs.c
diff --git a/crypto/heimdal/lib/gssapi/spnego/external.c b/lib/gssapi/spnego/external.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/spnego/external.c
rename to lib/gssapi/spnego/external.c
diff --git a/crypto/heimdal/lib/gssapi/spnego/init_sec_context.c b/lib/gssapi/spnego/init_sec_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/spnego/init_sec_context.c
rename to lib/gssapi/spnego/init_sec_context.c
diff --git a/crypto/heimdal/lib/gssapi/spnego/spnego-private.h b/lib/gssapi/spnego/spnego-private.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/spnego/spnego-private.h
rename to lib/gssapi/spnego/spnego-private.h
diff --git a/crypto/heimdal/lib/gssapi/spnego/spnego.asn1 b/lib/gssapi/spnego/spnego.asn1
similarity index 100%
rename from crypto/heimdal/lib/gssapi/spnego/spnego.asn1
rename to lib/gssapi/spnego/spnego.asn1
diff --git a/crypto/heimdal/lib/gssapi/spnego/spnego_locl.h b/lib/gssapi/spnego/spnego_locl.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/spnego/spnego_locl.h
rename to lib/gssapi/spnego/spnego_locl.h
diff --git a/crypto/heimdal/lib/gssapi/test_acquire_cred.c b/lib/gssapi/test_acquire_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_acquire_cred.c
rename to lib/gssapi/test_acquire_cred.c
diff --git a/crypto/heimdal/lib/gssapi/test_common.c b/lib/gssapi/test_common.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_common.c
rename to lib/gssapi/test_common.c
diff --git a/crypto/heimdal/lib/gssapi/test_common.h b/lib/gssapi/test_common.h
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_common.h
rename to lib/gssapi/test_common.h
diff --git a/crypto/heimdal/lib/gssapi/test_context.c b/lib/gssapi/test_context.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_context.c
rename to lib/gssapi/test_context.c
diff --git a/crypto/heimdal/lib/gssapi/test_cred.c b/lib/gssapi/test_cred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_cred.c
rename to lib/gssapi/test_cred.c
diff --git a/crypto/heimdal/lib/gssapi/test_kcred.c b/lib/gssapi/test_kcred.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_kcred.c
rename to lib/gssapi/test_kcred.c
diff --git a/crypto/heimdal/lib/gssapi/test_names.c b/lib/gssapi/test_names.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_names.c
rename to lib/gssapi/test_names.c
diff --git a/crypto/heimdal/lib/gssapi/test_ntlm.c b/lib/gssapi/test_ntlm.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_ntlm.c
rename to lib/gssapi/test_ntlm.c
diff --git a/crypto/heimdal/lib/gssapi/test_oid.c b/lib/gssapi/test_oid.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_oid.c
rename to lib/gssapi/test_oid.c
diff --git a/crypto/heimdal/lib/gssapi/test_oid_set_member.c b/lib/gssapi/test_oid_set_member.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/test_oid_set_member.c
rename to lib/gssapi/test_oid_set_member.c
diff --git a/crypto/heimdal/lib/gssapi/unwrap.c b/lib/gssapi/unwrap.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/unwrap.c
rename to lib/gssapi/unwrap.c
diff --git a/crypto/heimdal/lib/gssapi/v1.c b/lib/gssapi/v1.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/v1.c
rename to lib/gssapi/v1.c
diff --git a/crypto/heimdal/lib/gssapi/verify_mic.c b/lib/gssapi/verify_mic.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/verify_mic.c
rename to lib/gssapi/verify_mic.c
diff --git a/crypto/heimdal/lib/gssapi/version-script.map b/lib/gssapi/version-script.map
similarity index 100%
rename from crypto/heimdal/lib/gssapi/version-script.map
rename to lib/gssapi/version-script.map
diff --git a/crypto/heimdal/lib/gssapi/wrap.c b/lib/gssapi/wrap.c
similarity index 100%
rename from crypto/heimdal/lib/gssapi/wrap.c
rename to lib/gssapi/wrap.c
diff --git a/crypto/heimdal/lib/hdb/Makefile.am b/lib/hdb/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/hdb/Makefile.am
rename to lib/hdb/Makefile.am
diff --git a/crypto/heimdal/lib/hdb/Makefile.in b/lib/hdb/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/hdb/Makefile.in
rename to lib/hdb/Makefile.in
diff --git a/crypto/heimdal/lib/hdb/common.c b/lib/hdb/common.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/common.c
rename to lib/hdb/common.c
diff --git a/crypto/heimdal/lib/hdb/convert_db.c b/lib/hdb/convert_db.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/convert_db.c
rename to lib/hdb/convert_db.c
diff --git a/crypto/heimdal/lib/hdb/db.c b/lib/hdb/db.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/db.c
rename to lib/hdb/db.c
diff --git a/crypto/heimdal/lib/hdb/db3.c b/lib/hdb/db3.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/db3.c
rename to lib/hdb/db3.c
diff --git a/crypto/heimdal/lib/hdb/dbinfo.c b/lib/hdb/dbinfo.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/dbinfo.c
rename to lib/hdb/dbinfo.c
diff --git a/crypto/heimdal/lib/hdb/ext.c b/lib/hdb/ext.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/ext.c
rename to lib/hdb/ext.c
diff --git a/crypto/heimdal/lib/hdb/hdb-ldap.c b/lib/hdb/hdb-ldap.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/hdb-ldap.c
rename to lib/hdb/hdb-ldap.c
diff --git a/crypto/heimdal/lib/hdb/hdb-private.h b/lib/hdb/hdb-private.h
similarity index 100%
rename from crypto/heimdal/lib/hdb/hdb-private.h
rename to lib/hdb/hdb-private.h
diff --git a/crypto/heimdal/lib/hdb/hdb-protos.h b/lib/hdb/hdb-protos.h
similarity index 100%
rename from crypto/heimdal/lib/hdb/hdb-protos.h
rename to lib/hdb/hdb-protos.h
diff --git a/crypto/heimdal/lib/hdb/hdb.asn1 b/lib/hdb/hdb.asn1
similarity index 100%
rename from crypto/heimdal/lib/hdb/hdb.asn1
rename to lib/hdb/hdb.asn1
diff --git a/crypto/heimdal/lib/hdb/hdb.c b/lib/hdb/hdb.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/hdb.c
rename to lib/hdb/hdb.c
diff --git a/crypto/heimdal/lib/hdb/hdb.h b/lib/hdb/hdb.h
similarity index 100%
rename from crypto/heimdal/lib/hdb/hdb.h
rename to lib/hdb/hdb.h
diff --git a/crypto/heimdal/lib/hdb/hdb.schema b/lib/hdb/hdb.schema
similarity index 100%
rename from crypto/heimdal/lib/hdb/hdb.schema
rename to lib/hdb/hdb.schema
diff --git a/crypto/heimdal/lib/hdb/hdb_err.et b/lib/hdb/hdb_err.et
similarity index 100%
rename from crypto/heimdal/lib/hdb/hdb_err.et
rename to lib/hdb/hdb_err.et
diff --git a/crypto/heimdal/lib/hdb/hdb_locl.h b/lib/hdb/hdb_locl.h
similarity index 100%
rename from crypto/heimdal/lib/hdb/hdb_locl.h
rename to lib/hdb/hdb_locl.h
diff --git a/crypto/heimdal/lib/hdb/keys.c b/lib/hdb/keys.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/keys.c
rename to lib/hdb/keys.c
diff --git a/crypto/heimdal/lib/hdb/keytab.c b/lib/hdb/keytab.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/keytab.c
rename to lib/hdb/keytab.c
diff --git a/crypto/heimdal/lib/hdb/mkey.c b/lib/hdb/mkey.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/mkey.c
rename to lib/hdb/mkey.c
diff --git a/crypto/heimdal/lib/hdb/ndbm.c b/lib/hdb/ndbm.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/ndbm.c
rename to lib/hdb/ndbm.c
diff --git a/crypto/heimdal/lib/hdb/print.c b/lib/hdb/print.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/print.c
rename to lib/hdb/print.c
diff --git a/crypto/heimdal/lib/hdb/test_dbinfo.c b/lib/hdb/test_dbinfo.c
similarity index 100%
rename from crypto/heimdal/lib/hdb/test_dbinfo.c
rename to lib/hdb/test_dbinfo.c
diff --git a/crypto/heimdal/lib/hx509/ChangeLog b/lib/hx509/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/hx509/ChangeLog
rename to lib/hx509/ChangeLog
diff --git a/crypto/heimdal/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/hx509/Makefile.am
rename to lib/hx509/Makefile.am
diff --git a/crypto/heimdal/lib/hx509/Makefile.in b/lib/hx509/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/Makefile.in
rename to lib/hx509/Makefile.in
diff --git a/crypto/heimdal/lib/hx509/ca.c b/lib/hx509/ca.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/ca.c
rename to lib/hx509/ca.c
diff --git a/crypto/heimdal/lib/hx509/cert.c b/lib/hx509/cert.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/cert.c
rename to lib/hx509/cert.c
diff --git a/crypto/heimdal/lib/hx509/cms.c b/lib/hx509/cms.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/cms.c
rename to lib/hx509/cms.c
diff --git a/crypto/heimdal/lib/hx509/collector.c b/lib/hx509/collector.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/collector.c
rename to lib/hx509/collector.c
diff --git a/crypto/heimdal/lib/hx509/crmf.asn1 b/lib/hx509/crmf.asn1
similarity index 100%
rename from crypto/heimdal/lib/hx509/crmf.asn1
rename to lib/hx509/crmf.asn1
diff --git a/crypto/heimdal/lib/hx509/crypto.c b/lib/hx509/crypto.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/crypto.c
rename to lib/hx509/crypto.c
diff --git a/crypto/heimdal/lib/hx509/data/bleichenbacher-bad.pem b/lib/hx509/data/bleichenbacher-bad.pem
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/bleichenbacher-bad.pem
rename to lib/hx509/data/bleichenbacher-bad.pem
diff --git a/crypto/heimdal/lib/hx509/data/bleichenbacher-good.pem b/lib/hx509/data/bleichenbacher-good.pem
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/bleichenbacher-good.pem
rename to lib/hx509/data/bleichenbacher-good.pem
diff --git a/crypto/heimdal/lib/hx509/data/bleichenbacher-sf-pad-correct.pem b/lib/hx509/data/bleichenbacher-sf-pad-correct.pem
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/bleichenbacher-sf-pad-correct.pem
rename to lib/hx509/data/bleichenbacher-sf-pad-correct.pem
diff --git a/crypto/heimdal/lib/hx509/data/ca.crt b/lib/hx509/data/ca.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ca.crt
rename to lib/hx509/data/ca.crt
diff --git a/crypto/heimdal/lib/hx509/data/ca.key b/lib/hx509/data/ca.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ca.key
rename to lib/hx509/data/ca.key
diff --git a/crypto/heimdal/lib/hx509/data/crl1.crl b/lib/hx509/data/crl1.crl
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/crl1.crl
rename to lib/hx509/data/crl1.crl
diff --git a/crypto/heimdal/lib/hx509/data/crl1.der b/lib/hx509/data/crl1.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/crl1.der
rename to lib/hx509/data/crl1.der
diff --git a/crypto/heimdal/lib/hx509/data/gen-req.sh b/lib/hx509/data/gen-req.sh
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/gen-req.sh
rename to lib/hx509/data/gen-req.sh
diff --git a/crypto/heimdal/lib/hx509/data/j.pem b/lib/hx509/data/j.pem
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/j.pem
rename to lib/hx509/data/j.pem
diff --git a/crypto/heimdal/lib/hx509/data/kdc.crt b/lib/hx509/data/kdc.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/kdc.crt
rename to lib/hx509/data/kdc.crt
diff --git a/crypto/heimdal/lib/hx509/data/kdc.key b/lib/hx509/data/kdc.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/kdc.key
rename to lib/hx509/data/kdc.key
diff --git a/crypto/heimdal/lib/hx509/data/key.der b/lib/hx509/data/key.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/key.der
rename to lib/hx509/data/key.der
diff --git a/crypto/heimdal/lib/hx509/data/key2.der b/lib/hx509/data/key2.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/key2.der
rename to lib/hx509/data/key2.der
diff --git a/crypto/heimdal/lib/hx509/data/nist-data b/lib/hx509/data/nist-data
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/nist-data
rename to lib/hx509/data/nist-data
diff --git a/crypto/heimdal/lib/hx509/data/nist-data2 b/lib/hx509/data/nist-data2
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/nist-data2
rename to lib/hx509/data/nist-data2
diff --git a/crypto/heimdal/lib/hx509/data/no-proxy-test.crt b/lib/hx509/data/no-proxy-test.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/no-proxy-test.crt
rename to lib/hx509/data/no-proxy-test.crt
diff --git a/crypto/heimdal/lib/hx509/data/no-proxy-test.key b/lib/hx509/data/no-proxy-test.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/no-proxy-test.key
rename to lib/hx509/data/no-proxy-test.key
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-req1.der b/lib/hx509/data/ocsp-req1.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-req1.der
rename to lib/hx509/data/ocsp-req1.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-req2.der b/lib/hx509/data/ocsp-req2.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-req2.der
rename to lib/hx509/data/ocsp-req2.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-resp1-2.der b/lib/hx509/data/ocsp-resp1-2.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-resp1-2.der
rename to lib/hx509/data/ocsp-resp1-2.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-resp1-3.der b/lib/hx509/data/ocsp-resp1-3.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-resp1-3.der
rename to lib/hx509/data/ocsp-resp1-3.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-resp1-ca.der b/lib/hx509/data/ocsp-resp1-ca.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-resp1-ca.der
rename to lib/hx509/data/ocsp-resp1-ca.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-resp1-keyhash.der b/lib/hx509/data/ocsp-resp1-keyhash.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-resp1-keyhash.der
rename to lib/hx509/data/ocsp-resp1-keyhash.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der b/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der
rename to lib/hx509/data/ocsp-resp1-ocsp-no-cert.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-resp1-ocsp.der b/lib/hx509/data/ocsp-resp1-ocsp.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-resp1-ocsp.der
rename to lib/hx509/data/ocsp-resp1-ocsp.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-resp1.der b/lib/hx509/data/ocsp-resp1.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-resp1.der
rename to lib/hx509/data/ocsp-resp1.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-resp2.der b/lib/hx509/data/ocsp-resp2.der
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-resp2.der
rename to lib/hx509/data/ocsp-resp2.der
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-responder.crt b/lib/hx509/data/ocsp-responder.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-responder.crt
rename to lib/hx509/data/ocsp-responder.crt
diff --git a/crypto/heimdal/lib/hx509/data/ocsp-responder.key b/lib/hx509/data/ocsp-responder.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/ocsp-responder.key
rename to lib/hx509/data/ocsp-responder.key
diff --git a/crypto/heimdal/lib/hx509/data/openssl.cnf b/lib/hx509/data/openssl.cnf
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/openssl.cnf
rename to lib/hx509/data/openssl.cnf
diff --git a/crypto/heimdal/lib/hx509/data/pkinit-proxy-chain.crt b/lib/hx509/data/pkinit-proxy-chain.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/pkinit-proxy-chain.crt
rename to lib/hx509/data/pkinit-proxy-chain.crt
diff --git a/crypto/heimdal/lib/hx509/data/pkinit-proxy.crt b/lib/hx509/data/pkinit-proxy.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/pkinit-proxy.crt
rename to lib/hx509/data/pkinit-proxy.crt
diff --git a/crypto/heimdal/lib/hx509/data/pkinit-proxy.key b/lib/hx509/data/pkinit-proxy.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/pkinit-proxy.key
rename to lib/hx509/data/pkinit-proxy.key
diff --git a/crypto/heimdal/lib/hx509/data/pkinit-pw.key b/lib/hx509/data/pkinit-pw.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/pkinit-pw.key
rename to lib/hx509/data/pkinit-pw.key
diff --git a/crypto/heimdal/lib/hx509/data/pkinit.crt b/lib/hx509/data/pkinit.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/pkinit.crt
rename to lib/hx509/data/pkinit.crt
diff --git a/crypto/heimdal/lib/hx509/data/pkinit.key b/lib/hx509/data/pkinit.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/pkinit.key
rename to lib/hx509/data/pkinit.key
diff --git a/crypto/heimdal/lib/hx509/data/proxy-level-test.crt b/lib/hx509/data/proxy-level-test.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy-level-test.crt
rename to lib/hx509/data/proxy-level-test.crt
diff --git a/crypto/heimdal/lib/hx509/data/proxy-level-test.key b/lib/hx509/data/proxy-level-test.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy-level-test.key
rename to lib/hx509/data/proxy-level-test.key
diff --git a/crypto/heimdal/lib/hx509/data/proxy-test.crt b/lib/hx509/data/proxy-test.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy-test.crt
rename to lib/hx509/data/proxy-test.crt
diff --git a/crypto/heimdal/lib/hx509/data/proxy-test.key b/lib/hx509/data/proxy-test.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy-test.key
rename to lib/hx509/data/proxy-test.key
diff --git a/crypto/heimdal/lib/hx509/data/proxy10-child-child-test.crt b/lib/hx509/data/proxy10-child-child-test.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy10-child-child-test.crt
rename to lib/hx509/data/proxy10-child-child-test.crt
diff --git a/crypto/heimdal/lib/hx509/data/proxy10-child-child-test.key b/lib/hx509/data/proxy10-child-child-test.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy10-child-child-test.key
rename to lib/hx509/data/proxy10-child-child-test.key
diff --git a/crypto/heimdal/lib/hx509/data/proxy10-child-test.crt b/lib/hx509/data/proxy10-child-test.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy10-child-test.crt
rename to lib/hx509/data/proxy10-child-test.crt
diff --git a/crypto/heimdal/lib/hx509/data/proxy10-child-test.key b/lib/hx509/data/proxy10-child-test.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy10-child-test.key
rename to lib/hx509/data/proxy10-child-test.key
diff --git a/crypto/heimdal/lib/hx509/data/proxy10-test.crt b/lib/hx509/data/proxy10-test.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy10-test.crt
rename to lib/hx509/data/proxy10-test.crt
diff --git a/crypto/heimdal/lib/hx509/data/proxy10-test.key b/lib/hx509/data/proxy10-test.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/proxy10-test.key
rename to lib/hx509/data/proxy10-test.key
diff --git a/crypto/heimdal/lib/hx509/data/revoke.crt b/lib/hx509/data/revoke.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/revoke.crt
rename to lib/hx509/data/revoke.crt
diff --git a/crypto/heimdal/lib/hx509/data/revoke.key b/lib/hx509/data/revoke.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/revoke.key
rename to lib/hx509/data/revoke.key
diff --git a/crypto/heimdal/lib/hx509/data/sf-class2-root.pem b/lib/hx509/data/sf-class2-root.pem
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/sf-class2-root.pem
rename to lib/hx509/data/sf-class2-root.pem
diff --git a/crypto/heimdal/lib/hx509/data/static-file b/lib/hx509/data/static-file
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/static-file
rename to lib/hx509/data/static-file
diff --git a/crypto/heimdal/lib/hx509/data/sub-ca.crt b/lib/hx509/data/sub-ca.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/sub-ca.crt
rename to lib/hx509/data/sub-ca.crt
diff --git a/crypto/heimdal/lib/hx509/data/sub-ca.key b/lib/hx509/data/sub-ca.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/sub-ca.key
rename to lib/hx509/data/sub-ca.key
diff --git a/crypto/heimdal/lib/hx509/data/sub-cert.crt b/lib/hx509/data/sub-cert.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/sub-cert.crt
rename to lib/hx509/data/sub-cert.crt
diff --git a/crypto/heimdal/lib/hx509/data/sub-cert.key b/lib/hx509/data/sub-cert.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/sub-cert.key
rename to lib/hx509/data/sub-cert.key
diff --git a/crypto/heimdal/lib/hx509/data/sub-cert.p12 b/lib/hx509/data/sub-cert.p12
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/sub-cert.p12
rename to lib/hx509/data/sub-cert.p12
diff --git a/crypto/heimdal/lib/hx509/data/test-ds-only.crt b/lib/hx509/data/test-ds-only.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-ds-only.crt
rename to lib/hx509/data/test-ds-only.crt
diff --git a/crypto/heimdal/lib/hx509/data/test-ds-only.key b/lib/hx509/data/test-ds-only.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-ds-only.key
rename to lib/hx509/data/test-ds-only.key
diff --git a/crypto/heimdal/lib/hx509/data/test-enveloped-aes-128 b/lib/hx509/data/test-enveloped-aes-128
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-enveloped-aes-128
rename to lib/hx509/data/test-enveloped-aes-128
diff --git a/crypto/heimdal/lib/hx509/data/test-enveloped-aes-256 b/lib/hx509/data/test-enveloped-aes-256
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-enveloped-aes-256
rename to lib/hx509/data/test-enveloped-aes-256
diff --git a/crypto/heimdal/lib/hx509/data/test-enveloped-des b/lib/hx509/data/test-enveloped-des
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-enveloped-des
rename to lib/hx509/data/test-enveloped-des
diff --git a/crypto/heimdal/lib/hx509/data/test-enveloped-des-ede3 b/lib/hx509/data/test-enveloped-des-ede3
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-enveloped-des-ede3
rename to lib/hx509/data/test-enveloped-des-ede3
diff --git a/crypto/heimdal/lib/hx509/data/test-enveloped-rc2-128 b/lib/hx509/data/test-enveloped-rc2-128
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-enveloped-rc2-128
rename to lib/hx509/data/test-enveloped-rc2-128
diff --git a/crypto/heimdal/lib/hx509/data/test-enveloped-rc2-40 b/lib/hx509/data/test-enveloped-rc2-40
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-enveloped-rc2-40
rename to lib/hx509/data/test-enveloped-rc2-40
diff --git a/crypto/heimdal/lib/hx509/data/test-enveloped-rc2-64 b/lib/hx509/data/test-enveloped-rc2-64
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-enveloped-rc2-64
rename to lib/hx509/data/test-enveloped-rc2-64
diff --git a/crypto/heimdal/lib/hx509/data/test-ke-only.crt b/lib/hx509/data/test-ke-only.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-ke-only.crt
rename to lib/hx509/data/test-ke-only.crt
diff --git a/crypto/heimdal/lib/hx509/data/test-ke-only.key b/lib/hx509/data/test-ke-only.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-ke-only.key
rename to lib/hx509/data/test-ke-only.key
diff --git a/crypto/heimdal/lib/hx509/data/test-nopw.p12 b/lib/hx509/data/test-nopw.p12
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-nopw.p12
rename to lib/hx509/data/test-nopw.p12
diff --git a/crypto/heimdal/lib/hx509/data/test-pw.key b/lib/hx509/data/test-pw.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-pw.key
rename to lib/hx509/data/test-pw.key
diff --git a/crypto/heimdal/lib/hx509/data/test-signed-data b/lib/hx509/data/test-signed-data
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-signed-data
rename to lib/hx509/data/test-signed-data
diff --git a/crypto/heimdal/lib/hx509/data/test-signed-data-noattr b/lib/hx509/data/test-signed-data-noattr
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-signed-data-noattr
rename to lib/hx509/data/test-signed-data-noattr
diff --git a/crypto/heimdal/lib/hx509/data/test-signed-data-noattr-nocerts b/lib/hx509/data/test-signed-data-noattr-nocerts
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test-signed-data-noattr-nocerts
rename to lib/hx509/data/test-signed-data-noattr-nocerts
diff --git a/crypto/heimdal/lib/hx509/data/test.combined.crt b/lib/hx509/data/test.combined.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test.combined.crt
rename to lib/hx509/data/test.combined.crt
diff --git a/crypto/heimdal/lib/hx509/data/test.crt b/lib/hx509/data/test.crt
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test.crt
rename to lib/hx509/data/test.crt
diff --git a/crypto/heimdal/lib/hx509/data/test.key b/lib/hx509/data/test.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test.key
rename to lib/hx509/data/test.key
diff --git a/crypto/heimdal/lib/hx509/data/test.p12 b/lib/hx509/data/test.p12
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/test.p12
rename to lib/hx509/data/test.p12
diff --git a/crypto/heimdal/lib/hx509/data/yutaka-pad-broken-ca.pem b/lib/hx509/data/yutaka-pad-broken-ca.pem
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/yutaka-pad-broken-ca.pem
rename to lib/hx509/data/yutaka-pad-broken-ca.pem
diff --git a/crypto/heimdal/lib/hx509/data/yutaka-pad-broken-cert.pem b/lib/hx509/data/yutaka-pad-broken-cert.pem
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/yutaka-pad-broken-cert.pem
rename to lib/hx509/data/yutaka-pad-broken-cert.pem
diff --git a/crypto/heimdal/lib/hx509/data/yutaka-pad-ok-ca.pem b/lib/hx509/data/yutaka-pad-ok-ca.pem
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/yutaka-pad-ok-ca.pem
rename to lib/hx509/data/yutaka-pad-ok-ca.pem
diff --git a/crypto/heimdal/lib/hx509/data/yutaka-pad-ok-cert.pem b/lib/hx509/data/yutaka-pad-ok-cert.pem
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/yutaka-pad-ok-cert.pem
rename to lib/hx509/data/yutaka-pad-ok-cert.pem
diff --git a/crypto/heimdal/lib/hx509/data/yutaka-pad.key b/lib/hx509/data/yutaka-pad.key
similarity index 100%
rename from crypto/heimdal/lib/hx509/data/yutaka-pad.key
rename to lib/hx509/data/yutaka-pad.key
diff --git a/crypto/heimdal/lib/hx509/doxygen.c b/lib/hx509/doxygen.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/doxygen.c
rename to lib/hx509/doxygen.c
diff --git a/crypto/heimdal/lib/hx509/env.c b/lib/hx509/env.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/env.c
rename to lib/hx509/env.c
diff --git a/crypto/heimdal/lib/hx509/error.c b/lib/hx509/error.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/error.c
rename to lib/hx509/error.c
diff --git a/crypto/heimdal/lib/hx509/file.c b/lib/hx509/file.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/file.c
rename to lib/hx509/file.c
diff --git a/crypto/heimdal/lib/hx509/hx509-private.h b/lib/hx509/hx509-private.h
similarity index 100%
rename from crypto/heimdal/lib/hx509/hx509-private.h
rename to lib/hx509/hx509-private.h
diff --git a/crypto/heimdal/lib/hx509/hx509-protos.h b/lib/hx509/hx509-protos.h
similarity index 100%
rename from crypto/heimdal/lib/hx509/hx509-protos.h
rename to lib/hx509/hx509-protos.h
diff --git a/crypto/heimdal/lib/hx509/hx509.h b/lib/hx509/hx509.h
similarity index 100%
rename from crypto/heimdal/lib/hx509/hx509.h
rename to lib/hx509/hx509.h
diff --git a/crypto/heimdal/lib/hx509/hx509_err.et b/lib/hx509/hx509_err.et
similarity index 100%
rename from crypto/heimdal/lib/hx509/hx509_err.et
rename to lib/hx509/hx509_err.et
diff --git a/crypto/heimdal/lib/hx509/hx_locl.h b/lib/hx509/hx_locl.h
similarity index 100%
rename from crypto/heimdal/lib/hx509/hx_locl.h
rename to lib/hx509/hx_locl.h
diff --git a/crypto/heimdal/lib/hx509/hxtool-commands.in b/lib/hx509/hxtool-commands.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/hxtool-commands.in
rename to lib/hx509/hxtool-commands.in
diff --git a/crypto/heimdal/lib/hx509/hxtool.c b/lib/hx509/hxtool.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/hxtool.c
rename to lib/hx509/hxtool.c
diff --git a/crypto/heimdal/lib/hx509/keyset.c b/lib/hx509/keyset.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/keyset.c
rename to lib/hx509/keyset.c
diff --git a/crypto/heimdal/lib/hx509/ks_dir.c b/lib/hx509/ks_dir.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/ks_dir.c
rename to lib/hx509/ks_dir.c
diff --git a/crypto/heimdal/lib/hx509/ks_file.c b/lib/hx509/ks_file.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/ks_file.c
rename to lib/hx509/ks_file.c
diff --git a/crypto/heimdal/lib/hx509/ks_keychain.c b/lib/hx509/ks_keychain.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/ks_keychain.c
rename to lib/hx509/ks_keychain.c
diff --git a/crypto/heimdal/lib/hx509/ks_mem.c b/lib/hx509/ks_mem.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/ks_mem.c
rename to lib/hx509/ks_mem.c
diff --git a/crypto/heimdal/lib/hx509/ks_null.c b/lib/hx509/ks_null.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/ks_null.c
rename to lib/hx509/ks_null.c
diff --git a/crypto/heimdal/lib/hx509/ks_p11.c b/lib/hx509/ks_p11.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/ks_p11.c
rename to lib/hx509/ks_p11.c
diff --git a/crypto/heimdal/lib/hx509/ks_p12.c b/lib/hx509/ks_p12.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/ks_p12.c
rename to lib/hx509/ks_p12.c
diff --git a/crypto/heimdal/lib/hx509/lock.c b/lib/hx509/lock.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/lock.c
rename to lib/hx509/lock.c
diff --git a/crypto/heimdal/lib/hx509/name.c b/lib/hx509/name.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/name.c
rename to lib/hx509/name.c
diff --git a/crypto/heimdal/lib/hx509/ocsp.asn1 b/lib/hx509/ocsp.asn1
similarity index 100%
rename from crypto/heimdal/lib/hx509/ocsp.asn1
rename to lib/hx509/ocsp.asn1
diff --git a/crypto/heimdal/lib/hx509/peer.c b/lib/hx509/peer.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/peer.c
rename to lib/hx509/peer.c
diff --git a/crypto/heimdal/lib/hx509/pkcs10.asn1 b/lib/hx509/pkcs10.asn1
similarity index 100%
rename from crypto/heimdal/lib/hx509/pkcs10.asn1
rename to lib/hx509/pkcs10.asn1
diff --git a/crypto/heimdal/lib/hx509/print.c b/lib/hx509/print.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/print.c
rename to lib/hx509/print.c
diff --git a/crypto/heimdal/lib/hx509/ref/pkcs11.h b/lib/hx509/ref/pkcs11.h
similarity index 100%
rename from crypto/heimdal/lib/hx509/ref/pkcs11.h
rename to lib/hx509/ref/pkcs11.h
diff --git a/crypto/heimdal/lib/hx509/req.c b/lib/hx509/req.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/req.c
rename to lib/hx509/req.c
diff --git a/crypto/heimdal/lib/hx509/revoke.c b/lib/hx509/revoke.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/revoke.c
rename to lib/hx509/revoke.c
diff --git a/crypto/heimdal/lib/hx509/softp11.c b/lib/hx509/softp11.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/softp11.c
rename to lib/hx509/softp11.c
diff --git a/crypto/heimdal/lib/hx509/test_ca.in b/lib/hx509/test_ca.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_ca.in
rename to lib/hx509/test_ca.in
diff --git a/crypto/heimdal/lib/hx509/test_cert.in b/lib/hx509/test_cert.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_cert.in
rename to lib/hx509/test_cert.in
diff --git a/crypto/heimdal/lib/hx509/test_chain.in b/lib/hx509/test_chain.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_chain.in
rename to lib/hx509/test_chain.in
diff --git a/crypto/heimdal/lib/hx509/test_cms.in b/lib/hx509/test_cms.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_cms.in
rename to lib/hx509/test_cms.in
diff --git a/crypto/heimdal/lib/hx509/test_crypto.in b/lib/hx509/test_crypto.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_crypto.in
rename to lib/hx509/test_crypto.in
diff --git a/crypto/heimdal/lib/hx509/test_java_pkcs11.in b/lib/hx509/test_java_pkcs11.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_java_pkcs11.in
rename to lib/hx509/test_java_pkcs11.in
diff --git a/crypto/heimdal/lib/hx509/test_name.c b/lib/hx509/test_name.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_name.c
rename to lib/hx509/test_name.c
diff --git a/crypto/heimdal/lib/hx509/test_nist.in b/lib/hx509/test_nist.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_nist.in
rename to lib/hx509/test_nist.in
diff --git a/crypto/heimdal/lib/hx509/test_nist2.in b/lib/hx509/test_nist2.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_nist2.in
rename to lib/hx509/test_nist2.in
diff --git a/crypto/heimdal/lib/hx509/test_nist_cert.in b/lib/hx509/test_nist_cert.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_nist_cert.in
rename to lib/hx509/test_nist_cert.in
diff --git a/crypto/heimdal/lib/hx509/test_nist_pkcs12.in b/lib/hx509/test_nist_pkcs12.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_nist_pkcs12.in
rename to lib/hx509/test_nist_pkcs12.in
diff --git a/crypto/heimdal/lib/hx509/test_pkcs11.in b/lib/hx509/test_pkcs11.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_pkcs11.in
rename to lib/hx509/test_pkcs11.in
diff --git a/crypto/heimdal/lib/hx509/test_query.in b/lib/hx509/test_query.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_query.in
rename to lib/hx509/test_query.in
diff --git a/crypto/heimdal/lib/hx509/test_req.in b/lib/hx509/test_req.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_req.in
rename to lib/hx509/test_req.in
diff --git a/crypto/heimdal/lib/hx509/test_soft_pkcs11.c b/lib/hx509/test_soft_pkcs11.c
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_soft_pkcs11.c
rename to lib/hx509/test_soft_pkcs11.c
diff --git a/crypto/heimdal/lib/hx509/test_windows.in b/lib/hx509/test_windows.in
similarity index 100%
rename from crypto/heimdal/lib/hx509/test_windows.in
rename to lib/hx509/test_windows.in
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-available1 b/lib/hx509/tst-crypto-available1
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-available1
rename to lib/hx509/tst-crypto-available1
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-available2 b/lib/hx509/tst-crypto-available2
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-available2
rename to lib/hx509/tst-crypto-available2
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-available3 b/lib/hx509/tst-crypto-available3
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-available3
rename to lib/hx509/tst-crypto-available3
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-select b/lib/hx509/tst-crypto-select
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-select
rename to lib/hx509/tst-crypto-select
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-select1 b/lib/hx509/tst-crypto-select1
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-select1
rename to lib/hx509/tst-crypto-select1
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-select2 b/lib/hx509/tst-crypto-select2
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-select2
rename to lib/hx509/tst-crypto-select2
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-select3 b/lib/hx509/tst-crypto-select3
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-select3
rename to lib/hx509/tst-crypto-select3
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-select4 b/lib/hx509/tst-crypto-select4
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-select4
rename to lib/hx509/tst-crypto-select4
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-select5 b/lib/hx509/tst-crypto-select5
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-select5
rename to lib/hx509/tst-crypto-select5
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-select6 b/lib/hx509/tst-crypto-select6
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-select6
rename to lib/hx509/tst-crypto-select6
diff --git a/crypto/heimdal/lib/hx509/tst-crypto-select7 b/lib/hx509/tst-crypto-select7
similarity index 100%
rename from crypto/heimdal/lib/hx509/tst-crypto-select7
rename to lib/hx509/tst-crypto-select7
diff --git a/crypto/heimdal/lib/hx509/version-script.map b/lib/hx509/version-script.map
similarity index 100%
rename from crypto/heimdal/lib/hx509/version-script.map
rename to lib/hx509/version-script.map
diff --git a/crypto/heimdal/lib/kadm5/ChangeLog b/lib/kadm5/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/kadm5/ChangeLog
rename to lib/kadm5/ChangeLog
diff --git a/crypto/heimdal/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/kadm5/Makefile.am
rename to lib/kadm5/Makefile.am
diff --git a/crypto/heimdal/lib/kadm5/Makefile.in b/lib/kadm5/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/kadm5/Makefile.in
rename to lib/kadm5/Makefile.in
diff --git a/crypto/heimdal/lib/kadm5/acl.c b/lib/kadm5/acl.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/acl.c
rename to lib/kadm5/acl.c
diff --git a/crypto/heimdal/lib/kadm5/ad.c b/lib/kadm5/ad.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/ad.c
rename to lib/kadm5/ad.c
diff --git a/crypto/heimdal/lib/kadm5/admin.h b/lib/kadm5/admin.h
similarity index 100%
rename from crypto/heimdal/lib/kadm5/admin.h
rename to lib/kadm5/admin.h
diff --git a/crypto/heimdal/lib/kadm5/bump_pw_expire.c b/lib/kadm5/bump_pw_expire.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/bump_pw_expire.c
rename to lib/kadm5/bump_pw_expire.c
diff --git a/crypto/heimdal/lib/kadm5/check-cracklib.pl b/lib/kadm5/check-cracklib.pl
similarity index 100%
rename from crypto/heimdal/lib/kadm5/check-cracklib.pl
rename to lib/kadm5/check-cracklib.pl
diff --git a/crypto/heimdal/lib/kadm5/chpass_c.c b/lib/kadm5/chpass_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/chpass_c.c
rename to lib/kadm5/chpass_c.c
diff --git a/crypto/heimdal/lib/kadm5/chpass_s.c b/lib/kadm5/chpass_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/chpass_s.c
rename to lib/kadm5/chpass_s.c
diff --git a/crypto/heimdal/lib/kadm5/client_glue.c b/lib/kadm5/client_glue.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/client_glue.c
rename to lib/kadm5/client_glue.c
diff --git a/crypto/heimdal/lib/kadm5/common_glue.c b/lib/kadm5/common_glue.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/common_glue.c
rename to lib/kadm5/common_glue.c
diff --git a/crypto/heimdal/lib/kadm5/context_s.c b/lib/kadm5/context_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/context_s.c
rename to lib/kadm5/context_s.c
diff --git a/crypto/heimdal/lib/kadm5/create_c.c b/lib/kadm5/create_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/create_c.c
rename to lib/kadm5/create_c.c
diff --git a/crypto/heimdal/lib/kadm5/create_s.c b/lib/kadm5/create_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/create_s.c
rename to lib/kadm5/create_s.c
diff --git a/crypto/heimdal/lib/kadm5/default_keys.c b/lib/kadm5/default_keys.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/default_keys.c
rename to lib/kadm5/default_keys.c
diff --git a/crypto/heimdal/lib/kadm5/delete_c.c b/lib/kadm5/delete_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/delete_c.c
rename to lib/kadm5/delete_c.c
diff --git a/crypto/heimdal/lib/kadm5/delete_s.c b/lib/kadm5/delete_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/delete_s.c
rename to lib/kadm5/delete_s.c
diff --git a/crypto/heimdal/lib/kadm5/destroy_c.c b/lib/kadm5/destroy_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/destroy_c.c
rename to lib/kadm5/destroy_c.c
diff --git a/crypto/heimdal/lib/kadm5/destroy_s.c b/lib/kadm5/destroy_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/destroy_s.c
rename to lib/kadm5/destroy_s.c
diff --git a/crypto/heimdal/lib/kadm5/dump_log.c b/lib/kadm5/dump_log.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/dump_log.c
rename to lib/kadm5/dump_log.c
diff --git a/crypto/heimdal/lib/kadm5/ent_setup.c b/lib/kadm5/ent_setup.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/ent_setup.c
rename to lib/kadm5/ent_setup.c
diff --git a/crypto/heimdal/lib/kadm5/error.c b/lib/kadm5/error.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/error.c
rename to lib/kadm5/error.c
diff --git a/crypto/heimdal/lib/kadm5/flush.c b/lib/kadm5/flush.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/flush.c
rename to lib/kadm5/flush.c
diff --git a/crypto/heimdal/lib/kadm5/flush_c.c b/lib/kadm5/flush_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/flush_c.c
rename to lib/kadm5/flush_c.c
diff --git a/crypto/heimdal/lib/kadm5/flush_s.c b/lib/kadm5/flush_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/flush_s.c
rename to lib/kadm5/flush_s.c
diff --git a/crypto/heimdal/lib/kadm5/free.c b/lib/kadm5/free.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/free.c
rename to lib/kadm5/free.c
diff --git a/crypto/heimdal/lib/kadm5/get_c.c b/lib/kadm5/get_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/get_c.c
rename to lib/kadm5/get_c.c
diff --git a/crypto/heimdal/lib/kadm5/get_princs_c.c b/lib/kadm5/get_princs_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/get_princs_c.c
rename to lib/kadm5/get_princs_c.c
diff --git a/crypto/heimdal/lib/kadm5/get_princs_s.c b/lib/kadm5/get_princs_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/get_princs_s.c
rename to lib/kadm5/get_princs_s.c
diff --git a/crypto/heimdal/lib/kadm5/get_s.c b/lib/kadm5/get_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/get_s.c
rename to lib/kadm5/get_s.c
diff --git a/crypto/heimdal/lib/kadm5/init_c.c b/lib/kadm5/init_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/init_c.c
rename to lib/kadm5/init_c.c
diff --git a/crypto/heimdal/lib/kadm5/init_s.c b/lib/kadm5/init_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/init_s.c
rename to lib/kadm5/init_s.c
diff --git a/crypto/heimdal/lib/kadm5/iprop-commands.in b/lib/kadm5/iprop-commands.in
similarity index 100%
rename from crypto/heimdal/lib/kadm5/iprop-commands.in
rename to lib/kadm5/iprop-commands.in
diff --git a/crypto/heimdal/lib/kadm5/iprop-log.8 b/lib/kadm5/iprop-log.8
similarity index 100%
rename from crypto/heimdal/lib/kadm5/iprop-log.8
rename to lib/kadm5/iprop-log.8
diff --git a/crypto/heimdal/lib/kadm5/iprop-log.c b/lib/kadm5/iprop-log.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/iprop-log.c
rename to lib/kadm5/iprop-log.c
diff --git a/crypto/heimdal/lib/kadm5/iprop.8 b/lib/kadm5/iprop.8
similarity index 100%
rename from crypto/heimdal/lib/kadm5/iprop.8
rename to lib/kadm5/iprop.8
diff --git a/crypto/heimdal/lib/kadm5/iprop.h b/lib/kadm5/iprop.h
similarity index 100%
rename from crypto/heimdal/lib/kadm5/iprop.h
rename to lib/kadm5/iprop.h
diff --git a/crypto/heimdal/lib/kadm5/ipropd_common.c b/lib/kadm5/ipropd_common.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/ipropd_common.c
rename to lib/kadm5/ipropd_common.c
diff --git a/crypto/heimdal/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/ipropd_master.c
rename to lib/kadm5/ipropd_master.c
diff --git a/crypto/heimdal/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/ipropd_slave.c
rename to lib/kadm5/ipropd_slave.c
diff --git a/crypto/heimdal/lib/kadm5/kadm5-private.h b/lib/kadm5/kadm5-private.h
similarity index 100%
rename from crypto/heimdal/lib/kadm5/kadm5-private.h
rename to lib/kadm5/kadm5-private.h
diff --git a/crypto/heimdal/lib/kadm5/kadm5-protos.h b/lib/kadm5/kadm5-protos.h
similarity index 100%
rename from crypto/heimdal/lib/kadm5/kadm5-protos.h
rename to lib/kadm5/kadm5-protos.h
diff --git a/crypto/heimdal/lib/kadm5/kadm5-pwcheck.h b/lib/kadm5/kadm5-pwcheck.h
similarity index 100%
rename from crypto/heimdal/lib/kadm5/kadm5-pwcheck.h
rename to lib/kadm5/kadm5-pwcheck.h
diff --git a/crypto/heimdal/lib/kadm5/kadm5_err.et b/lib/kadm5/kadm5_err.et
similarity index 100%
rename from crypto/heimdal/lib/kadm5/kadm5_err.et
rename to lib/kadm5/kadm5_err.et
diff --git a/crypto/heimdal/lib/kadm5/kadm5_locl.h b/lib/kadm5/kadm5_locl.h
similarity index 100%
rename from crypto/heimdal/lib/kadm5/kadm5_locl.h
rename to lib/kadm5/kadm5_locl.h
diff --git a/crypto/heimdal/lib/kadm5/kadm5_pwcheck.3 b/lib/kadm5/kadm5_pwcheck.3
similarity index 100%
rename from crypto/heimdal/lib/kadm5/kadm5_pwcheck.3
rename to lib/kadm5/kadm5_pwcheck.3
diff --git a/crypto/heimdal/lib/kadm5/keys.c b/lib/kadm5/keys.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/keys.c
rename to lib/kadm5/keys.c
diff --git a/crypto/heimdal/lib/kadm5/log.c b/lib/kadm5/log.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/log.c
rename to lib/kadm5/log.c
diff --git a/crypto/heimdal/lib/kadm5/marshall.c b/lib/kadm5/marshall.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/marshall.c
rename to lib/kadm5/marshall.c
diff --git a/crypto/heimdal/lib/kadm5/modify_c.c b/lib/kadm5/modify_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/modify_c.c
rename to lib/kadm5/modify_c.c
diff --git a/crypto/heimdal/lib/kadm5/modify_s.c b/lib/kadm5/modify_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/modify_s.c
rename to lib/kadm5/modify_s.c
diff --git a/crypto/heimdal/lib/kadm5/password_quality.c b/lib/kadm5/password_quality.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/password_quality.c
rename to lib/kadm5/password_quality.c
diff --git a/crypto/heimdal/lib/kadm5/private.h b/lib/kadm5/private.h
similarity index 100%
rename from crypto/heimdal/lib/kadm5/private.h
rename to lib/kadm5/private.h
diff --git a/crypto/heimdal/lib/kadm5/privs_c.c b/lib/kadm5/privs_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/privs_c.c
rename to lib/kadm5/privs_c.c
diff --git a/crypto/heimdal/lib/kadm5/privs_s.c b/lib/kadm5/privs_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/privs_s.c
rename to lib/kadm5/privs_s.c
diff --git a/crypto/heimdal/lib/kadm5/randkey_c.c b/lib/kadm5/randkey_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/randkey_c.c
rename to lib/kadm5/randkey_c.c
diff --git a/crypto/heimdal/lib/kadm5/randkey_s.c b/lib/kadm5/randkey_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/randkey_s.c
rename to lib/kadm5/randkey_s.c
diff --git a/crypto/heimdal/lib/kadm5/rename_c.c b/lib/kadm5/rename_c.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/rename_c.c
rename to lib/kadm5/rename_c.c
diff --git a/crypto/heimdal/lib/kadm5/rename_s.c b/lib/kadm5/rename_s.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/rename_s.c
rename to lib/kadm5/rename_s.c
diff --git a/crypto/heimdal/lib/kadm5/replay_log.c b/lib/kadm5/replay_log.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/replay_log.c
rename to lib/kadm5/replay_log.c
diff --git a/crypto/heimdal/lib/kadm5/sample_passwd_check.c b/lib/kadm5/sample_passwd_check.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/sample_passwd_check.c
rename to lib/kadm5/sample_passwd_check.c
diff --git a/crypto/heimdal/lib/kadm5/send_recv.c b/lib/kadm5/send_recv.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/send_recv.c
rename to lib/kadm5/send_recv.c
diff --git a/crypto/heimdal/lib/kadm5/server_glue.c b/lib/kadm5/server_glue.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/server_glue.c
rename to lib/kadm5/server_glue.c
diff --git a/crypto/heimdal/lib/kadm5/set_keys.c b/lib/kadm5/set_keys.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/set_keys.c
rename to lib/kadm5/set_keys.c
diff --git a/crypto/heimdal/lib/kadm5/set_modifier.c b/lib/kadm5/set_modifier.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/set_modifier.c
rename to lib/kadm5/set_modifier.c
diff --git a/crypto/heimdal/lib/kadm5/test_pw_quality.c b/lib/kadm5/test_pw_quality.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/test_pw_quality.c
rename to lib/kadm5/test_pw_quality.c
diff --git a/crypto/heimdal/lib/kadm5/truncate_log.c b/lib/kadm5/truncate_log.c
similarity index 100%
rename from crypto/heimdal/lib/kadm5/truncate_log.c
rename to lib/kadm5/truncate_log.c
diff --git a/crypto/heimdal/lib/kadm5/version-script.map b/lib/kadm5/version-script.map
similarity index 100%
rename from crypto/heimdal/lib/kadm5/version-script.map
rename to lib/kadm5/version-script.map
diff --git a/crypto/heimdal/lib/kafs/ChangeLog b/lib/kafs/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/kafs/ChangeLog
rename to lib/kafs/ChangeLog
diff --git a/crypto/heimdal/lib/kafs/Makefile.am b/lib/kafs/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/kafs/Makefile.am
rename to lib/kafs/Makefile.am
diff --git a/crypto/heimdal/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/kafs/Makefile.in
rename to lib/kafs/Makefile.in
diff --git a/crypto/heimdal/lib/kafs/README.dlfcn b/lib/kafs/README.dlfcn
similarity index 100%
rename from crypto/heimdal/lib/kafs/README.dlfcn
rename to lib/kafs/README.dlfcn
diff --git a/crypto/heimdal/lib/kafs/afskrb.c b/lib/kafs/afskrb.c
similarity index 100%
rename from crypto/heimdal/lib/kafs/afskrb.c
rename to lib/kafs/afskrb.c
diff --git a/crypto/heimdal/lib/kafs/afskrb5.c b/lib/kafs/afskrb5.c
similarity index 100%
rename from crypto/heimdal/lib/kafs/afskrb5.c
rename to lib/kafs/afskrb5.c
diff --git a/crypto/heimdal/lib/kafs/afsl.exp b/lib/kafs/afsl.exp
similarity index 100%
rename from crypto/heimdal/lib/kafs/afsl.exp
rename to lib/kafs/afsl.exp
diff --git a/crypto/heimdal/lib/kafs/afslib.c b/lib/kafs/afslib.c
similarity index 100%
rename from crypto/heimdal/lib/kafs/afslib.c
rename to lib/kafs/afslib.c
diff --git a/crypto/heimdal/lib/kafs/afslib.exp b/lib/kafs/afslib.exp
similarity index 100%
rename from crypto/heimdal/lib/kafs/afslib.exp
rename to lib/kafs/afslib.exp
diff --git a/crypto/heimdal/lib/kafs/afssys.c b/lib/kafs/afssys.c
similarity index 100%
rename from crypto/heimdal/lib/kafs/afssys.c
rename to lib/kafs/afssys.c
diff --git a/crypto/heimdal/lib/kafs/afssysdefs.h b/lib/kafs/afssysdefs.h
similarity index 100%
rename from crypto/heimdal/lib/kafs/afssysdefs.h
rename to lib/kafs/afssysdefs.h
diff --git a/crypto/heimdal/lib/kafs/common.c b/lib/kafs/common.c
similarity index 100%
rename from crypto/heimdal/lib/kafs/common.c
rename to lib/kafs/common.c
diff --git a/crypto/heimdal/lib/kafs/dlfcn.c b/lib/kafs/dlfcn.c
similarity index 100%
rename from crypto/heimdal/lib/kafs/dlfcn.c
rename to lib/kafs/dlfcn.c
diff --git a/crypto/heimdal/lib/kafs/dlfcn.h b/lib/kafs/dlfcn.h
similarity index 100%
rename from crypto/heimdal/lib/kafs/dlfcn.h
rename to lib/kafs/dlfcn.h
diff --git a/crypto/heimdal/lib/kafs/kafs.3 b/lib/kafs/kafs.3
similarity index 100%
rename from crypto/heimdal/lib/kafs/kafs.3
rename to lib/kafs/kafs.3
diff --git a/crypto/heimdal/lib/kafs/kafs.h b/lib/kafs/kafs.h
similarity index 100%
rename from crypto/heimdal/lib/kafs/kafs.h
rename to lib/kafs/kafs.h
diff --git a/crypto/heimdal/lib/kafs/kafs_locl.h b/lib/kafs/kafs_locl.h
similarity index 100%
rename from crypto/heimdal/lib/kafs/kafs_locl.h
rename to lib/kafs/kafs_locl.h
diff --git a/crypto/heimdal/lib/kafs/roken_rename.h b/lib/kafs/roken_rename.h
similarity index 100%
rename from crypto/heimdal/lib/kafs/roken_rename.h
rename to lib/kafs/roken_rename.h
diff --git a/crypto/heimdal/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/krb5/Makefile.am
rename to lib/krb5/Makefile.am
diff --git a/crypto/heimdal/lib/krb5/Makefile.in b/lib/krb5/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/krb5/Makefile.in
rename to lib/krb5/Makefile.in
diff --git a/crypto/heimdal/lib/krb5/acache.c b/lib/krb5/acache.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/acache.c
rename to lib/krb5/acache.c
diff --git a/crypto/heimdal/lib/krb5/acl.c b/lib/krb5/acl.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/acl.c
rename to lib/krb5/acl.c
diff --git a/crypto/heimdal/lib/krb5/add_et_list.c b/lib/krb5/add_et_list.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/add_et_list.c
rename to lib/krb5/add_et_list.c
diff --git a/crypto/heimdal/lib/krb5/addr_families.c b/lib/krb5/addr_families.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/addr_families.c
rename to lib/krb5/addr_families.c
diff --git a/crypto/heimdal/lib/krb5/aes-test.c b/lib/krb5/aes-test.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/aes-test.c
rename to lib/krb5/aes-test.c
diff --git a/crypto/heimdal/lib/krb5/aname_to_localname.c b/lib/krb5/aname_to_localname.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/aname_to_localname.c
rename to lib/krb5/aname_to_localname.c
diff --git a/crypto/heimdal/lib/krb5/appdefault.c b/lib/krb5/appdefault.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/appdefault.c
rename to lib/krb5/appdefault.c
diff --git a/crypto/heimdal/lib/krb5/asn1_glue.c b/lib/krb5/asn1_glue.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/asn1_glue.c
rename to lib/krb5/asn1_glue.c
diff --git a/crypto/heimdal/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/auth_context.c
rename to lib/krb5/auth_context.c
diff --git a/crypto/heimdal/lib/krb5/build_ap_req.c b/lib/krb5/build_ap_req.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/build_ap_req.c
rename to lib/krb5/build_ap_req.c
diff --git a/crypto/heimdal/lib/krb5/build_auth.c b/lib/krb5/build_auth.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/build_auth.c
rename to lib/krb5/build_auth.c
diff --git a/crypto/heimdal/lib/krb5/cache.c b/lib/krb5/cache.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/cache.c
rename to lib/krb5/cache.c
diff --git a/crypto/heimdal/lib/krb5/changepw.c b/lib/krb5/changepw.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/changepw.c
rename to lib/krb5/changepw.c
diff --git a/crypto/heimdal/lib/krb5/codec.c b/lib/krb5/codec.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/codec.c
rename to lib/krb5/codec.c
diff --git a/crypto/heimdal/lib/krb5/config_file.c b/lib/krb5/config_file.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/config_file.c
rename to lib/krb5/config_file.c
diff --git a/crypto/heimdal/lib/krb5/config_file_netinfo.c b/lib/krb5/config_file_netinfo.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/config_file_netinfo.c
rename to lib/krb5/config_file_netinfo.c
diff --git a/crypto/heimdal/lib/krb5/constants.c b/lib/krb5/constants.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/constants.c
rename to lib/krb5/constants.c
diff --git a/crypto/heimdal/lib/krb5/context.c b/lib/krb5/context.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/context.c
rename to lib/krb5/context.c
diff --git a/crypto/heimdal/lib/krb5/convert_creds.c b/lib/krb5/convert_creds.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/convert_creds.c
rename to lib/krb5/convert_creds.c
diff --git a/crypto/heimdal/lib/krb5/copy_host_realm.c b/lib/krb5/copy_host_realm.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/copy_host_realm.c
rename to lib/krb5/copy_host_realm.c
diff --git a/crypto/heimdal/lib/krb5/crc.c b/lib/krb5/crc.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/crc.c
rename to lib/krb5/crc.c
diff --git a/crypto/heimdal/lib/krb5/creds.c b/lib/krb5/creds.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/creds.c
rename to lib/krb5/creds.c
diff --git a/crypto/heimdal/lib/krb5/crypto.c b/lib/krb5/crypto.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/crypto.c
rename to lib/krb5/crypto.c
diff --git a/crypto/heimdal/lib/krb5/data.c b/lib/krb5/data.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/data.c
rename to lib/krb5/data.c
diff --git a/crypto/heimdal/lib/krb5/derived-key-test.c b/lib/krb5/derived-key-test.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/derived-key-test.c
rename to lib/krb5/derived-key-test.c
diff --git a/crypto/heimdal/lib/krb5/digest.c b/lib/krb5/digest.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/digest.c
rename to lib/krb5/digest.c
diff --git a/crypto/heimdal/lib/krb5/doxygen.c b/lib/krb5/doxygen.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/doxygen.c
rename to lib/krb5/doxygen.c
diff --git a/crypto/heimdal/lib/krb5/dump_config.c b/lib/krb5/dump_config.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/dump_config.c
rename to lib/krb5/dump_config.c
diff --git a/crypto/heimdal/lib/krb5/eai_to_heim_errno.c b/lib/krb5/eai_to_heim_errno.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/eai_to_heim_errno.c
rename to lib/krb5/eai_to_heim_errno.c
diff --git a/crypto/heimdal/lib/krb5/error_string.c b/lib/krb5/error_string.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/error_string.c
rename to lib/krb5/error_string.c
diff --git a/crypto/heimdal/lib/krb5/expand_hostname.c b/lib/krb5/expand_hostname.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/expand_hostname.c
rename to lib/krb5/expand_hostname.c
diff --git a/crypto/heimdal/lib/krb5/fcache.c b/lib/krb5/fcache.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/fcache.c
rename to lib/krb5/fcache.c
diff --git a/crypto/heimdal/lib/krb5/free.c b/lib/krb5/free.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/free.c
rename to lib/krb5/free.c
diff --git a/crypto/heimdal/lib/krb5/free_host_realm.c b/lib/krb5/free_host_realm.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/free_host_realm.c
rename to lib/krb5/free_host_realm.c
diff --git a/crypto/heimdal/lib/krb5/generate_seq_number.c b/lib/krb5/generate_seq_number.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/generate_seq_number.c
rename to lib/krb5/generate_seq_number.c
diff --git a/crypto/heimdal/lib/krb5/generate_subkey.c b/lib/krb5/generate_subkey.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/generate_subkey.c
rename to lib/krb5/generate_subkey.c
diff --git a/crypto/heimdal/lib/krb5/get_addrs.c b/lib/krb5/get_addrs.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_addrs.c
rename to lib/krb5/get_addrs.c
diff --git a/crypto/heimdal/lib/krb5/get_cred.c b/lib/krb5/get_cred.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_cred.c
rename to lib/krb5/get_cred.c
diff --git a/crypto/heimdal/lib/krb5/get_default_principal.c b/lib/krb5/get_default_principal.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_default_principal.c
rename to lib/krb5/get_default_principal.c
diff --git a/crypto/heimdal/lib/krb5/get_default_realm.c b/lib/krb5/get_default_realm.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_default_realm.c
rename to lib/krb5/get_default_realm.c
diff --git a/crypto/heimdal/lib/krb5/get_for_creds.c b/lib/krb5/get_for_creds.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_for_creds.c
rename to lib/krb5/get_for_creds.c
diff --git a/crypto/heimdal/lib/krb5/get_host_realm.c b/lib/krb5/get_host_realm.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_host_realm.c
rename to lib/krb5/get_host_realm.c
diff --git a/crypto/heimdal/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_in_tkt.c
rename to lib/krb5/get_in_tkt.c
diff --git a/crypto/heimdal/lib/krb5/get_in_tkt_pw.c b/lib/krb5/get_in_tkt_pw.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_in_tkt_pw.c
rename to lib/krb5/get_in_tkt_pw.c
diff --git a/crypto/heimdal/lib/krb5/get_in_tkt_with_keytab.c b/lib/krb5/get_in_tkt_with_keytab.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_in_tkt_with_keytab.c
rename to lib/krb5/get_in_tkt_with_keytab.c
diff --git a/crypto/heimdal/lib/krb5/get_in_tkt_with_skey.c b/lib/krb5/get_in_tkt_with_skey.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_in_tkt_with_skey.c
rename to lib/krb5/get_in_tkt_with_skey.c
diff --git a/crypto/heimdal/lib/krb5/get_port.c b/lib/krb5/get_port.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/get_port.c
rename to lib/krb5/get_port.c
diff --git a/crypto/heimdal/lib/krb5/heim_err.et b/lib/krb5/heim_err.et
similarity index 100%
rename from crypto/heimdal/lib/krb5/heim_err.et
rename to lib/krb5/heim_err.et
diff --git a/crypto/heimdal/lib/krb5/heim_threads.h b/lib/krb5/heim_threads.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/heim_threads.h
rename to lib/krb5/heim_threads.h
diff --git a/crypto/heimdal/lib/krb5/init_creds.c b/lib/krb5/init_creds.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/init_creds.c
rename to lib/krb5/init_creds.c
diff --git a/crypto/heimdal/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/init_creds_pw.c
rename to lib/krb5/init_creds_pw.c
diff --git a/crypto/heimdal/lib/krb5/k524_err.et b/lib/krb5/k524_err.et
similarity index 100%
rename from crypto/heimdal/lib/krb5/k524_err.et
rename to lib/krb5/k524_err.et
diff --git a/crypto/heimdal/lib/krb5/kcm.c b/lib/krb5/kcm.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/kcm.c
rename to lib/krb5/kcm.c
diff --git a/crypto/heimdal/lib/krb5/kcm.h b/lib/krb5/kcm.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/kcm.h
rename to lib/krb5/kcm.h
diff --git a/crypto/heimdal/lib/krb5/kerberos.8 b/lib/krb5/kerberos.8
similarity index 100%
rename from crypto/heimdal/lib/krb5/kerberos.8
rename to lib/krb5/kerberos.8
diff --git a/crypto/heimdal/lib/krb5/keyblock.c b/lib/krb5/keyblock.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/keyblock.c
rename to lib/krb5/keyblock.c
diff --git a/crypto/heimdal/lib/krb5/keytab.c b/lib/krb5/keytab.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/keytab.c
rename to lib/krb5/keytab.c
diff --git a/crypto/heimdal/lib/krb5/keytab_any.c b/lib/krb5/keytab_any.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/keytab_any.c
rename to lib/krb5/keytab_any.c
diff --git a/crypto/heimdal/lib/krb5/keytab_file.c b/lib/krb5/keytab_file.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/keytab_file.c
rename to lib/krb5/keytab_file.c
diff --git a/crypto/heimdal/lib/krb5/keytab_keyfile.c b/lib/krb5/keytab_keyfile.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/keytab_keyfile.c
rename to lib/krb5/keytab_keyfile.c
diff --git a/crypto/heimdal/lib/krb5/keytab_krb4.c b/lib/krb5/keytab_krb4.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/keytab_krb4.c
rename to lib/krb5/keytab_krb4.c
diff --git a/crypto/heimdal/lib/krb5/keytab_memory.c b/lib/krb5/keytab_memory.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/keytab_memory.c
rename to lib/krb5/keytab_memory.c
diff --git a/crypto/heimdal/lib/krb5/krb5-private.h b/lib/krb5/krb5-private.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5-private.h
rename to lib/krb5/krb5-private.h
diff --git a/crypto/heimdal/lib/krb5/krb5-protos.h b/lib/krb5/krb5-protos.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5-protos.h
rename to lib/krb5/krb5-protos.h
diff --git a/crypto/heimdal/lib/krb5/krb5-v4compat.h b/lib/krb5/krb5-v4compat.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5-v4compat.h
rename to lib/krb5/krb5-v4compat.h
diff --git a/crypto/heimdal/lib/krb5/krb5.3 b/lib/krb5/krb5.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5.3
rename to lib/krb5/krb5.3
diff --git a/crypto/heimdal/lib/krb5/krb5.conf.5 b/lib/krb5/krb5.conf.5
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5.conf.5
rename to lib/krb5/krb5.conf.5
diff --git a/crypto/heimdal/lib/krb5/krb5.h b/lib/krb5/krb5.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5.h
rename to lib/krb5/krb5.h
diff --git a/crypto/heimdal/lib/krb5/krb5.moduli b/lib/krb5/krb5.moduli
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5.moduli
rename to lib/krb5/krb5.moduli
diff --git a/crypto/heimdal/lib/krb5/krb524_convert_creds_kdc.3 b/lib/krb5/krb524_convert_creds_kdc.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb524_convert_creds_kdc.3
rename to lib/krb5/krb524_convert_creds_kdc.3
diff --git a/crypto/heimdal/lib/krb5/krb5_425_conv_principal.3 b/lib/krb5/krb5_425_conv_principal.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_425_conv_principal.3
rename to lib/krb5/krb5_425_conv_principal.3
diff --git a/crypto/heimdal/lib/krb5/krb5_acl_match_file.3 b/lib/krb5/krb5_acl_match_file.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_acl_match_file.3
rename to lib/krb5/krb5_acl_match_file.3
diff --git a/crypto/heimdal/lib/krb5/krb5_address.3 b/lib/krb5/krb5_address.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_address.3
rename to lib/krb5/krb5_address.3
diff --git a/crypto/heimdal/lib/krb5/krb5_aname_to_localname.3 b/lib/krb5/krb5_aname_to_localname.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_aname_to_localname.3
rename to lib/krb5/krb5_aname_to_localname.3
diff --git a/crypto/heimdal/lib/krb5/krb5_appdefault.3 b/lib/krb5/krb5_appdefault.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_appdefault.3
rename to lib/krb5/krb5_appdefault.3
diff --git a/crypto/heimdal/lib/krb5/krb5_auth_context.3 b/lib/krb5/krb5_auth_context.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_auth_context.3
rename to lib/krb5/krb5_auth_context.3
diff --git a/crypto/heimdal/lib/krb5/krb5_build_principal.3 b/lib/krb5/krb5_build_principal.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_build_principal.3
rename to lib/krb5/krb5_build_principal.3
diff --git a/crypto/heimdal/lib/krb5/krb5_c_make_checksum.3 b/lib/krb5/krb5_c_make_checksum.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_c_make_checksum.3
rename to lib/krb5/krb5_c_make_checksum.3
diff --git a/crypto/heimdal/lib/krb5/krb5_ccache.3 b/lib/krb5/krb5_ccache.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_ccache.3
rename to lib/krb5/krb5_ccache.3
diff --git a/crypto/heimdal/lib/krb5/krb5_ccapi.h b/lib/krb5/krb5_ccapi.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_ccapi.h
rename to lib/krb5/krb5_ccapi.h
diff --git a/crypto/heimdal/lib/krb5/krb5_check_transited.3 b/lib/krb5/krb5_check_transited.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_check_transited.3
rename to lib/krb5/krb5_check_transited.3
diff --git a/crypto/heimdal/lib/krb5/krb5_compare_creds.3 b/lib/krb5/krb5_compare_creds.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_compare_creds.3
rename to lib/krb5/krb5_compare_creds.3
diff --git a/crypto/heimdal/lib/krb5/krb5_config.3 b/lib/krb5/krb5_config.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_config.3
rename to lib/krb5/krb5_config.3
diff --git a/crypto/heimdal/lib/krb5/krb5_context.3 b/lib/krb5/krb5_context.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_context.3
rename to lib/krb5/krb5_context.3
diff --git a/crypto/heimdal/lib/krb5/krb5_create_checksum.3 b/lib/krb5/krb5_create_checksum.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_create_checksum.3
rename to lib/krb5/krb5_create_checksum.3
diff --git a/crypto/heimdal/lib/krb5/krb5_creds.3 b/lib/krb5/krb5_creds.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_creds.3
rename to lib/krb5/krb5_creds.3
diff --git a/crypto/heimdal/lib/krb5/krb5_crypto_init.3 b/lib/krb5/krb5_crypto_init.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_crypto_init.3
rename to lib/krb5/krb5_crypto_init.3
diff --git a/crypto/heimdal/lib/krb5/krb5_data.3 b/lib/krb5/krb5_data.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_data.3
rename to lib/krb5/krb5_data.3
diff --git a/crypto/heimdal/lib/krb5/krb5_digest.3 b/lib/krb5/krb5_digest.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_digest.3
rename to lib/krb5/krb5_digest.3
diff --git a/crypto/heimdal/lib/krb5/krb5_eai_to_heim_errno.3 b/lib/krb5/krb5_eai_to_heim_errno.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_eai_to_heim_errno.3
rename to lib/krb5/krb5_eai_to_heim_errno.3
diff --git a/crypto/heimdal/lib/krb5/krb5_encrypt.3 b/lib/krb5/krb5_encrypt.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_encrypt.3
rename to lib/krb5/krb5_encrypt.3
diff --git a/crypto/heimdal/lib/krb5/krb5_err.et b/lib/krb5/krb5_err.et
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_err.et
rename to lib/krb5/krb5_err.et
diff --git a/crypto/heimdal/lib/krb5/krb5_expand_hostname.3 b/lib/krb5/krb5_expand_hostname.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_expand_hostname.3
rename to lib/krb5/krb5_expand_hostname.3
diff --git a/crypto/heimdal/lib/krb5/krb5_find_padata.3 b/lib/krb5/krb5_find_padata.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_find_padata.3
rename to lib/krb5/krb5_find_padata.3
diff --git a/crypto/heimdal/lib/krb5/krb5_free_addresses.3 b/lib/krb5/krb5_free_addresses.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_free_addresses.3
rename to lib/krb5/krb5_free_addresses.3
diff --git a/crypto/heimdal/lib/krb5/krb5_free_principal.3 b/lib/krb5/krb5_free_principal.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_free_principal.3
rename to lib/krb5/krb5_free_principal.3
diff --git a/crypto/heimdal/lib/krb5/krb5_generate_random_block.3 b/lib/krb5/krb5_generate_random_block.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_generate_random_block.3
rename to lib/krb5/krb5_generate_random_block.3
diff --git a/crypto/heimdal/lib/krb5/krb5_get_all_client_addrs.3 b/lib/krb5/krb5_get_all_client_addrs.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_get_all_client_addrs.3
rename to lib/krb5/krb5_get_all_client_addrs.3
diff --git a/crypto/heimdal/lib/krb5/krb5_get_credentials.3 b/lib/krb5/krb5_get_credentials.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_get_credentials.3
rename to lib/krb5/krb5_get_credentials.3
diff --git a/crypto/heimdal/lib/krb5/krb5_get_creds.3 b/lib/krb5/krb5_get_creds.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_get_creds.3
rename to lib/krb5/krb5_get_creds.3
diff --git a/crypto/heimdal/lib/krb5/krb5_get_forwarded_creds.3 b/lib/krb5/krb5_get_forwarded_creds.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_get_forwarded_creds.3
rename to lib/krb5/krb5_get_forwarded_creds.3
diff --git a/crypto/heimdal/lib/krb5/krb5_get_in_cred.3 b/lib/krb5/krb5_get_in_cred.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_get_in_cred.3
rename to lib/krb5/krb5_get_in_cred.3
diff --git a/crypto/heimdal/lib/krb5/krb5_get_init_creds.3 b/lib/krb5/krb5_get_init_creds.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_get_init_creds.3
rename to lib/krb5/krb5_get_init_creds.3
diff --git a/crypto/heimdal/lib/krb5/krb5_get_krbhst.3 b/lib/krb5/krb5_get_krbhst.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_get_krbhst.3
rename to lib/krb5/krb5_get_krbhst.3
diff --git a/crypto/heimdal/lib/krb5/krb5_getportbyname.3 b/lib/krb5/krb5_getportbyname.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_getportbyname.3
rename to lib/krb5/krb5_getportbyname.3
diff --git a/crypto/heimdal/lib/krb5/krb5_init_context.3 b/lib/krb5/krb5_init_context.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_init_context.3
rename to lib/krb5/krb5_init_context.3
diff --git a/crypto/heimdal/lib/krb5/krb5_is_thread_safe.3 b/lib/krb5/krb5_is_thread_safe.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_is_thread_safe.3
rename to lib/krb5/krb5_is_thread_safe.3
diff --git a/crypto/heimdal/lib/krb5/krb5_keyblock.3 b/lib/krb5/krb5_keyblock.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_keyblock.3
rename to lib/krb5/krb5_keyblock.3
diff --git a/crypto/heimdal/lib/krb5/krb5_keytab.3 b/lib/krb5/krb5_keytab.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_keytab.3
rename to lib/krb5/krb5_keytab.3
diff --git a/crypto/heimdal/lib/krb5/krb5_krbhst_init.3 b/lib/krb5/krb5_krbhst_init.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_krbhst_init.3
rename to lib/krb5/krb5_krbhst_init.3
diff --git a/crypto/heimdal/lib/krb5/krb5_kuserok.3 b/lib/krb5/krb5_kuserok.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_kuserok.3
rename to lib/krb5/krb5_kuserok.3
diff --git a/crypto/heimdal/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_locl.h
rename to lib/krb5/krb5_locl.h
diff --git a/crypto/heimdal/lib/krb5/krb5_mk_req.3 b/lib/krb5/krb5_mk_req.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_mk_req.3
rename to lib/krb5/krb5_mk_req.3
diff --git a/crypto/heimdal/lib/krb5/krb5_mk_safe.3 b/lib/krb5/krb5_mk_safe.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_mk_safe.3
rename to lib/krb5/krb5_mk_safe.3
diff --git a/crypto/heimdal/lib/krb5/krb5_openlog.3 b/lib/krb5/krb5_openlog.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_openlog.3
rename to lib/krb5/krb5_openlog.3
diff --git a/crypto/heimdal/lib/krb5/krb5_parse_name.3 b/lib/krb5/krb5_parse_name.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_parse_name.3
rename to lib/krb5/krb5_parse_name.3
diff --git a/crypto/heimdal/lib/krb5/krb5_principal.3 b/lib/krb5/krb5_principal.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_principal.3
rename to lib/krb5/krb5_principal.3
diff --git a/crypto/heimdal/lib/krb5/krb5_principal_get_realm.3 b/lib/krb5/krb5_principal_get_realm.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_principal_get_realm.3
rename to lib/krb5/krb5_principal_get_realm.3
diff --git a/crypto/heimdal/lib/krb5/krb5_rcache.3 b/lib/krb5/krb5_rcache.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_rcache.3
rename to lib/krb5/krb5_rcache.3
diff --git a/crypto/heimdal/lib/krb5/krb5_rd_error.3 b/lib/krb5/krb5_rd_error.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_rd_error.3
rename to lib/krb5/krb5_rd_error.3
diff --git a/crypto/heimdal/lib/krb5/krb5_rd_safe.3 b/lib/krb5/krb5_rd_safe.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_rd_safe.3
rename to lib/krb5/krb5_rd_safe.3
diff --git a/crypto/heimdal/lib/krb5/krb5_set_default_realm.3 b/lib/krb5/krb5_set_default_realm.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_set_default_realm.3
rename to lib/krb5/krb5_set_default_realm.3
diff --git a/crypto/heimdal/lib/krb5/krb5_set_password.3 b/lib/krb5/krb5_set_password.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_set_password.3
rename to lib/krb5/krb5_set_password.3
diff --git a/crypto/heimdal/lib/krb5/krb5_sname_to_principal.3 b/lib/krb5/krb5_sname_to_principal.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_sname_to_principal.3
rename to lib/krb5/krb5_sname_to_principal.3
diff --git a/crypto/heimdal/lib/krb5/krb5_storage.3 b/lib/krb5/krb5_storage.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_storage.3
rename to lib/krb5/krb5_storage.3
diff --git a/crypto/heimdal/lib/krb5/krb5_string_to_key.3 b/lib/krb5/krb5_string_to_key.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_string_to_key.3
rename to lib/krb5/krb5_string_to_key.3
diff --git a/crypto/heimdal/lib/krb5/krb5_ticket.3 b/lib/krb5/krb5_ticket.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_ticket.3
rename to lib/krb5/krb5_ticket.3
diff --git a/crypto/heimdal/lib/krb5/krb5_timeofday.3 b/lib/krb5/krb5_timeofday.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_timeofday.3
rename to lib/krb5/krb5_timeofday.3
diff --git a/crypto/heimdal/lib/krb5/krb5_unparse_name.3 b/lib/krb5/krb5_unparse_name.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_unparse_name.3
rename to lib/krb5/krb5_unparse_name.3
diff --git a/crypto/heimdal/lib/krb5/krb5_verify_init_creds.3 b/lib/krb5/krb5_verify_init_creds.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_verify_init_creds.3
rename to lib/krb5/krb5_verify_init_creds.3
diff --git a/crypto/heimdal/lib/krb5/krb5_verify_user.3 b/lib/krb5/krb5_verify_user.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_verify_user.3
rename to lib/krb5/krb5_verify_user.3
diff --git a/crypto/heimdal/lib/krb5/krb5_warn.3 b/lib/krb5/krb5_warn.3
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb5_warn.3
rename to lib/krb5/krb5_warn.3
diff --git a/crypto/heimdal/lib/krb5/krb_err.et b/lib/krb5/krb_err.et
similarity index 100%
rename from crypto/heimdal/lib/krb5/krb_err.et
rename to lib/krb5/krb_err.et
diff --git a/crypto/heimdal/lib/krb5/krbhst-test.c b/lib/krb5/krbhst-test.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/krbhst-test.c
rename to lib/krb5/krbhst-test.c
diff --git a/crypto/heimdal/lib/krb5/krbhst.c b/lib/krb5/krbhst.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/krbhst.c
rename to lib/krb5/krbhst.c
diff --git a/crypto/heimdal/lib/krb5/kuserok.c b/lib/krb5/kuserok.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/kuserok.c
rename to lib/krb5/kuserok.c
diff --git a/crypto/heimdal/lib/krb5/locate_plugin.h b/lib/krb5/locate_plugin.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/locate_plugin.h
rename to lib/krb5/locate_plugin.h
diff --git a/crypto/heimdal/lib/krb5/log.c b/lib/krb5/log.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/log.c
rename to lib/krb5/log.c
diff --git a/crypto/heimdal/lib/krb5/mcache.c b/lib/krb5/mcache.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/mcache.c
rename to lib/krb5/mcache.c
diff --git a/crypto/heimdal/lib/krb5/misc.c b/lib/krb5/misc.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/misc.c
rename to lib/krb5/misc.c
diff --git a/crypto/heimdal/lib/krb5/mit_glue.c b/lib/krb5/mit_glue.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/mit_glue.c
rename to lib/krb5/mit_glue.c
diff --git a/crypto/heimdal/lib/krb5/mk_error.c b/lib/krb5/mk_error.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/mk_error.c
rename to lib/krb5/mk_error.c
diff --git a/crypto/heimdal/lib/krb5/mk_priv.c b/lib/krb5/mk_priv.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/mk_priv.c
rename to lib/krb5/mk_priv.c
diff --git a/crypto/heimdal/lib/krb5/mk_rep.c b/lib/krb5/mk_rep.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/mk_rep.c
rename to lib/krb5/mk_rep.c
diff --git a/crypto/heimdal/lib/krb5/mk_req.c b/lib/krb5/mk_req.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/mk_req.c
rename to lib/krb5/mk_req.c
diff --git a/crypto/heimdal/lib/krb5/mk_req_ext.c b/lib/krb5/mk_req_ext.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/mk_req_ext.c
rename to lib/krb5/mk_req_ext.c
diff --git a/crypto/heimdal/lib/krb5/mk_safe.c b/lib/krb5/mk_safe.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/mk_safe.c
rename to lib/krb5/mk_safe.c
diff --git a/crypto/heimdal/lib/krb5/n-fold-test.c b/lib/krb5/n-fold-test.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/n-fold-test.c
rename to lib/krb5/n-fold-test.c
diff --git a/crypto/heimdal/lib/krb5/n-fold.c b/lib/krb5/n-fold.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/n-fold.c
rename to lib/krb5/n-fold.c
diff --git a/crypto/heimdal/lib/krb5/name-45-test.c b/lib/krb5/name-45-test.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/name-45-test.c
rename to lib/krb5/name-45-test.c
diff --git a/crypto/heimdal/lib/krb5/net_read.c b/lib/krb5/net_read.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/net_read.c
rename to lib/krb5/net_read.c
diff --git a/crypto/heimdal/lib/krb5/net_write.c b/lib/krb5/net_write.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/net_write.c
rename to lib/krb5/net_write.c
diff --git a/crypto/heimdal/lib/krb5/pac.c b/lib/krb5/pac.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/pac.c
rename to lib/krb5/pac.c
diff --git a/crypto/heimdal/lib/krb5/padata.c b/lib/krb5/padata.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/padata.c
rename to lib/krb5/padata.c
diff --git a/crypto/heimdal/lib/krb5/parse-name-test.c b/lib/krb5/parse-name-test.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/parse-name-test.c
rename to lib/krb5/parse-name-test.c
diff --git a/crypto/heimdal/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/pkinit.c
rename to lib/krb5/pkinit.c
diff --git a/crypto/heimdal/lib/krb5/plugin.c b/lib/krb5/plugin.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/plugin.c
rename to lib/krb5/plugin.c
diff --git a/crypto/heimdal/lib/krb5/principal.c b/lib/krb5/principal.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/principal.c
rename to lib/krb5/principal.c
diff --git a/crypto/heimdal/lib/krb5/prog_setup.c b/lib/krb5/prog_setup.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/prog_setup.c
rename to lib/krb5/prog_setup.c
diff --git a/crypto/heimdal/lib/krb5/prompter_posix.c b/lib/krb5/prompter_posix.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/prompter_posix.c
rename to lib/krb5/prompter_posix.c
diff --git a/crypto/heimdal/lib/krb5/rd_cred.c b/lib/krb5/rd_cred.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/rd_cred.c
rename to lib/krb5/rd_cred.c
diff --git a/crypto/heimdal/lib/krb5/rd_error.c b/lib/krb5/rd_error.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/rd_error.c
rename to lib/krb5/rd_error.c
diff --git a/crypto/heimdal/lib/krb5/rd_priv.c b/lib/krb5/rd_priv.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/rd_priv.c
rename to lib/krb5/rd_priv.c
diff --git a/crypto/heimdal/lib/krb5/rd_rep.c b/lib/krb5/rd_rep.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/rd_rep.c
rename to lib/krb5/rd_rep.c
diff --git a/crypto/heimdal/lib/krb5/rd_req.c b/lib/krb5/rd_req.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/rd_req.c
rename to lib/krb5/rd_req.c
diff --git a/crypto/heimdal/lib/krb5/rd_safe.c b/lib/krb5/rd_safe.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/rd_safe.c
rename to lib/krb5/rd_safe.c
diff --git a/crypto/heimdal/lib/krb5/read_message.c b/lib/krb5/read_message.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/read_message.c
rename to lib/krb5/read_message.c
diff --git a/crypto/heimdal/lib/krb5/recvauth.c b/lib/krb5/recvauth.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/recvauth.c
rename to lib/krb5/recvauth.c
diff --git a/crypto/heimdal/lib/krb5/replay.c b/lib/krb5/replay.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/replay.c
rename to lib/krb5/replay.c
diff --git a/crypto/heimdal/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/send_to_kdc.c
rename to lib/krb5/send_to_kdc.c
diff --git a/crypto/heimdal/lib/krb5/sendauth.c b/lib/krb5/sendauth.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/sendauth.c
rename to lib/krb5/sendauth.c
diff --git a/crypto/heimdal/lib/krb5/set_default_realm.c b/lib/krb5/set_default_realm.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/set_default_realm.c
rename to lib/krb5/set_default_realm.c
diff --git a/crypto/heimdal/lib/krb5/sock_principal.c b/lib/krb5/sock_principal.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/sock_principal.c
rename to lib/krb5/sock_principal.c
diff --git a/crypto/heimdal/lib/krb5/store-int.h b/lib/krb5/store-int.h
similarity index 100%
rename from crypto/heimdal/lib/krb5/store-int.h
rename to lib/krb5/store-int.h
diff --git a/crypto/heimdal/lib/krb5/store-test.c b/lib/krb5/store-test.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/store-test.c
rename to lib/krb5/store-test.c
diff --git a/crypto/heimdal/lib/krb5/store.c b/lib/krb5/store.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/store.c
rename to lib/krb5/store.c
diff --git a/crypto/heimdal/lib/krb5/store_emem.c b/lib/krb5/store_emem.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/store_emem.c
rename to lib/krb5/store_emem.c
diff --git a/crypto/heimdal/lib/krb5/store_fd.c b/lib/krb5/store_fd.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/store_fd.c
rename to lib/krb5/store_fd.c
diff --git a/crypto/heimdal/lib/krb5/store_mem.c b/lib/krb5/store_mem.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/store_mem.c
rename to lib/krb5/store_mem.c
diff --git a/crypto/heimdal/lib/krb5/string-to-key-test.c b/lib/krb5/string-to-key-test.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/string-to-key-test.c
rename to lib/krb5/string-to-key-test.c
diff --git a/crypto/heimdal/lib/krb5/test_acl.c b/lib/krb5/test_acl.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_acl.c
rename to lib/krb5/test_acl.c
diff --git a/crypto/heimdal/lib/krb5/test_addr.c b/lib/krb5/test_addr.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_addr.c
rename to lib/krb5/test_addr.c
diff --git a/crypto/heimdal/lib/krb5/test_alname.c b/lib/krb5/test_alname.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_alname.c
rename to lib/krb5/test_alname.c
diff --git a/crypto/heimdal/lib/krb5/test_cc.c b/lib/krb5/test_cc.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_cc.c
rename to lib/krb5/test_cc.c
diff --git a/crypto/heimdal/lib/krb5/test_config.c b/lib/krb5/test_config.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_config.c
rename to lib/krb5/test_config.c
diff --git a/crypto/heimdal/lib/krb5/test_crypto.c b/lib/krb5/test_crypto.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_crypto.c
rename to lib/krb5/test_crypto.c
diff --git a/crypto/heimdal/lib/krb5/test_crypto_wrapping.c b/lib/krb5/test_crypto_wrapping.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_crypto_wrapping.c
rename to lib/krb5/test_crypto_wrapping.c
diff --git a/crypto/heimdal/lib/krb5/test_forward.c b/lib/krb5/test_forward.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_forward.c
rename to lib/krb5/test_forward.c
diff --git a/crypto/heimdal/lib/krb5/test_get_addrs.c b/lib/krb5/test_get_addrs.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_get_addrs.c
rename to lib/krb5/test_get_addrs.c
diff --git a/crypto/heimdal/lib/krb5/test_hostname.c b/lib/krb5/test_hostname.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_hostname.c
rename to lib/krb5/test_hostname.c
diff --git a/crypto/heimdal/lib/krb5/test_keytab.c b/lib/krb5/test_keytab.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_keytab.c
rename to lib/krb5/test_keytab.c
diff --git a/crypto/heimdal/lib/krb5/test_kuserok.c b/lib/krb5/test_kuserok.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_kuserok.c
rename to lib/krb5/test_kuserok.c
diff --git a/crypto/heimdal/lib/krb5/test_mem.c b/lib/krb5/test_mem.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_mem.c
rename to lib/krb5/test_mem.c
diff --git a/crypto/heimdal/lib/krb5/test_pac.c b/lib/krb5/test_pac.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_pac.c
rename to lib/krb5/test_pac.c
diff --git a/crypto/heimdal/lib/krb5/test_pkinit_dh2key.c b/lib/krb5/test_pkinit_dh2key.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_pkinit_dh2key.c
rename to lib/krb5/test_pkinit_dh2key.c
diff --git a/crypto/heimdal/lib/krb5/test_plugin.c b/lib/krb5/test_plugin.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_plugin.c
rename to lib/krb5/test_plugin.c
diff --git a/crypto/heimdal/lib/krb5/test_prf.c b/lib/krb5/test_prf.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_prf.c
rename to lib/krb5/test_prf.c
diff --git a/crypto/heimdal/lib/krb5/test_princ.c b/lib/krb5/test_princ.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_princ.c
rename to lib/krb5/test_princ.c
diff --git a/crypto/heimdal/lib/krb5/test_renew.c b/lib/krb5/test_renew.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_renew.c
rename to lib/krb5/test_renew.c
diff --git a/crypto/heimdal/lib/krb5/test_store.c b/lib/krb5/test_store.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_store.c
rename to lib/krb5/test_store.c
diff --git a/crypto/heimdal/lib/krb5/test_time.c b/lib/krb5/test_time.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/test_time.c
rename to lib/krb5/test_time.c
diff --git a/crypto/heimdal/lib/krb5/ticket.c b/lib/krb5/ticket.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/ticket.c
rename to lib/krb5/ticket.c
diff --git a/crypto/heimdal/lib/krb5/time.c b/lib/krb5/time.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/time.c
rename to lib/krb5/time.c
diff --git a/crypto/heimdal/lib/krb5/transited.c b/lib/krb5/transited.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/transited.c
rename to lib/krb5/transited.c
diff --git a/crypto/heimdal/lib/krb5/v4_glue.c b/lib/krb5/v4_glue.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/v4_glue.c
rename to lib/krb5/v4_glue.c
diff --git a/crypto/heimdal/lib/krb5/verify_init.c b/lib/krb5/verify_init.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/verify_init.c
rename to lib/krb5/verify_init.c
diff --git a/crypto/heimdal/lib/krb5/verify_krb5_conf.8 b/lib/krb5/verify_krb5_conf.8
similarity index 100%
rename from crypto/heimdal/lib/krb5/verify_krb5_conf.8
rename to lib/krb5/verify_krb5_conf.8
diff --git a/crypto/heimdal/lib/krb5/verify_krb5_conf.c b/lib/krb5/verify_krb5_conf.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/verify_krb5_conf.c
rename to lib/krb5/verify_krb5_conf.c
diff --git a/crypto/heimdal/lib/krb5/verify_user.c b/lib/krb5/verify_user.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/verify_user.c
rename to lib/krb5/verify_user.c
diff --git a/crypto/heimdal/lib/krb5/version-script.map b/lib/krb5/version-script.map
similarity index 100%
rename from crypto/heimdal/lib/krb5/version-script.map
rename to lib/krb5/version-script.map
diff --git a/crypto/heimdal/lib/krb5/version.c b/lib/krb5/version.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/version.c
rename to lib/krb5/version.c
diff --git a/crypto/heimdal/lib/krb5/warn.c b/lib/krb5/warn.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/warn.c
rename to lib/krb5/warn.c
diff --git a/crypto/heimdal/lib/krb5/write_message.c b/lib/krb5/write_message.c
similarity index 100%
rename from crypto/heimdal/lib/krb5/write_message.c
rename to lib/krb5/write_message.c
diff --git a/crypto/heimdal/lib/ntlm/ChangeLog b/lib/ntlm/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/ntlm/ChangeLog
rename to lib/ntlm/ChangeLog
diff --git a/crypto/heimdal/lib/ntlm/Makefile.am b/lib/ntlm/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/ntlm/Makefile.am
rename to lib/ntlm/Makefile.am
diff --git a/crypto/heimdal/lib/ntlm/Makefile.in b/lib/ntlm/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/ntlm/Makefile.in
rename to lib/ntlm/Makefile.in
diff --git a/crypto/heimdal/lib/ntlm/heimntlm-protos.h b/lib/ntlm/heimntlm-protos.h
similarity index 100%
rename from crypto/heimdal/lib/ntlm/heimntlm-protos.h
rename to lib/ntlm/heimntlm-protos.h
diff --git a/crypto/heimdal/lib/ntlm/heimntlm.h b/lib/ntlm/heimntlm.h
similarity index 100%
rename from crypto/heimdal/lib/ntlm/heimntlm.h
rename to lib/ntlm/heimntlm.h
diff --git a/crypto/heimdal/lib/ntlm/ntlm.c b/lib/ntlm/ntlm.c
similarity index 100%
rename from crypto/heimdal/lib/ntlm/ntlm.c
rename to lib/ntlm/ntlm.c
diff --git a/crypto/heimdal/lib/ntlm/test_ntlm.c b/lib/ntlm/test_ntlm.c
similarity index 100%
rename from crypto/heimdal/lib/ntlm/test_ntlm.c
rename to lib/ntlm/test_ntlm.c
diff --git a/crypto/heimdal/lib/ntlm/version-script.map b/lib/ntlm/version-script.map
similarity index 100%
rename from crypto/heimdal/lib/ntlm/version-script.map
rename to lib/ntlm/version-script.map
diff --git a/crypto/heimdal/lib/roken/ChangeLog b/lib/roken/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/roken/ChangeLog
rename to lib/roken/ChangeLog
diff --git a/crypto/heimdal/lib/roken/Makefile.am b/lib/roken/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/roken/Makefile.am
rename to lib/roken/Makefile.am
diff --git a/crypto/heimdal/lib/roken/Makefile.in b/lib/roken/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/roken/Makefile.in
rename to lib/roken/Makefile.in
diff --git a/crypto/heimdal/lib/roken/acconfig.h b/lib/roken/acconfig.h
similarity index 100%
rename from crypto/heimdal/lib/roken/acconfig.h
rename to lib/roken/acconfig.h
diff --git a/crypto/heimdal/lib/roken/acinclude.m4 b/lib/roken/acinclude.m4
similarity index 100%
rename from crypto/heimdal/lib/roken/acinclude.m4
rename to lib/roken/acinclude.m4
diff --git a/crypto/heimdal/lib/roken/base64-test.c b/lib/roken/base64-test.c
similarity index 100%
rename from crypto/heimdal/lib/roken/base64-test.c
rename to lib/roken/base64-test.c
diff --git a/crypto/heimdal/lib/roken/base64.c b/lib/roken/base64.c
similarity index 100%
rename from crypto/heimdal/lib/roken/base64.c
rename to lib/roken/base64.c
diff --git a/crypto/heimdal/lib/roken/base64.h b/lib/roken/base64.h
similarity index 100%
rename from crypto/heimdal/lib/roken/base64.h
rename to lib/roken/base64.h
diff --git a/crypto/heimdal/lib/roken/bswap.c b/lib/roken/bswap.c
similarity index 100%
rename from crypto/heimdal/lib/roken/bswap.c
rename to lib/roken/bswap.c
diff --git a/crypto/heimdal/lib/roken/chown.c b/lib/roken/chown.c
similarity index 100%
rename from crypto/heimdal/lib/roken/chown.c
rename to lib/roken/chown.c
diff --git a/crypto/heimdal/lib/roken/closefrom.c b/lib/roken/closefrom.c
similarity index 100%
rename from crypto/heimdal/lib/roken/closefrom.c
rename to lib/roken/closefrom.c
diff --git a/crypto/heimdal/lib/roken/concat.c b/lib/roken/concat.c
similarity index 100%
rename from crypto/heimdal/lib/roken/concat.c
rename to lib/roken/concat.c
diff --git a/crypto/heimdal/lib/roken/copyhostent.c b/lib/roken/copyhostent.c
similarity index 100%
rename from crypto/heimdal/lib/roken/copyhostent.c
rename to lib/roken/copyhostent.c
diff --git a/crypto/heimdal/lib/roken/daemon.c b/lib/roken/daemon.c
similarity index 100%
rename from crypto/heimdal/lib/roken/daemon.c
rename to lib/roken/daemon.c
diff --git a/crypto/heimdal/lib/roken/dumpdata.c b/lib/roken/dumpdata.c
similarity index 100%
rename from crypto/heimdal/lib/roken/dumpdata.c
rename to lib/roken/dumpdata.c
diff --git a/crypto/heimdal/lib/roken/ecalloc.3 b/lib/roken/ecalloc.3
similarity index 100%
rename from crypto/heimdal/lib/roken/ecalloc.3
rename to lib/roken/ecalloc.3
diff --git a/crypto/heimdal/lib/roken/ecalloc.c b/lib/roken/ecalloc.c
similarity index 100%
rename from crypto/heimdal/lib/roken/ecalloc.c
rename to lib/roken/ecalloc.c
diff --git a/crypto/heimdal/lib/roken/emalloc.c b/lib/roken/emalloc.c
similarity index 100%
rename from crypto/heimdal/lib/roken/emalloc.c
rename to lib/roken/emalloc.c
diff --git a/crypto/heimdal/lib/roken/environment.c b/lib/roken/environment.c
similarity index 100%
rename from crypto/heimdal/lib/roken/environment.c
rename to lib/roken/environment.c
diff --git a/crypto/heimdal/lib/roken/eread.c b/lib/roken/eread.c
similarity index 100%
rename from crypto/heimdal/lib/roken/eread.c
rename to lib/roken/eread.c
diff --git a/crypto/heimdal/lib/roken/erealloc.c b/lib/roken/erealloc.c
similarity index 100%
rename from crypto/heimdal/lib/roken/erealloc.c
rename to lib/roken/erealloc.c
diff --git a/crypto/heimdal/lib/roken/err.c b/lib/roken/err.c
similarity index 100%
rename from crypto/heimdal/lib/roken/err.c
rename to lib/roken/err.c
diff --git a/crypto/heimdal/lib/roken/err.hin b/lib/roken/err.hin
similarity index 100%
rename from crypto/heimdal/lib/roken/err.hin
rename to lib/roken/err.hin
diff --git a/crypto/heimdal/lib/roken/errx.c b/lib/roken/errx.c
similarity index 100%
rename from crypto/heimdal/lib/roken/errx.c
rename to lib/roken/errx.c
diff --git a/crypto/heimdal/lib/roken/esetenv.c b/lib/roken/esetenv.c
similarity index 100%
rename from crypto/heimdal/lib/roken/esetenv.c
rename to lib/roken/esetenv.c
diff --git a/crypto/heimdal/lib/roken/estrdup.c b/lib/roken/estrdup.c
similarity index 100%
rename from crypto/heimdal/lib/roken/estrdup.c
rename to lib/roken/estrdup.c
diff --git a/crypto/heimdal/lib/roken/ewrite.c b/lib/roken/ewrite.c
similarity index 100%
rename from crypto/heimdal/lib/roken/ewrite.c
rename to lib/roken/ewrite.c
diff --git a/crypto/heimdal/lib/roken/fchown.c b/lib/roken/fchown.c
similarity index 100%
rename from crypto/heimdal/lib/roken/fchown.c
rename to lib/roken/fchown.c
diff --git a/crypto/heimdal/lib/roken/flock.c b/lib/roken/flock.c
similarity index 100%
rename from crypto/heimdal/lib/roken/flock.c
rename to lib/roken/flock.c
diff --git a/crypto/heimdal/lib/roken/fnmatch.c b/lib/roken/fnmatch.c
similarity index 100%
rename from crypto/heimdal/lib/roken/fnmatch.c
rename to lib/roken/fnmatch.c
diff --git a/crypto/heimdal/lib/roken/fnmatch.hin b/lib/roken/fnmatch.hin
similarity index 100%
rename from crypto/heimdal/lib/roken/fnmatch.hin
rename to lib/roken/fnmatch.hin
diff --git a/crypto/heimdal/lib/roken/freeaddrinfo.c b/lib/roken/freeaddrinfo.c
similarity index 100%
rename from crypto/heimdal/lib/roken/freeaddrinfo.c
rename to lib/roken/freeaddrinfo.c
diff --git a/crypto/heimdal/lib/roken/freehostent.c b/lib/roken/freehostent.c
similarity index 100%
rename from crypto/heimdal/lib/roken/freehostent.c
rename to lib/roken/freehostent.c
diff --git a/crypto/heimdal/lib/roken/gai_strerror.c b/lib/roken/gai_strerror.c
similarity index 100%
rename from crypto/heimdal/lib/roken/gai_strerror.c
rename to lib/roken/gai_strerror.c
diff --git a/crypto/heimdal/lib/roken/get_default_username.c b/lib/roken/get_default_username.c
similarity index 100%
rename from crypto/heimdal/lib/roken/get_default_username.c
rename to lib/roken/get_default_username.c
diff --git a/crypto/heimdal/lib/roken/get_window_size.c b/lib/roken/get_window_size.c
similarity index 100%
rename from crypto/heimdal/lib/roken/get_window_size.c
rename to lib/roken/get_window_size.c
diff --git a/crypto/heimdal/lib/roken/getaddrinfo-test.c b/lib/roken/getaddrinfo-test.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getaddrinfo-test.c
rename to lib/roken/getaddrinfo-test.c
diff --git a/crypto/heimdal/lib/roken/getaddrinfo.c b/lib/roken/getaddrinfo.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getaddrinfo.c
rename to lib/roken/getaddrinfo.c
diff --git a/crypto/heimdal/lib/roken/getaddrinfo_hostspec.c b/lib/roken/getaddrinfo_hostspec.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getaddrinfo_hostspec.c
rename to lib/roken/getaddrinfo_hostspec.c
diff --git a/crypto/heimdal/lib/roken/getarg.3 b/lib/roken/getarg.3
similarity index 100%
rename from crypto/heimdal/lib/roken/getarg.3
rename to lib/roken/getarg.3
diff --git a/crypto/heimdal/lib/roken/getarg.c b/lib/roken/getarg.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getarg.c
rename to lib/roken/getarg.c
diff --git a/crypto/heimdal/lib/roken/getarg.h b/lib/roken/getarg.h
similarity index 100%
rename from crypto/heimdal/lib/roken/getarg.h
rename to lib/roken/getarg.h
diff --git a/crypto/heimdal/lib/roken/getcap.c b/lib/roken/getcap.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getcap.c
rename to lib/roken/getcap.c
diff --git a/crypto/heimdal/lib/roken/getcwd.c b/lib/roken/getcwd.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getcwd.c
rename to lib/roken/getcwd.c
diff --git a/crypto/heimdal/lib/roken/getdtablesize.c b/lib/roken/getdtablesize.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getdtablesize.c
rename to lib/roken/getdtablesize.c
diff --git a/crypto/heimdal/lib/roken/getegid.c b/lib/roken/getegid.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getegid.c
rename to lib/roken/getegid.c
diff --git a/crypto/heimdal/lib/roken/geteuid.c b/lib/roken/geteuid.c
similarity index 100%
rename from crypto/heimdal/lib/roken/geteuid.c
rename to lib/roken/geteuid.c
diff --git a/crypto/heimdal/lib/roken/getgid.c b/lib/roken/getgid.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getgid.c
rename to lib/roken/getgid.c
diff --git a/crypto/heimdal/lib/roken/gethostname.c b/lib/roken/gethostname.c
similarity index 100%
rename from crypto/heimdal/lib/roken/gethostname.c
rename to lib/roken/gethostname.c
diff --git a/crypto/heimdal/lib/roken/getifaddrs.c b/lib/roken/getifaddrs.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getifaddrs.c
rename to lib/roken/getifaddrs.c
diff --git a/crypto/heimdal/lib/roken/getipnodebyaddr.c b/lib/roken/getipnodebyaddr.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getipnodebyaddr.c
rename to lib/roken/getipnodebyaddr.c
diff --git a/crypto/heimdal/lib/roken/getipnodebyname.c b/lib/roken/getipnodebyname.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getipnodebyname.c
rename to lib/roken/getipnodebyname.c
diff --git a/crypto/heimdal/lib/roken/getnameinfo.c b/lib/roken/getnameinfo.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getnameinfo.c
rename to lib/roken/getnameinfo.c
diff --git a/crypto/heimdal/lib/roken/getnameinfo_verified.c b/lib/roken/getnameinfo_verified.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getnameinfo_verified.c
rename to lib/roken/getnameinfo_verified.c
diff --git a/crypto/heimdal/lib/roken/getopt.c b/lib/roken/getopt.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getopt.c
rename to lib/roken/getopt.c
diff --git a/crypto/heimdal/lib/roken/getprogname.c b/lib/roken/getprogname.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getprogname.c
rename to lib/roken/getprogname.c
diff --git a/crypto/heimdal/lib/roken/gettimeofday.c b/lib/roken/gettimeofday.c
similarity index 100%
rename from crypto/heimdal/lib/roken/gettimeofday.c
rename to lib/roken/gettimeofday.c
diff --git a/crypto/heimdal/lib/roken/getuid.c b/lib/roken/getuid.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getuid.c
rename to lib/roken/getuid.c
diff --git a/crypto/heimdal/lib/roken/getusershell.c b/lib/roken/getusershell.c
similarity index 100%
rename from crypto/heimdal/lib/roken/getusershell.c
rename to lib/roken/getusershell.c
diff --git a/crypto/heimdal/lib/roken/glob.c b/lib/roken/glob.c
similarity index 100%
rename from crypto/heimdal/lib/roken/glob.c
rename to lib/roken/glob.c
diff --git a/crypto/heimdal/lib/roken/glob.hin b/lib/roken/glob.hin
similarity index 100%
rename from crypto/heimdal/lib/roken/glob.hin
rename to lib/roken/glob.hin
diff --git a/crypto/heimdal/lib/roken/h_errno.c b/lib/roken/h_errno.c
similarity index 100%
rename from crypto/heimdal/lib/roken/h_errno.c
rename to lib/roken/h_errno.c
diff --git a/crypto/heimdal/lib/roken/hex-test.c b/lib/roken/hex-test.c
similarity index 100%
rename from crypto/heimdal/lib/roken/hex-test.c
rename to lib/roken/hex-test.c
diff --git a/crypto/heimdal/lib/roken/hex.c b/lib/roken/hex.c
similarity index 100%
rename from crypto/heimdal/lib/roken/hex.c
rename to lib/roken/hex.c
diff --git a/crypto/heimdal/lib/roken/hex.h b/lib/roken/hex.h
similarity index 100%
rename from crypto/heimdal/lib/roken/hex.h
rename to lib/roken/hex.h
diff --git a/crypto/heimdal/lib/roken/hostent_find_fqdn.c b/lib/roken/hostent_find_fqdn.c
similarity index 100%
rename from crypto/heimdal/lib/roken/hostent_find_fqdn.c
rename to lib/roken/hostent_find_fqdn.c
diff --git a/crypto/heimdal/lib/roken/hstrerror.c b/lib/roken/hstrerror.c
similarity index 100%
rename from crypto/heimdal/lib/roken/hstrerror.c
rename to lib/roken/hstrerror.c
diff --git a/crypto/heimdal/lib/roken/ifaddrs.hin b/lib/roken/ifaddrs.hin
similarity index 100%
rename from crypto/heimdal/lib/roken/ifaddrs.hin
rename to lib/roken/ifaddrs.hin
diff --git a/crypto/heimdal/lib/roken/inet_aton.c b/lib/roken/inet_aton.c
similarity index 100%
rename from crypto/heimdal/lib/roken/inet_aton.c
rename to lib/roken/inet_aton.c
diff --git a/crypto/heimdal/lib/roken/inet_ntop.c b/lib/roken/inet_ntop.c
similarity index 100%
rename from crypto/heimdal/lib/roken/inet_ntop.c
rename to lib/roken/inet_ntop.c
diff --git a/crypto/heimdal/lib/roken/inet_pton.c b/lib/roken/inet_pton.c
similarity index 100%
rename from crypto/heimdal/lib/roken/inet_pton.c
rename to lib/roken/inet_pton.c
diff --git a/crypto/heimdal/lib/roken/initgroups.c b/lib/roken/initgroups.c
similarity index 100%
rename from crypto/heimdal/lib/roken/initgroups.c
rename to lib/roken/initgroups.c
diff --git a/crypto/heimdal/lib/roken/innetgr.c b/lib/roken/innetgr.c
similarity index 100%
rename from crypto/heimdal/lib/roken/innetgr.c
rename to lib/roken/innetgr.c
diff --git a/crypto/heimdal/lib/roken/install-sh b/lib/roken/install-sh
similarity index 100%
rename from crypto/heimdal/lib/roken/install-sh
rename to lib/roken/install-sh
diff --git a/crypto/heimdal/lib/roken/iruserok.c b/lib/roken/iruserok.c
similarity index 100%
rename from crypto/heimdal/lib/roken/iruserok.c
rename to lib/roken/iruserok.c
diff --git a/crypto/heimdal/lib/roken/issuid.c b/lib/roken/issuid.c
similarity index 100%
rename from crypto/heimdal/lib/roken/issuid.c
rename to lib/roken/issuid.c
diff --git a/crypto/heimdal/lib/roken/k_getpwnam.c b/lib/roken/k_getpwnam.c
similarity index 100%
rename from crypto/heimdal/lib/roken/k_getpwnam.c
rename to lib/roken/k_getpwnam.c
diff --git a/crypto/heimdal/lib/roken/k_getpwuid.c b/lib/roken/k_getpwuid.c
similarity index 100%
rename from crypto/heimdal/lib/roken/k_getpwuid.c
rename to lib/roken/k_getpwuid.c
diff --git a/crypto/heimdal/lib/roken/localtime_r.c b/lib/roken/localtime_r.c
similarity index 100%
rename from crypto/heimdal/lib/roken/localtime_r.c
rename to lib/roken/localtime_r.c
diff --git a/crypto/heimdal/lib/roken/lstat.c b/lib/roken/lstat.c
similarity index 100%
rename from crypto/heimdal/lib/roken/lstat.c
rename to lib/roken/lstat.c
diff --git a/crypto/heimdal/lib/roken/memmove.c b/lib/roken/memmove.c
similarity index 100%
rename from crypto/heimdal/lib/roken/memmove.c
rename to lib/roken/memmove.c
diff --git a/crypto/heimdal/lib/roken/mini_inetd.c b/lib/roken/mini_inetd.c
similarity index 100%
rename from crypto/heimdal/lib/roken/mini_inetd.c
rename to lib/roken/mini_inetd.c
diff --git a/crypto/heimdal/lib/roken/missing b/lib/roken/missing
similarity index 100%
rename from crypto/heimdal/lib/roken/missing
rename to lib/roken/missing
diff --git a/crypto/heimdal/lib/roken/mkinstalldirs b/lib/roken/mkinstalldirs
similarity index 100%
rename from crypto/heimdal/lib/roken/mkinstalldirs
rename to lib/roken/mkinstalldirs
diff --git a/crypto/heimdal/lib/roken/mkstemp.c b/lib/roken/mkstemp.c
similarity index 100%
rename from crypto/heimdal/lib/roken/mkstemp.c
rename to lib/roken/mkstemp.c
diff --git a/crypto/heimdal/lib/roken/ndbm_wrap.c b/lib/roken/ndbm_wrap.c
similarity index 100%
rename from crypto/heimdal/lib/roken/ndbm_wrap.c
rename to lib/roken/ndbm_wrap.c
diff --git a/crypto/heimdal/lib/roken/ndbm_wrap.h b/lib/roken/ndbm_wrap.h
similarity index 100%
rename from crypto/heimdal/lib/roken/ndbm_wrap.h
rename to lib/roken/ndbm_wrap.h
diff --git a/crypto/heimdal/lib/roken/net_read.c b/lib/roken/net_read.c
similarity index 100%
rename from crypto/heimdal/lib/roken/net_read.c
rename to lib/roken/net_read.c
diff --git a/crypto/heimdal/lib/roken/net_write.c b/lib/roken/net_write.c
similarity index 100%
rename from crypto/heimdal/lib/roken/net_write.c
rename to lib/roken/net_write.c
diff --git a/crypto/heimdal/lib/roken/parse_bytes-test.c b/lib/roken/parse_bytes-test.c
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_bytes-test.c
rename to lib/roken/parse_bytes-test.c
diff --git a/crypto/heimdal/lib/roken/parse_bytes.c b/lib/roken/parse_bytes.c
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_bytes.c
rename to lib/roken/parse_bytes.c
diff --git a/crypto/heimdal/lib/roken/parse_bytes.h b/lib/roken/parse_bytes.h
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_bytes.h
rename to lib/roken/parse_bytes.h
diff --git a/crypto/heimdal/lib/roken/parse_reply-test.c b/lib/roken/parse_reply-test.c
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_reply-test.c
rename to lib/roken/parse_reply-test.c
diff --git a/crypto/heimdal/lib/roken/parse_time-test.c b/lib/roken/parse_time-test.c
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_time-test.c
rename to lib/roken/parse_time-test.c
diff --git a/crypto/heimdal/lib/roken/parse_time.3 b/lib/roken/parse_time.3
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_time.3
rename to lib/roken/parse_time.3
diff --git a/crypto/heimdal/lib/roken/parse_time.c b/lib/roken/parse_time.c
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_time.c
rename to lib/roken/parse_time.c
diff --git a/crypto/heimdal/lib/roken/parse_time.h b/lib/roken/parse_time.h
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_time.h
rename to lib/roken/parse_time.h
diff --git a/crypto/heimdal/lib/roken/parse_units.c b/lib/roken/parse_units.c
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_units.c
rename to lib/roken/parse_units.c
diff --git a/crypto/heimdal/lib/roken/parse_units.h b/lib/roken/parse_units.h
similarity index 100%
rename from crypto/heimdal/lib/roken/parse_units.h
rename to lib/roken/parse_units.h
diff --git a/crypto/heimdal/lib/roken/print_version.c b/lib/roken/print_version.c
similarity index 100%
rename from crypto/heimdal/lib/roken/print_version.c
rename to lib/roken/print_version.c
diff --git a/crypto/heimdal/lib/roken/putenv.c b/lib/roken/putenv.c
similarity index 100%
rename from crypto/heimdal/lib/roken/putenv.c
rename to lib/roken/putenv.c
diff --git a/crypto/heimdal/lib/roken/rcmd.c b/lib/roken/rcmd.c
similarity index 100%
rename from crypto/heimdal/lib/roken/rcmd.c
rename to lib/roken/rcmd.c
diff --git a/crypto/heimdal/lib/roken/readv.c b/lib/roken/readv.c
similarity index 100%
rename from crypto/heimdal/lib/roken/readv.c
rename to lib/roken/readv.c
diff --git a/crypto/heimdal/lib/roken/realloc.c b/lib/roken/realloc.c
similarity index 100%
rename from crypto/heimdal/lib/roken/realloc.c
rename to lib/roken/realloc.c
diff --git a/crypto/heimdal/lib/roken/recvmsg.c b/lib/roken/recvmsg.c
similarity index 100%
rename from crypto/heimdal/lib/roken/recvmsg.c
rename to lib/roken/recvmsg.c
diff --git a/crypto/heimdal/lib/roken/resolve-test.c b/lib/roken/resolve-test.c
similarity index 100%
rename from crypto/heimdal/lib/roken/resolve-test.c
rename to lib/roken/resolve-test.c
diff --git a/crypto/heimdal/lib/roken/resolve.c b/lib/roken/resolve.c
similarity index 100%
rename from crypto/heimdal/lib/roken/resolve.c
rename to lib/roken/resolve.c
diff --git a/crypto/heimdal/lib/roken/resolve.h b/lib/roken/resolve.h
similarity index 100%
rename from crypto/heimdal/lib/roken/resolve.h
rename to lib/roken/resolve.h
diff --git a/crypto/heimdal/lib/roken/resource.h b/lib/roken/resource.h
similarity index 100%
rename from crypto/heimdal/lib/roken/resource.h
rename to lib/roken/resource.h
diff --git a/crypto/heimdal/lib/roken/roken-common.h b/lib/roken/roken-common.h
similarity index 100%
rename from crypto/heimdal/lib/roken/roken-common.h
rename to lib/roken/roken-common.h
diff --git a/crypto/heimdal/lib/roken/roken.awk b/lib/roken/roken.awk
similarity index 100%
rename from crypto/heimdal/lib/roken/roken.awk
rename to lib/roken/roken.awk
diff --git a/crypto/heimdal/lib/roken/roken.h.in b/lib/roken/roken.h.in
similarity index 100%
rename from crypto/heimdal/lib/roken/roken.h.in
rename to lib/roken/roken.h.in
diff --git a/crypto/heimdal/lib/roken/roken_gethostby.c b/lib/roken/roken_gethostby.c
similarity index 100%
rename from crypto/heimdal/lib/roken/roken_gethostby.c
rename to lib/roken/roken_gethostby.c
diff --git a/crypto/heimdal/lib/roken/rtbl.3 b/lib/roken/rtbl.3
similarity index 100%
rename from crypto/heimdal/lib/roken/rtbl.3
rename to lib/roken/rtbl.3
diff --git a/crypto/heimdal/lib/roken/rtbl.c b/lib/roken/rtbl.c
similarity index 100%
rename from crypto/heimdal/lib/roken/rtbl.c
rename to lib/roken/rtbl.c
diff --git a/crypto/heimdal/lib/roken/rtbl.h b/lib/roken/rtbl.h
similarity index 100%
rename from crypto/heimdal/lib/roken/rtbl.h
rename to lib/roken/rtbl.h
diff --git a/crypto/heimdal/lib/roken/sendmsg.c b/lib/roken/sendmsg.c
similarity index 100%
rename from crypto/heimdal/lib/roken/sendmsg.c
rename to lib/roken/sendmsg.c
diff --git a/crypto/heimdal/lib/roken/setegid.c b/lib/roken/setegid.c
similarity index 100%
rename from crypto/heimdal/lib/roken/setegid.c
rename to lib/roken/setegid.c
diff --git a/crypto/heimdal/lib/roken/setenv.c b/lib/roken/setenv.c
similarity index 100%
rename from crypto/heimdal/lib/roken/setenv.c
rename to lib/roken/setenv.c
diff --git a/crypto/heimdal/lib/roken/seteuid.c b/lib/roken/seteuid.c
similarity index 100%
rename from crypto/heimdal/lib/roken/seteuid.c
rename to lib/roken/seteuid.c
diff --git a/crypto/heimdal/lib/roken/setprogname.c b/lib/roken/setprogname.c
similarity index 100%
rename from crypto/heimdal/lib/roken/setprogname.c
rename to lib/roken/setprogname.c
diff --git a/crypto/heimdal/lib/roken/signal.c b/lib/roken/signal.c
similarity index 100%
rename from crypto/heimdal/lib/roken/signal.c
rename to lib/roken/signal.c
diff --git a/crypto/heimdal/lib/roken/simple_exec.c b/lib/roken/simple_exec.c
similarity index 100%
rename from crypto/heimdal/lib/roken/simple_exec.c
rename to lib/roken/simple_exec.c
diff --git a/crypto/heimdal/lib/roken/snprintf-test.c b/lib/roken/snprintf-test.c
similarity index 100%
rename from crypto/heimdal/lib/roken/snprintf-test.c
rename to lib/roken/snprintf-test.c
diff --git a/crypto/heimdal/lib/roken/snprintf-test.h b/lib/roken/snprintf-test.h
similarity index 100%
rename from crypto/heimdal/lib/roken/snprintf-test.h
rename to lib/roken/snprintf-test.h
diff --git a/crypto/heimdal/lib/roken/snprintf.c b/lib/roken/snprintf.c
similarity index 100%
rename from crypto/heimdal/lib/roken/snprintf.c
rename to lib/roken/snprintf.c
diff --git a/crypto/heimdal/lib/roken/socket.c b/lib/roken/socket.c
similarity index 100%
rename from crypto/heimdal/lib/roken/socket.c
rename to lib/roken/socket.c
diff --git a/crypto/heimdal/lib/roken/socket_wrapper.c b/lib/roken/socket_wrapper.c
similarity index 100%
rename from crypto/heimdal/lib/roken/socket_wrapper.c
rename to lib/roken/socket_wrapper.c
diff --git a/crypto/heimdal/lib/roken/socket_wrapper.h b/lib/roken/socket_wrapper.h
similarity index 100%
rename from crypto/heimdal/lib/roken/socket_wrapper.h
rename to lib/roken/socket_wrapper.h
diff --git a/crypto/heimdal/lib/roken/strcasecmp.c b/lib/roken/strcasecmp.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strcasecmp.c
rename to lib/roken/strcasecmp.c
diff --git a/crypto/heimdal/lib/roken/strcollect.c b/lib/roken/strcollect.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strcollect.c
rename to lib/roken/strcollect.c
diff --git a/crypto/heimdal/lib/roken/strdup.c b/lib/roken/strdup.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strdup.c
rename to lib/roken/strdup.c
diff --git a/crypto/heimdal/lib/roken/strerror.c b/lib/roken/strerror.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strerror.c
rename to lib/roken/strerror.c
diff --git a/crypto/heimdal/lib/roken/strftime.c b/lib/roken/strftime.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strftime.c
rename to lib/roken/strftime.c
diff --git a/crypto/heimdal/lib/roken/strlcat.c b/lib/roken/strlcat.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strlcat.c
rename to lib/roken/strlcat.c
diff --git a/crypto/heimdal/lib/roken/strlcpy.c b/lib/roken/strlcpy.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strlcpy.c
rename to lib/roken/strlcpy.c
diff --git a/crypto/heimdal/lib/roken/strlwr.c b/lib/roken/strlwr.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strlwr.c
rename to lib/roken/strlwr.c
diff --git a/crypto/heimdal/lib/roken/strncasecmp.c b/lib/roken/strncasecmp.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strncasecmp.c
rename to lib/roken/strncasecmp.c
diff --git a/crypto/heimdal/lib/roken/strndup.c b/lib/roken/strndup.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strndup.c
rename to lib/roken/strndup.c
diff --git a/crypto/heimdal/lib/roken/strnlen.c b/lib/roken/strnlen.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strnlen.c
rename to lib/roken/strnlen.c
diff --git a/crypto/heimdal/lib/roken/strpftime-test.c b/lib/roken/strpftime-test.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strpftime-test.c
rename to lib/roken/strpftime-test.c
diff --git a/crypto/heimdal/lib/roken/strpftime-test.h b/lib/roken/strpftime-test.h
similarity index 100%
rename from crypto/heimdal/lib/roken/strpftime-test.h
rename to lib/roken/strpftime-test.h
diff --git a/crypto/heimdal/lib/roken/strpool.c b/lib/roken/strpool.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strpool.c
rename to lib/roken/strpool.c
diff --git a/crypto/heimdal/lib/roken/strptime.c b/lib/roken/strptime.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strptime.c
rename to lib/roken/strptime.c
diff --git a/crypto/heimdal/lib/roken/strsep.c b/lib/roken/strsep.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strsep.c
rename to lib/roken/strsep.c
diff --git a/crypto/heimdal/lib/roken/strsep_copy.c b/lib/roken/strsep_copy.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strsep_copy.c
rename to lib/roken/strsep_copy.c
diff --git a/crypto/heimdal/lib/roken/strtok_r.c b/lib/roken/strtok_r.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strtok_r.c
rename to lib/roken/strtok_r.c
diff --git a/crypto/heimdal/lib/roken/strupr.c b/lib/roken/strupr.c
similarity index 100%
rename from crypto/heimdal/lib/roken/strupr.c
rename to lib/roken/strupr.c
diff --git a/crypto/heimdal/lib/roken/swab.c b/lib/roken/swab.c
similarity index 100%
rename from crypto/heimdal/lib/roken/swab.c
rename to lib/roken/swab.c
diff --git a/crypto/heimdal/lib/roken/test-mem.c b/lib/roken/test-mem.c
similarity index 100%
rename from crypto/heimdal/lib/roken/test-mem.c
rename to lib/roken/test-mem.c
diff --git a/crypto/heimdal/lib/roken/test-mem.h b/lib/roken/test-mem.h
similarity index 100%
rename from crypto/heimdal/lib/roken/test-mem.h
rename to lib/roken/test-mem.h
diff --git a/crypto/heimdal/lib/roken/test-readenv.c b/lib/roken/test-readenv.c
similarity index 100%
rename from crypto/heimdal/lib/roken/test-readenv.c
rename to lib/roken/test-readenv.c
diff --git a/crypto/heimdal/lib/roken/timegm.c b/lib/roken/timegm.c
similarity index 100%
rename from crypto/heimdal/lib/roken/timegm.c
rename to lib/roken/timegm.c
diff --git a/crypto/heimdal/lib/roken/timeval.c b/lib/roken/timeval.c
similarity index 100%
rename from crypto/heimdal/lib/roken/timeval.c
rename to lib/roken/timeval.c
diff --git a/crypto/heimdal/lib/roken/tm2time.c b/lib/roken/tm2time.c
similarity index 100%
rename from crypto/heimdal/lib/roken/tm2time.c
rename to lib/roken/tm2time.c
diff --git a/crypto/heimdal/lib/roken/unsetenv.c b/lib/roken/unsetenv.c
similarity index 100%
rename from crypto/heimdal/lib/roken/unsetenv.c
rename to lib/roken/unsetenv.c
diff --git a/crypto/heimdal/lib/roken/unvis.c b/lib/roken/unvis.c
similarity index 100%
rename from crypto/heimdal/lib/roken/unvis.c
rename to lib/roken/unvis.c
diff --git a/crypto/heimdal/lib/roken/verify.c b/lib/roken/verify.c
similarity index 100%
rename from crypto/heimdal/lib/roken/verify.c
rename to lib/roken/verify.c
diff --git a/crypto/heimdal/lib/roken/verr.c b/lib/roken/verr.c
similarity index 100%
rename from crypto/heimdal/lib/roken/verr.c
rename to lib/roken/verr.c
diff --git a/crypto/heimdal/lib/roken/verrx.c b/lib/roken/verrx.c
similarity index 100%
rename from crypto/heimdal/lib/roken/verrx.c
rename to lib/roken/verrx.c
diff --git a/crypto/heimdal/lib/roken/vis.c b/lib/roken/vis.c
similarity index 100%
rename from crypto/heimdal/lib/roken/vis.c
rename to lib/roken/vis.c
diff --git a/crypto/heimdal/lib/roken/vis.h b/lib/roken/vis.h
similarity index 100%
rename from crypto/heimdal/lib/roken/vis.h
rename to lib/roken/vis.h
diff --git a/crypto/heimdal/lib/roken/vis.hin b/lib/roken/vis.hin
similarity index 100%
rename from crypto/heimdal/lib/roken/vis.hin
rename to lib/roken/vis.hin
diff --git a/crypto/heimdal/lib/roken/vsyslog.c b/lib/roken/vsyslog.c
similarity index 100%
rename from crypto/heimdal/lib/roken/vsyslog.c
rename to lib/roken/vsyslog.c
diff --git a/crypto/heimdal/lib/roken/vwarn.c b/lib/roken/vwarn.c
similarity index 100%
rename from crypto/heimdal/lib/roken/vwarn.c
rename to lib/roken/vwarn.c
diff --git a/crypto/heimdal/lib/roken/vwarnx.c b/lib/roken/vwarnx.c
similarity index 100%
rename from crypto/heimdal/lib/roken/vwarnx.c
rename to lib/roken/vwarnx.c
diff --git a/crypto/heimdal/lib/roken/warn.c b/lib/roken/warn.c
similarity index 100%
rename from crypto/heimdal/lib/roken/warn.c
rename to lib/roken/warn.c
diff --git a/crypto/heimdal/lib/roken/warnerr.c b/lib/roken/warnerr.c
similarity index 100%
rename from crypto/heimdal/lib/roken/warnerr.c
rename to lib/roken/warnerr.c
diff --git a/crypto/heimdal/lib/roken/warnx.c b/lib/roken/warnx.c
similarity index 100%
rename from crypto/heimdal/lib/roken/warnx.c
rename to lib/roken/warnx.c
diff --git a/crypto/heimdal/lib/roken/write_pid.c b/lib/roken/write_pid.c
similarity index 100%
rename from crypto/heimdal/lib/roken/write_pid.c
rename to lib/roken/write_pid.c
diff --git a/crypto/heimdal/lib/roken/writev.c b/lib/roken/writev.c
similarity index 100%
rename from crypto/heimdal/lib/roken/writev.c
rename to lib/roken/writev.c
diff --git a/crypto/heimdal/lib/roken/xdbm.h b/lib/roken/xdbm.h
similarity index 100%
rename from crypto/heimdal/lib/roken/xdbm.h
rename to lib/roken/xdbm.h
diff --git a/crypto/heimdal/lib/sl/ChangeLog b/lib/sl/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/sl/ChangeLog
rename to lib/sl/ChangeLog
diff --git a/crypto/heimdal/lib/sl/Makefile.am b/lib/sl/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/sl/Makefile.am
rename to lib/sl/Makefile.am
diff --git a/crypto/heimdal/lib/sl/Makefile.in b/lib/sl/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/sl/Makefile.in
rename to lib/sl/Makefile.in
diff --git a/crypto/heimdal/lib/sl/lex.c b/lib/sl/lex.c
similarity index 100%
rename from crypto/heimdal/lib/sl/lex.c
rename to lib/sl/lex.c
diff --git a/crypto/heimdal/lib/sl/lex.l b/lib/sl/lex.l
similarity index 100%
rename from crypto/heimdal/lib/sl/lex.l
rename to lib/sl/lex.l
diff --git a/crypto/heimdal/lib/sl/make_cmds.c b/lib/sl/make_cmds.c
similarity index 100%
rename from crypto/heimdal/lib/sl/make_cmds.c
rename to lib/sl/make_cmds.c
diff --git a/crypto/heimdal/lib/sl/make_cmds.h b/lib/sl/make_cmds.h
similarity index 100%
rename from crypto/heimdal/lib/sl/make_cmds.h
rename to lib/sl/make_cmds.h
diff --git a/crypto/heimdal/lib/sl/parse.c b/lib/sl/parse.c
similarity index 100%
rename from crypto/heimdal/lib/sl/parse.c
rename to lib/sl/parse.c
diff --git a/crypto/heimdal/lib/sl/parse.h b/lib/sl/parse.h
similarity index 100%
rename from crypto/heimdal/lib/sl/parse.h
rename to lib/sl/parse.h
diff --git a/crypto/heimdal/lib/sl/parse.y b/lib/sl/parse.y
similarity index 100%
rename from crypto/heimdal/lib/sl/parse.y
rename to lib/sl/parse.y
diff --git a/crypto/heimdal/lib/sl/roken_rename.h b/lib/sl/roken_rename.h
similarity index 100%
rename from crypto/heimdal/lib/sl/roken_rename.h
rename to lib/sl/roken_rename.h
diff --git a/crypto/heimdal/lib/sl/sl.c b/lib/sl/sl.c
similarity index 100%
rename from crypto/heimdal/lib/sl/sl.c
rename to lib/sl/sl.c
diff --git a/crypto/heimdal/lib/sl/sl.h b/lib/sl/sl.h
similarity index 100%
rename from crypto/heimdal/lib/sl/sl.h
rename to lib/sl/sl.h
diff --git a/crypto/heimdal/lib/sl/sl_locl.h b/lib/sl/sl_locl.h
similarity index 100%
rename from crypto/heimdal/lib/sl/sl_locl.h
rename to lib/sl/sl_locl.h
diff --git a/crypto/heimdal/lib/sl/slc-gram.c b/lib/sl/slc-gram.c
similarity index 100%
rename from crypto/heimdal/lib/sl/slc-gram.c
rename to lib/sl/slc-gram.c
diff --git a/crypto/heimdal/lib/sl/slc-gram.h b/lib/sl/slc-gram.h
similarity index 100%
rename from crypto/heimdal/lib/sl/slc-gram.h
rename to lib/sl/slc-gram.h
diff --git a/crypto/heimdal/lib/sl/slc-gram.y b/lib/sl/slc-gram.y
similarity index 100%
rename from crypto/heimdal/lib/sl/slc-gram.y
rename to lib/sl/slc-gram.y
diff --git a/crypto/heimdal/lib/sl/slc-lex.c b/lib/sl/slc-lex.c
similarity index 100%
rename from crypto/heimdal/lib/sl/slc-lex.c
rename to lib/sl/slc-lex.c
diff --git a/crypto/heimdal/lib/sl/slc-lex.l b/lib/sl/slc-lex.l
similarity index 100%
rename from crypto/heimdal/lib/sl/slc-lex.l
rename to lib/sl/slc-lex.l
diff --git a/crypto/heimdal/lib/sl/slc.h b/lib/sl/slc.h
similarity index 100%
rename from crypto/heimdal/lib/sl/slc.h
rename to lib/sl/slc.h
diff --git a/crypto/heimdal/lib/sl/ss.c b/lib/sl/ss.c
similarity index 100%
rename from crypto/heimdal/lib/sl/ss.c
rename to lib/sl/ss.c
diff --git a/crypto/heimdal/lib/sl/ss.h b/lib/sl/ss.h
similarity index 100%
rename from crypto/heimdal/lib/sl/ss.h
rename to lib/sl/ss.h
diff --git a/crypto/heimdal/lib/sl/test_sl.c b/lib/sl/test_sl.c
similarity index 100%
rename from crypto/heimdal/lib/sl/test_sl.c
rename to lib/sl/test_sl.c
diff --git a/crypto/heimdal/lib/vers/ChangeLog b/lib/vers/ChangeLog
similarity index 100%
rename from crypto/heimdal/lib/vers/ChangeLog
rename to lib/vers/ChangeLog
diff --git a/crypto/heimdal/lib/vers/Makefile.am b/lib/vers/Makefile.am
similarity index 100%
rename from crypto/heimdal/lib/vers/Makefile.am
rename to lib/vers/Makefile.am
diff --git a/crypto/heimdal/lib/vers/Makefile.in b/lib/vers/Makefile.in
similarity index 100%
rename from crypto/heimdal/lib/vers/Makefile.in
rename to lib/vers/Makefile.in
diff --git a/crypto/heimdal/lib/vers/make-print-version.c b/lib/vers/make-print-version.c
similarity index 100%
rename from crypto/heimdal/lib/vers/make-print-version.c
rename to lib/vers/make-print-version.c
diff --git a/crypto/heimdal/lib/vers/print_version.c b/lib/vers/print_version.c
similarity index 100%
rename from crypto/heimdal/lib/vers/print_version.c
rename to lib/vers/print_version.c
diff --git a/crypto/heimdal/lib/vers/vers.h b/lib/vers/vers.h
similarity index 100%
rename from crypto/heimdal/lib/vers/vers.h
rename to lib/vers/vers.h
diff --git a/crypto/heimdal/ltconfig b/ltconfig
similarity index 100%
rename from crypto/heimdal/ltconfig
rename to ltconfig
diff --git a/crypto/heimdal/ltmain.sh b/ltmain.sh
similarity index 100%
rename from crypto/heimdal/ltmain.sh
rename to ltmain.sh
diff --git a/crypto/heimdal/missing b/missing
similarity index 100%
rename from crypto/heimdal/missing
rename to missing
diff --git a/crypto/heimdal/mkinstalldirs b/mkinstalldirs
similarity index 100%
rename from crypto/heimdal/mkinstalldirs
rename to mkinstalldirs
diff --git a/crypto/heimdal/packages/ChangeLog b/packages/ChangeLog
similarity index 100%
rename from crypto/heimdal/packages/ChangeLog
rename to packages/ChangeLog
diff --git a/crypto/heimdal/packages/Makefile.am b/packages/Makefile.am
similarity index 100%
rename from crypto/heimdal/packages/Makefile.am
rename to packages/Makefile.am
diff --git a/crypto/heimdal/packages/Makefile.in b/packages/Makefile.in
similarity index 100%
rename from crypto/heimdal/packages/Makefile.in
rename to packages/Makefile.in
diff --git a/crypto/heimdal/packages/debian/Makefile.am b/packages/debian/Makefile.am
similarity index 100%
rename from crypto/heimdal/packages/debian/Makefile.am
rename to packages/debian/Makefile.am
diff --git a/crypto/heimdal/packages/debian/Makefile.in b/packages/debian/Makefile.in
similarity index 100%
rename from crypto/heimdal/packages/debian/Makefile.in
rename to packages/debian/Makefile.in
diff --git a/crypto/heimdal/packages/debian/README b/packages/debian/README
similarity index 100%
rename from crypto/heimdal/packages/debian/README
rename to packages/debian/README
diff --git a/crypto/heimdal/packages/debian/README.Debian b/packages/debian/README.Debian
similarity index 100%
rename from crypto/heimdal/packages/debian/README.Debian
rename to packages/debian/README.Debian
diff --git a/crypto/heimdal/packages/debian/changelog b/packages/debian/changelog
similarity index 100%
rename from crypto/heimdal/packages/debian/changelog
rename to packages/debian/changelog
diff --git a/crypto/heimdal/packages/debian/compat b/packages/debian/compat
similarity index 100%
rename from crypto/heimdal/packages/debian/compat
rename to packages/debian/compat
diff --git a/crypto/heimdal/packages/debian/control b/packages/debian/control
similarity index 100%
rename from crypto/heimdal/packages/debian/control
rename to packages/debian/control
diff --git a/crypto/heimdal/packages/debian/copyright b/packages/debian/copyright
similarity index 100%
rename from crypto/heimdal/packages/debian/copyright
rename to packages/debian/copyright
diff --git a/crypto/heimdal/packages/debian/extras/default b/packages/debian/extras/default
similarity index 100%
rename from crypto/heimdal/packages/debian/extras/default
rename to packages/debian/extras/default
diff --git a/crypto/heimdal/packages/debian/extras/kadmind.acl b/packages/debian/extras/kadmind.acl
similarity index 100%
rename from crypto/heimdal/packages/debian/extras/kadmind.acl
rename to packages/debian/extras/kadmind.acl
diff --git a/crypto/heimdal/packages/debian/extras/kdc.conf b/packages/debian/extras/kdc.conf
similarity index 100%
rename from crypto/heimdal/packages/debian/extras/kdc.conf
rename to packages/debian/extras/kdc.conf
diff --git a/crypto/heimdal/packages/debian/heimdal-clients-x.install b/packages/debian/heimdal-clients-x.install
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-clients-x.install
rename to packages/debian/heimdal-clients-x.install
diff --git a/crypto/heimdal/packages/debian/heimdal-clients.install b/packages/debian/heimdal-clients.install
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-clients.install
rename to packages/debian/heimdal-clients.install
diff --git a/crypto/heimdal/packages/debian/heimdal-clients.postinst b/packages/debian/heimdal-clients.postinst
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-clients.postinst
rename to packages/debian/heimdal-clients.postinst
diff --git a/crypto/heimdal/packages/debian/heimdal-clients.prerm b/packages/debian/heimdal-clients.prerm
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-clients.prerm
rename to packages/debian/heimdal-clients.prerm
diff --git a/crypto/heimdal/packages/debian/heimdal-dev.install b/packages/debian/heimdal-dev.install
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-dev.install
rename to packages/debian/heimdal-dev.install
diff --git a/crypto/heimdal/packages/debian/heimdal-docs.install b/packages/debian/heimdal-docs.install
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-docs.install
rename to packages/debian/heimdal-docs.install
diff --git a/crypto/heimdal/packages/debian/heimdal-kcm.init b/packages/debian/heimdal-kcm.init
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kcm.init
rename to packages/debian/heimdal-kcm.init
diff --git a/crypto/heimdal/packages/debian/heimdal-kcm.install b/packages/debian/heimdal-kcm.install
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kcm.install
rename to packages/debian/heimdal-kcm.install
diff --git a/crypto/heimdal/packages/debian/heimdal-kdc.dirs b/packages/debian/heimdal-kdc.dirs
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kdc.dirs
rename to packages/debian/heimdal-kdc.dirs
diff --git a/crypto/heimdal/packages/debian/heimdal-kdc.examples b/packages/debian/heimdal-kdc.examples
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kdc.examples
rename to packages/debian/heimdal-kdc.examples
diff --git a/crypto/heimdal/packages/debian/heimdal-kdc.init b/packages/debian/heimdal-kdc.init
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kdc.init
rename to packages/debian/heimdal-kdc.init
diff --git a/crypto/heimdal/packages/debian/heimdal-kdc.install b/packages/debian/heimdal-kdc.install
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kdc.install
rename to packages/debian/heimdal-kdc.install
diff --git a/crypto/heimdal/packages/debian/heimdal-kdc.logrotate b/packages/debian/heimdal-kdc.logrotate
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kdc.logrotate
rename to packages/debian/heimdal-kdc.logrotate
diff --git a/crypto/heimdal/packages/debian/heimdal-kdc.postinst b/packages/debian/heimdal-kdc.postinst
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kdc.postinst
rename to packages/debian/heimdal-kdc.postinst
diff --git a/crypto/heimdal/packages/debian/heimdal-kdc.postrm b/packages/debian/heimdal-kdc.postrm
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kdc.postrm
rename to packages/debian/heimdal-kdc.postrm
diff --git a/crypto/heimdal/packages/debian/heimdal-kdc.templates b/packages/debian/heimdal-kdc.templates
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-kdc.templates
rename to packages/debian/heimdal-kdc.templates
diff --git a/crypto/heimdal/packages/debian/heimdal-servers-x.dirs b/packages/debian/heimdal-servers-x.dirs
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers-x.dirs
rename to packages/debian/heimdal-servers-x.dirs
diff --git a/crypto/heimdal/packages/debian/heimdal-servers-x.install b/packages/debian/heimdal-servers-x.install
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers-x.install
rename to packages/debian/heimdal-servers-x.install
diff --git a/crypto/heimdal/packages/debian/heimdal-servers-x.postinst b/packages/debian/heimdal-servers-x.postinst
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers-x.postinst
rename to packages/debian/heimdal-servers-x.postinst
diff --git a/crypto/heimdal/packages/debian/heimdal-servers-x.postrm b/packages/debian/heimdal-servers-x.postrm
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers-x.postrm
rename to packages/debian/heimdal-servers-x.postrm
diff --git a/crypto/heimdal/packages/debian/heimdal-servers-x.prerm b/packages/debian/heimdal-servers-x.prerm
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers-x.prerm
rename to packages/debian/heimdal-servers-x.prerm
diff --git a/crypto/heimdal/packages/debian/heimdal-servers.dirs b/packages/debian/heimdal-servers.dirs
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers.dirs
rename to packages/debian/heimdal-servers.dirs
diff --git a/crypto/heimdal/packages/debian/heimdal-servers.install b/packages/debian/heimdal-servers.install
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers.install
rename to packages/debian/heimdal-servers.install
diff --git a/crypto/heimdal/packages/debian/heimdal-servers.postinst b/packages/debian/heimdal-servers.postinst
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers.postinst
rename to packages/debian/heimdal-servers.postinst
diff --git a/crypto/heimdal/packages/debian/heimdal-servers.postrm b/packages/debian/heimdal-servers.postrm
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers.postrm
rename to packages/debian/heimdal-servers.postrm
diff --git a/crypto/heimdal/packages/debian/heimdal-servers.prerm b/packages/debian/heimdal-servers.prerm
similarity index 100%
rename from crypto/heimdal/packages/debian/heimdal-servers.prerm
rename to packages/debian/heimdal-servers.prerm
diff --git a/crypto/heimdal/packages/debian/libasn1-8-heimdal.install b/packages/debian/libasn1-8-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libasn1-8-heimdal.install
rename to packages/debian/libasn1-8-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libasn1-8-heimdal.postinst.debhelper b/packages/debian/libasn1-8-heimdal.postinst.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libasn1-8-heimdal.postinst.debhelper
rename to packages/debian/libasn1-8-heimdal.postinst.debhelper
diff --git a/crypto/heimdal/packages/debian/libasn1-8-heimdal.postrm.debhelper b/packages/debian/libasn1-8-heimdal.postrm.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libasn1-8-heimdal.postrm.debhelper
rename to packages/debian/libasn1-8-heimdal.postrm.debhelper
diff --git a/crypto/heimdal/packages/debian/libasn1-8-heimdal.substvars b/packages/debian/libasn1-8-heimdal.substvars
similarity index 100%
rename from crypto/heimdal/packages/debian/libasn1-8-heimdal.substvars
rename to packages/debian/libasn1-8-heimdal.substvars
diff --git a/crypto/heimdal/packages/debian/libgssapi2-heimdal.install b/packages/debian/libgssapi2-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libgssapi2-heimdal.install
rename to packages/debian/libgssapi2-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libgssapi2-heimdal.postinst.debhelper b/packages/debian/libgssapi2-heimdal.postinst.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libgssapi2-heimdal.postinst.debhelper
rename to packages/debian/libgssapi2-heimdal.postinst.debhelper
diff --git a/crypto/heimdal/packages/debian/libgssapi2-heimdal.postrm.debhelper b/packages/debian/libgssapi2-heimdal.postrm.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libgssapi2-heimdal.postrm.debhelper
rename to packages/debian/libgssapi2-heimdal.postrm.debhelper
diff --git a/crypto/heimdal/packages/debian/libgssapi2-heimdal.substvars b/packages/debian/libgssapi2-heimdal.substvars
similarity index 100%
rename from crypto/heimdal/packages/debian/libgssapi2-heimdal.substvars
rename to packages/debian/libgssapi2-heimdal.substvars
diff --git a/crypto/heimdal/packages/debian/libhdb9-heimdal.install b/packages/debian/libhdb9-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libhdb9-heimdal.install
rename to packages/debian/libhdb9-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libhdb9-heimdal.postinst.debhelper b/packages/debian/libhdb9-heimdal.postinst.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libhdb9-heimdal.postinst.debhelper
rename to packages/debian/libhdb9-heimdal.postinst.debhelper
diff --git a/crypto/heimdal/packages/debian/libhdb9-heimdal.postrm.debhelper b/packages/debian/libhdb9-heimdal.postrm.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libhdb9-heimdal.postrm.debhelper
rename to packages/debian/libhdb9-heimdal.postrm.debhelper
diff --git a/crypto/heimdal/packages/debian/libhdb9-heimdal.substvars b/packages/debian/libhdb9-heimdal.substvars
similarity index 100%
rename from crypto/heimdal/packages/debian/libhdb9-heimdal.substvars
rename to packages/debian/libhdb9-heimdal.substvars
diff --git a/crypto/heimdal/packages/debian/libkadm5clnt7-heimdal.install b/packages/debian/libkadm5clnt7-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libkadm5clnt7-heimdal.install
rename to packages/debian/libkadm5clnt7-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libkadm5clnt7-heimdal.postinst.debhelper b/packages/debian/libkadm5clnt7-heimdal.postinst.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libkadm5clnt7-heimdal.postinst.debhelper
rename to packages/debian/libkadm5clnt7-heimdal.postinst.debhelper
diff --git a/crypto/heimdal/packages/debian/libkadm5clnt7-heimdal.postrm.debhelper b/packages/debian/libkadm5clnt7-heimdal.postrm.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libkadm5clnt7-heimdal.postrm.debhelper
rename to packages/debian/libkadm5clnt7-heimdal.postrm.debhelper
diff --git a/crypto/heimdal/packages/debian/libkadm5clnt7-heimdal.substvars b/packages/debian/libkadm5clnt7-heimdal.substvars
similarity index 100%
rename from crypto/heimdal/packages/debian/libkadm5clnt7-heimdal.substvars
rename to packages/debian/libkadm5clnt7-heimdal.substvars
diff --git a/crypto/heimdal/packages/debian/libkadm5srv7-heimdal.install b/packages/debian/libkadm5srv7-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libkadm5srv7-heimdal.install
rename to packages/debian/libkadm5srv7-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libkadm5srv8-heimdal.install b/packages/debian/libkadm5srv8-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libkadm5srv8-heimdal.install
rename to packages/debian/libkadm5srv8-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libkafs0-heimdal.install b/packages/debian/libkafs0-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libkafs0-heimdal.install
rename to packages/debian/libkafs0-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libkrb5-22-heimdal.install b/packages/debian/libkrb5-22-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libkrb5-22-heimdal.install
rename to packages/debian/libkrb5-22-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libkrb5-22-heimdal.postinst.debhelper b/packages/debian/libkrb5-22-heimdal.postinst.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libkrb5-22-heimdal.postinst.debhelper
rename to packages/debian/libkrb5-22-heimdal.postinst.debhelper
diff --git a/crypto/heimdal/packages/debian/libkrb5-22-heimdal.postrm.debhelper b/packages/debian/libkrb5-22-heimdal.postrm.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libkrb5-22-heimdal.postrm.debhelper
rename to packages/debian/libkrb5-22-heimdal.postrm.debhelper
diff --git a/crypto/heimdal/packages/debian/libkrb5-22-heimdal.substvars b/packages/debian/libkrb5-22-heimdal.substvars
similarity index 100%
rename from crypto/heimdal/packages/debian/libkrb5-22-heimdal.substvars
rename to packages/debian/libkrb5-22-heimdal.substvars
diff --git a/crypto/heimdal/packages/debian/libotp0-heimdal.install b/packages/debian/libotp0-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libotp0-heimdal.install
rename to packages/debian/libotp0-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libroken18-heimdal.install b/packages/debian/libroken18-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libroken18-heimdal.install
rename to packages/debian/libroken18-heimdal.install
diff --git a/crypto/heimdal/packages/debian/libroken18-heimdal.postinst.debhelper b/packages/debian/libroken18-heimdal.postinst.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libroken18-heimdal.postinst.debhelper
rename to packages/debian/libroken18-heimdal.postinst.debhelper
diff --git a/crypto/heimdal/packages/debian/libroken18-heimdal.postrm.debhelper b/packages/debian/libroken18-heimdal.postrm.debhelper
similarity index 100%
rename from crypto/heimdal/packages/debian/libroken18-heimdal.postrm.debhelper
rename to packages/debian/libroken18-heimdal.postrm.debhelper
diff --git a/crypto/heimdal/packages/debian/libroken18-heimdal.substvars b/packages/debian/libroken18-heimdal.substvars
similarity index 100%
rename from crypto/heimdal/packages/debian/libroken18-heimdal.substvars
rename to packages/debian/libroken18-heimdal.substvars
diff --git a/crypto/heimdal/packages/debian/libsl0-heimdal.install b/packages/debian/libsl0-heimdal.install
similarity index 100%
rename from crypto/heimdal/packages/debian/libsl0-heimdal.install
rename to packages/debian/libsl0-heimdal.install
diff --git a/crypto/heimdal/packages/debian/patches/021_debian b/packages/debian/patches/021_debian
similarity index 100%
rename from crypto/heimdal/packages/debian/patches/021_debian
rename to packages/debian/patches/021_debian
diff --git a/crypto/heimdal/packages/debian/patches/022_ftp-roken-glob b/packages/debian/patches/022_ftp-roken-glob
similarity index 100%
rename from crypto/heimdal/packages/debian/patches/022_ftp-roken-glob
rename to packages/debian/patches/022_ftp-roken-glob
diff --git a/crypto/heimdal/packages/debian/patches/022_openafs b/packages/debian/patches/022_openafs
similarity index 100%
rename from crypto/heimdal/packages/debian/patches/022_openafs
rename to packages/debian/patches/022_openafs
diff --git a/crypto/heimdal/packages/debian/patches/025_pthreads b/packages/debian/patches/025_pthreads
similarity index 100%
rename from crypto/heimdal/packages/debian/patches/025_pthreads
rename to packages/debian/patches/025_pthreads
diff --git a/crypto/heimdal/packages/debian/patches/026_posix_max b/packages/debian/patches/026_posix_max
similarity index 100%
rename from crypto/heimdal/packages/debian/patches/026_posix_max
rename to packages/debian/patches/026_posix_max
diff --git a/crypto/heimdal/packages/debian/po/POTFILES.in b/packages/debian/po/POTFILES.in
similarity index 100%
rename from crypto/heimdal/packages/debian/po/POTFILES.in
rename to packages/debian/po/POTFILES.in
diff --git a/crypto/heimdal/packages/debian/po/templates.pot b/packages/debian/po/templates.pot
similarity index 100%
rename from crypto/heimdal/packages/debian/po/templates.pot
rename to packages/debian/po/templates.pot
diff --git a/crypto/heimdal/packages/debian/rules b/packages/debian/rules
similarity index 100%
rename from crypto/heimdal/packages/debian/rules
rename to packages/debian/rules
diff --git a/crypto/heimdal/packages/debian/scripts/convert_source b/packages/debian/scripts/convert_source
similarity index 100%
rename from crypto/heimdal/packages/debian/scripts/convert_source
rename to packages/debian/scripts/convert_source
diff --git a/crypto/heimdal/packages/mac/Info.plist b/packages/mac/Info.plist
similarity index 100%
rename from crypto/heimdal/packages/mac/Info.plist
rename to packages/mac/Info.plist
diff --git a/crypto/heimdal/packages/mac/Makefile.am b/packages/mac/Makefile.am
similarity index 100%
rename from crypto/heimdal/packages/mac/Makefile.am
rename to packages/mac/Makefile.am
diff --git a/crypto/heimdal/packages/mac/Makefile.in b/packages/mac/Makefile.in
similarity index 100%
rename from crypto/heimdal/packages/mac/Makefile.in
rename to packages/mac/Makefile.in
diff --git a/crypto/heimdal/packages/mac/Resources/Description.plist b/packages/mac/Resources/Description.plist
similarity index 100%
rename from crypto/heimdal/packages/mac/Resources/Description.plist
rename to packages/mac/Resources/Description.plist
diff --git a/crypto/heimdal/packages/mac/Resources/English.lproj/Welcome.rtf b/packages/mac/Resources/English.lproj/Welcome.rtf
similarity index 100%
rename from crypto/heimdal/packages/mac/Resources/English.lproj/Welcome.rtf
rename to packages/mac/Resources/English.lproj/Welcome.rtf
diff --git a/crypto/heimdal/packages/mac/mac.sh b/packages/mac/mac.sh
similarity index 100%
rename from crypto/heimdal/packages/mac/mac.sh
rename to packages/mac/mac.sh
diff --git a/crypto/heimdal/tests/ChangeLog b/tests/ChangeLog
similarity index 100%
rename from crypto/heimdal/tests/ChangeLog
rename to tests/ChangeLog
diff --git a/crypto/heimdal/tests/Makefile.am b/tests/Makefile.am
similarity index 100%
rename from crypto/heimdal/tests/Makefile.am
rename to tests/Makefile.am
diff --git a/crypto/heimdal/tests/Makefile.in b/tests/Makefile.in
similarity index 100%
rename from crypto/heimdal/tests/Makefile.in
rename to tests/Makefile.in
diff --git a/crypto/heimdal/tests/can/Makefile.am b/tests/can/Makefile.am
similarity index 100%
rename from crypto/heimdal/tests/can/Makefile.am
rename to tests/can/Makefile.am
diff --git a/crypto/heimdal/tests/can/Makefile.in b/tests/can/Makefile.in
similarity index 100%
rename from crypto/heimdal/tests/can/Makefile.in
rename to tests/can/Makefile.in
diff --git a/crypto/heimdal/tests/can/apple-10.4.kadm b/tests/can/apple-10.4.kadm
similarity index 100%
rename from crypto/heimdal/tests/can/apple-10.4.kadm
rename to tests/can/apple-10.4.kadm
diff --git a/crypto/heimdal/tests/can/apple-10.4.req b/tests/can/apple-10.4.req
similarity index 100%
rename from crypto/heimdal/tests/can/apple-10.4.req
rename to tests/can/apple-10.4.req
diff --git a/crypto/heimdal/tests/can/check-can.in b/tests/can/check-can.in
similarity index 100%
rename from crypto/heimdal/tests/can/check-can.in
rename to tests/can/check-can.in
diff --git a/crypto/heimdal/tests/can/heim-0.8.kadm b/tests/can/heim-0.8.kadm
similarity index 100%
rename from crypto/heimdal/tests/can/heim-0.8.kadm
rename to tests/can/heim-0.8.kadm
diff --git a/crypto/heimdal/tests/can/heim-0.8.req b/tests/can/heim-0.8.req
similarity index 100%
rename from crypto/heimdal/tests/can/heim-0.8.req
rename to tests/can/heim-0.8.req
diff --git a/crypto/heimdal/tests/can/krb5.conf.in b/tests/can/krb5.conf.in
similarity index 100%
rename from crypto/heimdal/tests/can/krb5.conf.in
rename to tests/can/krb5.conf.in
diff --git a/crypto/heimdal/tests/can/mit-pkinit-20070607.ca.crt b/tests/can/mit-pkinit-20070607.ca.crt
similarity index 100%
rename from crypto/heimdal/tests/can/mit-pkinit-20070607.ca.crt
rename to tests/can/mit-pkinit-20070607.ca.crt
diff --git a/crypto/heimdal/tests/can/mit-pkinit-20070607.kadm b/tests/can/mit-pkinit-20070607.kadm
similarity index 100%
rename from crypto/heimdal/tests/can/mit-pkinit-20070607.kadm
rename to tests/can/mit-pkinit-20070607.kadm
diff --git a/crypto/heimdal/tests/can/mit-pkinit-20070607.req b/tests/can/mit-pkinit-20070607.req
similarity index 100%
rename from crypto/heimdal/tests/can/mit-pkinit-20070607.req
rename to tests/can/mit-pkinit-20070607.req
diff --git a/crypto/heimdal/tests/can/mit-pkinit-20070607.xf b/tests/can/mit-pkinit-20070607.xf
similarity index 100%
rename from crypto/heimdal/tests/can/mit-pkinit-20070607.xf
rename to tests/can/mit-pkinit-20070607.xf
diff --git a/crypto/heimdal/tests/can/test_can.in b/tests/can/test_can.in
similarity index 100%
rename from crypto/heimdal/tests/can/test_can.in
rename to tests/can/test_can.in
diff --git a/crypto/heimdal/tests/db/Makefile.am b/tests/db/Makefile.am
similarity index 100%
rename from crypto/heimdal/tests/db/Makefile.am
rename to tests/db/Makefile.am
diff --git a/crypto/heimdal/tests/db/Makefile.in b/tests/db/Makefile.in
similarity index 100%
rename from crypto/heimdal/tests/db/Makefile.in
rename to tests/db/Makefile.in
diff --git a/crypto/heimdal/tests/db/add-modify-delete.in b/tests/db/add-modify-delete.in
similarity index 100%
rename from crypto/heimdal/tests/db/add-modify-delete.in
rename to tests/db/add-modify-delete.in
diff --git a/crypto/heimdal/tests/db/check-dbinfo.in b/tests/db/check-dbinfo.in
similarity index 100%
rename from crypto/heimdal/tests/db/check-dbinfo.in
rename to tests/db/check-dbinfo.in
diff --git a/crypto/heimdal/tests/db/have-db.in b/tests/db/have-db.in
similarity index 100%
rename from crypto/heimdal/tests/db/have-db.in
rename to tests/db/have-db.in
diff --git a/crypto/heimdal/tests/db/krb5.conf.in b/tests/db/krb5.conf.in
similarity index 100%
rename from crypto/heimdal/tests/db/krb5.conf.in
rename to tests/db/krb5.conf.in
diff --git a/crypto/heimdal/tests/db/loaddump-db.in b/tests/db/loaddump-db.in
similarity index 100%
rename from crypto/heimdal/tests/db/loaddump-db.in
rename to tests/db/loaddump-db.in
diff --git a/crypto/heimdal/tests/db/text-dump-0.7 b/tests/db/text-dump-0.7
similarity index 100%
rename from crypto/heimdal/tests/db/text-dump-0.7
rename to tests/db/text-dump-0.7
diff --git a/crypto/heimdal/tests/db/text-dump-known-ext b/tests/db/text-dump-known-ext
similarity index 100%
rename from crypto/heimdal/tests/db/text-dump-known-ext
rename to tests/db/text-dump-known-ext
diff --git a/crypto/heimdal/tests/db/text-dump-no-ext b/tests/db/text-dump-no-ext
similarity index 100%
rename from crypto/heimdal/tests/db/text-dump-no-ext
rename to tests/db/text-dump-no-ext
diff --git a/crypto/heimdal/tests/db/text-dump-unknown-ext b/tests/db/text-dump-unknown-ext
similarity index 100%
rename from crypto/heimdal/tests/db/text-dump-unknown-ext
rename to tests/db/text-dump-unknown-ext
diff --git a/crypto/heimdal/tests/gss/Makefile.am b/tests/gss/Makefile.am
similarity index 100%
rename from crypto/heimdal/tests/gss/Makefile.am
rename to tests/gss/Makefile.am
diff --git a/crypto/heimdal/tests/gss/Makefile.in b/tests/gss/Makefile.in
similarity index 100%
rename from crypto/heimdal/tests/gss/Makefile.in
rename to tests/gss/Makefile.in
diff --git a/crypto/heimdal/tests/gss/check-basic.in b/tests/gss/check-basic.in
similarity index 100%
rename from crypto/heimdal/tests/gss/check-basic.in
rename to tests/gss/check-basic.in
diff --git a/crypto/heimdal/tests/gss/check-context.in b/tests/gss/check-context.in
similarity index 100%
rename from crypto/heimdal/tests/gss/check-context.in
rename to tests/gss/check-context.in
diff --git a/crypto/heimdal/tests/gss/check-gss.in b/tests/gss/check-gss.in
similarity index 100%
rename from crypto/heimdal/tests/gss/check-gss.in
rename to tests/gss/check-gss.in
diff --git a/crypto/heimdal/tests/gss/check-gssmask.in b/tests/gss/check-gssmask.in
similarity index 100%
rename from crypto/heimdal/tests/gss/check-gssmask.in
rename to tests/gss/check-gssmask.in
diff --git a/crypto/heimdal/tests/gss/check-ntlm.in b/tests/gss/check-ntlm.in
similarity index 100%
rename from crypto/heimdal/tests/gss/check-ntlm.in
rename to tests/gss/check-ntlm.in
diff --git a/crypto/heimdal/tests/gss/check-spnego.in b/tests/gss/check-spnego.in
similarity index 100%
rename from crypto/heimdal/tests/gss/check-spnego.in
rename to tests/gss/check-spnego.in
diff --git a/crypto/heimdal/tests/gss/krb5.conf.in b/tests/gss/krb5.conf.in
similarity index 100%
rename from crypto/heimdal/tests/gss/krb5.conf.in
rename to tests/gss/krb5.conf.in
diff --git a/crypto/heimdal/tests/gss/ntlm-user-file.txt b/tests/gss/ntlm-user-file.txt
similarity index 100%
rename from crypto/heimdal/tests/gss/ntlm-user-file.txt
rename to tests/gss/ntlm-user-file.txt
diff --git a/crypto/heimdal/tests/java/KerberosInit.java b/tests/java/KerberosInit.java
similarity index 100%
rename from crypto/heimdal/tests/java/KerberosInit.java
rename to tests/java/KerberosInit.java
diff --git a/crypto/heimdal/tests/java/Makefile.am b/tests/java/Makefile.am
similarity index 100%
rename from crypto/heimdal/tests/java/Makefile.am
rename to tests/java/Makefile.am
diff --git a/crypto/heimdal/tests/java/Makefile.in b/tests/java/Makefile.in
similarity index 100%
rename from crypto/heimdal/tests/java/Makefile.in
rename to tests/java/Makefile.in
diff --git a/crypto/heimdal/tests/java/check-kinit.in b/tests/java/check-kinit.in
similarity index 100%
rename from crypto/heimdal/tests/java/check-kinit.in
rename to tests/java/check-kinit.in
diff --git a/crypto/heimdal/tests/java/have-java.sh b/tests/java/have-java.sh
similarity index 100%
rename from crypto/heimdal/tests/java/have-java.sh
rename to tests/java/have-java.sh
diff --git a/crypto/heimdal/tests/java/jaas.conf b/tests/java/jaas.conf
similarity index 100%
rename from crypto/heimdal/tests/java/jaas.conf
rename to tests/java/jaas.conf
diff --git a/crypto/heimdal/tests/java/krb5.conf.in b/tests/java/krb5.conf.in
similarity index 100%
rename from crypto/heimdal/tests/java/krb5.conf.in
rename to tests/java/krb5.conf.in
diff --git a/crypto/heimdal/tests/kdc/Makefile.am b/tests/kdc/Makefile.am
similarity index 100%
rename from crypto/heimdal/tests/kdc/Makefile.am
rename to tests/kdc/Makefile.am
diff --git a/crypto/heimdal/tests/kdc/Makefile.in b/tests/kdc/Makefile.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/Makefile.in
rename to tests/kdc/Makefile.in
diff --git a/crypto/heimdal/tests/kdc/ap-req.c b/tests/kdc/ap-req.c
similarity index 100%
rename from crypto/heimdal/tests/kdc/ap-req.c
rename to tests/kdc/ap-req.c
diff --git a/crypto/heimdal/tests/kdc/check-digest.in b/tests/kdc/check-digest.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/check-digest.in
rename to tests/kdc/check-digest.in
diff --git a/crypto/heimdal/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/check-iprop.in
rename to tests/kdc/check-iprop.in
diff --git a/crypto/heimdal/tests/kdc/check-kadmin.in b/tests/kdc/check-kadmin.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/check-kadmin.in
rename to tests/kdc/check-kadmin.in
diff --git a/crypto/heimdal/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/check-kdc.in
rename to tests/kdc/check-kdc.in
diff --git a/crypto/heimdal/tests/kdc/check-keys.in b/tests/kdc/check-keys.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/check-keys.in
rename to tests/kdc/check-keys.in
diff --git a/crypto/heimdal/tests/kdc/check-pkinit.in b/tests/kdc/check-pkinit.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/check-pkinit.in
rename to tests/kdc/check-pkinit.in
diff --git a/crypto/heimdal/tests/kdc/check-referral.in b/tests/kdc/check-referral.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/check-referral.in
rename to tests/kdc/check-referral.in
diff --git a/crypto/heimdal/tests/kdc/check-uu.in b/tests/kdc/check-uu.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/check-uu.in
rename to tests/kdc/check-uu.in
diff --git a/crypto/heimdal/tests/kdc/donotexists.txt b/tests/kdc/donotexists.txt
similarity index 100%
rename from crypto/heimdal/tests/kdc/donotexists.txt
rename to tests/kdc/donotexists.txt
diff --git a/crypto/heimdal/tests/kdc/heimdal.acl b/tests/kdc/heimdal.acl
similarity index 100%
rename from crypto/heimdal/tests/kdc/heimdal.acl
rename to tests/kdc/heimdal.acl
diff --git a/crypto/heimdal/tests/kdc/iprop-acl b/tests/kdc/iprop-acl
similarity index 100%
rename from crypto/heimdal/tests/kdc/iprop-acl
rename to tests/kdc/iprop-acl
diff --git a/crypto/heimdal/tests/kdc/krb5-pkinit.conf.in b/tests/kdc/krb5-pkinit.conf.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/krb5-pkinit.conf.in
rename to tests/kdc/krb5-pkinit.conf.in
diff --git a/crypto/heimdal/tests/kdc/krb5.conf.in b/tests/kdc/krb5.conf.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/krb5.conf.in
rename to tests/kdc/krb5.conf.in
diff --git a/crypto/heimdal/tests/kdc/krb5.conf.keys.in b/tests/kdc/krb5.conf.keys.in
similarity index 100%
rename from crypto/heimdal/tests/kdc/krb5.conf.keys.in
rename to tests/kdc/krb5.conf.keys.in
diff --git a/crypto/heimdal/tests/kdc/ntlm-user-file.txt b/tests/kdc/ntlm-user-file.txt
similarity index 100%
rename from crypto/heimdal/tests/kdc/ntlm-user-file.txt
rename to tests/kdc/ntlm-user-file.txt
diff --git a/crypto/heimdal/tests/kdc/pki-mapping b/tests/kdc/pki-mapping
similarity index 100%
rename from crypto/heimdal/tests/kdc/pki-mapping
rename to tests/kdc/pki-mapping
diff --git a/crypto/heimdal/tests/kdc/uuserver.txt b/tests/kdc/uuserver.txt
similarity index 100%
rename from crypto/heimdal/tests/kdc/uuserver.txt
rename to tests/kdc/uuserver.txt
diff --git a/crypto/heimdal/tests/kdc/wait-kdc.sh b/tests/kdc/wait-kdc.sh
similarity index 100%
rename from crypto/heimdal/tests/kdc/wait-kdc.sh
rename to tests/kdc/wait-kdc.sh
diff --git a/crypto/heimdal/tests/ldap/Makefile.am b/tests/ldap/Makefile.am
similarity index 100%
rename from crypto/heimdal/tests/ldap/Makefile.am
rename to tests/ldap/Makefile.am
diff --git a/crypto/heimdal/tests/ldap/Makefile.in b/tests/ldap/Makefile.in
similarity index 100%
rename from crypto/heimdal/tests/ldap/Makefile.in
rename to tests/ldap/Makefile.in
diff --git a/crypto/heimdal/tests/ldap/check-ldap.in b/tests/ldap/check-ldap.in
similarity index 100%
rename from crypto/heimdal/tests/ldap/check-ldap.in
rename to tests/ldap/check-ldap.in
diff --git a/crypto/heimdal/tests/ldap/init.ldif b/tests/ldap/init.ldif
similarity index 100%
rename from crypto/heimdal/tests/ldap/init.ldif
rename to tests/ldap/init.ldif
diff --git a/crypto/heimdal/tests/ldap/krb5.conf.in b/tests/ldap/krb5.conf.in
similarity index 100%
rename from crypto/heimdal/tests/ldap/krb5.conf.in
rename to tests/ldap/krb5.conf.in
diff --git a/crypto/heimdal/tests/ldap/samba.schema b/tests/ldap/samba.schema
similarity index 100%
rename from crypto/heimdal/tests/ldap/samba.schema
rename to tests/ldap/samba.schema
diff --git a/crypto/heimdal/tests/ldap/slapd-init.in b/tests/ldap/slapd-init.in
similarity index 100%
rename from crypto/heimdal/tests/ldap/slapd-init.in
rename to tests/ldap/slapd-init.in
diff --git a/crypto/heimdal/tests/ldap/slapd-stop b/tests/ldap/slapd-stop
similarity index 100%
rename from crypto/heimdal/tests/ldap/slapd-stop
rename to tests/ldap/slapd-stop
diff --git a/crypto/heimdal/tests/ldap/slapd.conf b/tests/ldap/slapd.conf
similarity index 100%
rename from crypto/heimdal/tests/ldap/slapd.conf
rename to tests/ldap/slapd.conf
diff --git a/crypto/heimdal/tests/plugin/Makefile.am b/tests/plugin/Makefile.am
similarity index 100%
rename from crypto/heimdal/tests/plugin/Makefile.am
rename to tests/plugin/Makefile.am
diff --git a/crypto/heimdal/tests/plugin/Makefile.in b/tests/plugin/Makefile.in
similarity index 100%
rename from crypto/heimdal/tests/plugin/Makefile.in
rename to tests/plugin/Makefile.in
diff --git a/crypto/heimdal/tests/plugin/check-pac.in b/tests/plugin/check-pac.in
similarity index 100%
rename from crypto/heimdal/tests/plugin/check-pac.in
rename to tests/plugin/check-pac.in
diff --git a/crypto/heimdal/tests/plugin/krb5.conf.in b/tests/plugin/krb5.conf.in
similarity index 100%
rename from crypto/heimdal/tests/plugin/krb5.conf.in
rename to tests/plugin/krb5.conf.in
diff --git a/crypto/heimdal/tests/plugin/windc.c b/tests/plugin/windc.c
similarity index 100%
rename from crypto/heimdal/tests/plugin/windc.c
rename to tests/plugin/windc.c
diff --git a/crypto/heimdal/tools/Makefile.am b/tools/Makefile.am
similarity index 100%
rename from crypto/heimdal/tools/Makefile.am
rename to tools/Makefile.am
diff --git a/crypto/heimdal/tools/Makefile.in b/tools/Makefile.in
similarity index 100%
rename from crypto/heimdal/tools/Makefile.in
rename to tools/Makefile.in
diff --git a/crypto/heimdal/tools/build.sh b/tools/build.sh
similarity index 100%
rename from crypto/heimdal/tools/build.sh
rename to tools/build.sh
diff --git a/crypto/heimdal/tools/heimdal-build.sh b/tools/heimdal-build.sh
similarity index 100%
rename from crypto/heimdal/tools/heimdal-build.sh
rename to tools/heimdal-build.sh
diff --git a/crypto/heimdal/tools/heimdal-gssapi.pc.in b/tools/heimdal-gssapi.pc.in
similarity index 100%
rename from crypto/heimdal/tools/heimdal-gssapi.pc.in
rename to tools/heimdal-gssapi.pc.in
diff --git a/crypto/heimdal/tools/kdc-log-analyze.pl b/tools/kdc-log-analyze.pl
similarity index 100%
rename from crypto/heimdal/tools/kdc-log-analyze.pl
rename to tools/kdc-log-analyze.pl
diff --git a/crypto/heimdal/tools/krb5-config.1 b/tools/krb5-config.1
similarity index 100%
rename from crypto/heimdal/tools/krb5-config.1
rename to tools/krb5-config.1
diff --git a/crypto/heimdal/tools/krb5-config.in b/tools/krb5-config.in
similarity index 100%
rename from crypto/heimdal/tools/krb5-config.in
rename to tools/krb5-config.in