diff --git a/contrib/lukemftp/COPYING b/COPYING
similarity index 100%
rename from contrib/lukemftp/COPYING
rename to COPYING
diff --git a/contrib/lukemftp/ChangeLog b/ChangeLog
similarity index 100%
rename from contrib/lukemftp/ChangeLog
rename to ChangeLog
diff --git a/contrib/lukemftp/FreeBSD-patchset b/FreeBSD-patchset
similarity index 100%
rename from contrib/lukemftp/FreeBSD-patchset
rename to FreeBSD-patchset
diff --git a/contrib/lukemftp/INSTALL b/INSTALL
similarity index 100%
rename from contrib/lukemftp/INSTALL
rename to INSTALL
diff --git a/contrib/lukemftp/Makefile.in b/Makefile.in
similarity index 100%
rename from contrib/lukemftp/Makefile.in
rename to Makefile.in
diff --git a/contrib/lukemftp/NEWS b/NEWS
similarity index 100%
rename from contrib/lukemftp/NEWS
rename to NEWS
diff --git a/contrib/lukemftp/README b/README
similarity index 100%
rename from contrib/lukemftp/README
rename to README
diff --git a/contrib/lukemftp/THANKS b/THANKS
similarity index 100%
rename from contrib/lukemftp/THANKS
rename to THANKS
diff --git a/contrib/lukemftp/acconfig.h b/acconfig.h
similarity index 100%
rename from contrib/lukemftp/acconfig.h
rename to acconfig.h
diff --git a/contrib/lukemftp/aclocal.m4 b/aclocal.m4
similarity index 100%
rename from contrib/lukemftp/aclocal.m4
rename to aclocal.m4
diff --git a/contrib/lukemftp/config.h.in b/config.h.in
similarity index 100%
rename from contrib/lukemftp/config.h.in
rename to config.h.in
diff --git a/contrib/lukemftp/configure b/configure
similarity index 100%
rename from contrib/lukemftp/configure
rename to configure
diff --git a/contrib/lukemftp/configure.in b/configure.in
similarity index 100%
rename from contrib/lukemftp/configure.in
rename to configure.in
diff --git a/contrib/lukemftp/diffout b/diffout
similarity index 100%
rename from contrib/lukemftp/diffout
rename to diffout
diff --git a/contrib/lukemftp/install-sh b/install-sh
similarity index 100%
rename from contrib/lukemftp/install-sh
rename to install-sh
diff --git a/contrib/lukemftp/lukemftp.h b/lukemftp.h
similarity index 100%
rename from contrib/lukemftp/lukemftp.h
rename to lukemftp.h
diff --git a/contrib/lukemftp/src/Makefile b/src/Makefile
similarity index 100%
rename from contrib/lukemftp/src/Makefile
rename to src/Makefile
diff --git a/contrib/lukemftp/src/Makefile.in b/src/Makefile.in
similarity index 100%
rename from contrib/lukemftp/src/Makefile.in
rename to src/Makefile.in
diff --git a/contrib/lukemftp/src/cmds.c b/src/cmds.c
similarity index 100%
rename from contrib/lukemftp/src/cmds.c
rename to src/cmds.c
diff --git a/contrib/lukemftp/src/cmdtab.c b/src/cmdtab.c
similarity index 100%
rename from contrib/lukemftp/src/cmdtab.c
rename to src/cmdtab.c
diff --git a/contrib/lukemftp/src/complete.c b/src/complete.c
similarity index 100%
rename from contrib/lukemftp/src/complete.c
rename to src/complete.c
diff --git a/contrib/lukemftp/src/domacro.c b/src/domacro.c
similarity index 100%
rename from contrib/lukemftp/src/domacro.c
rename to src/domacro.c
diff --git a/contrib/lukemftp/src/extern.h b/src/extern.h
similarity index 100%
rename from contrib/lukemftp/src/extern.h
rename to src/extern.h
diff --git a/contrib/lukemftp/src/fetch.c b/src/fetch.c
similarity index 100%
rename from contrib/lukemftp/src/fetch.c
rename to src/fetch.c
diff --git a/contrib/lukemftp/src/ftp.1 b/src/ftp.1
similarity index 100%
rename from contrib/lukemftp/src/ftp.1
rename to src/ftp.1
diff --git a/contrib/lukemftp/src/ftp.c b/src/ftp.c
similarity index 100%
rename from contrib/lukemftp/src/ftp.c
rename to src/ftp.c
diff --git a/contrib/lukemftp/src/ftp.cat1 b/src/ftp.cat1
similarity index 100%
rename from contrib/lukemftp/src/ftp.cat1
rename to src/ftp.cat1
diff --git a/contrib/lukemftp/src/ftp_var.h b/src/ftp_var.h
similarity index 100%
rename from contrib/lukemftp/src/ftp_var.h
rename to src/ftp_var.h
diff --git a/contrib/lukemftp/src/main.c b/src/main.c
similarity index 100%
rename from contrib/lukemftp/src/main.c
rename to src/main.c
diff --git a/contrib/lukemftp/src/progressbar.c b/src/progressbar.c
similarity index 100%
rename from contrib/lukemftp/src/progressbar.c
rename to src/progressbar.c
diff --git a/contrib/lukemftp/src/progressbar.h b/src/progressbar.h
similarity index 100%
rename from contrib/lukemftp/src/progressbar.h
rename to src/progressbar.h
diff --git a/contrib/lukemftp/src/ruserpass.c b/src/ruserpass.c
similarity index 100%
rename from contrib/lukemftp/src/ruserpass.c
rename to src/ruserpass.c
diff --git a/contrib/lukemftp/src/util.c b/src/util.c
similarity index 100%
rename from contrib/lukemftp/src/util.c
rename to src/util.c
diff --git a/contrib/lukemftp/src/version.h b/src/version.h
similarity index 100%
rename from contrib/lukemftp/src/version.h
rename to src/version.h
diff --git a/contrib/lukemftp/todo b/todo
similarity index 100%
rename from contrib/lukemftp/todo
rename to todo