diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc
index 8d0260b895..0974d03a97 100755
--- a/payloads/libpayload/bin/lpgcc
+++ b/payloads/libpayload/bin/lpgcc
@@ -147,7 +147,7 @@ done
 _CFLAGS="$_ARCHEXTRA -nostdinc -nostdlib -I$BASE/../build -I$_INCDIR -I$_ARCHINCDIR -D__LIBPAYLOAD__=1"
 
 if [ "$CONFIG_LP_PDCURSES" = y ]; then
-  _CFLAGS="$_CFLAGS -I$BASE/../curses/PDCurses-3.4"
+  _CFLAGS="$_CFLAGS -I$BASE/../curses/PDCurses"
 fi
 
 if [ "$CONFIG_LP_TINYCURSES" = y ]; then
diff --git a/payloads/libpayload/curses/Makefile.inc b/payloads/libpayload/curses/Makefile.inc
index f7aa51665f..d0ce4743f8 100644
--- a/payloads/libpayload/curses/Makefile.inc
+++ b/payloads/libpayload/curses/Makefile.inc
@@ -38,7 +38,7 @@ libcurses-$(CONFIG_LP_TINYCURSES) += colors.c
 includes-$(CONFIG_LP_TINYCURSES) += curses.h
 
 ifeq ($(CONFIG_LP_PDCURSES),y)
-PDCURSES := PDCurses-3.4
+PDCURSES := PDCurses
 INCLUDES += -D_LP64=0 -Icurses/$(PDCURSES) -Icurses/pdcurses-backend -Icurses/menu -Icurses/form
 endif
 
diff --git a/payloads/libpayload/curses/PDCurses-3.4/HISTORY b/payloads/libpayload/curses/PDCurses/HISTORY
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/HISTORY
rename to payloads/libpayload/curses/PDCurses/HISTORY
diff --git a/payloads/libpayload/curses/PDCurses-3.4/IMPLEMNT b/payloads/libpayload/curses/PDCurses/IMPLEMNT
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/IMPLEMNT
rename to payloads/libpayload/curses/PDCurses/IMPLEMNT
diff --git a/payloads/libpayload/curses/PDCurses-3.4/Makefile.in b/payloads/libpayload/curses/PDCurses/Makefile.in
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/Makefile.in
rename to payloads/libpayload/curses/PDCurses/Makefile.in
diff --git a/payloads/libpayload/curses/PDCurses-3.4/PDCurses.spec b/payloads/libpayload/curses/PDCurses/PDCurses.spec
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/PDCurses.spec
rename to payloads/libpayload/curses/PDCurses/PDCurses.spec
diff --git a/payloads/libpayload/curses/PDCurses-3.4/README b/payloads/libpayload/curses/PDCurses/README
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/README
rename to payloads/libpayload/curses/PDCurses/README
diff --git a/payloads/libpayload/curses/PDCurses-3.4/aclocal.m4 b/payloads/libpayload/curses/PDCurses/aclocal.m4
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/aclocal.m4
rename to payloads/libpayload/curses/PDCurses/aclocal.m4
diff --git a/payloads/libpayload/curses/PDCurses-3.4/config.h.in b/payloads/libpayload/curses/PDCurses/config.h.in
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/config.h.in
rename to payloads/libpayload/curses/PDCurses/config.h.in
diff --git a/payloads/libpayload/curses/PDCurses-3.4/configure.ac b/payloads/libpayload/curses/PDCurses/configure.ac
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/configure.ac
rename to payloads/libpayload/curses/PDCurses/configure.ac
diff --git a/payloads/libpayload/curses/PDCurses-3.4/curses.h b/payloads/libpayload/curses/PDCurses/curses.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/curses.h
rename to payloads/libpayload/curses/PDCurses/curses.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/curspriv.h b/payloads/libpayload/curses/PDCurses/curspriv.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/curspriv.h
rename to payloads/libpayload/curses/PDCurses/curspriv.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/README b/payloads/libpayload/curses/PDCurses/demos/README
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/README
rename to payloads/libpayload/curses/PDCurses/demos/README
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/firework.c b/payloads/libpayload/curses/PDCurses/demos/firework.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/firework.c
rename to payloads/libpayload/curses/PDCurses/demos/firework.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/newdemo.c b/payloads/libpayload/curses/PDCurses/demos/newdemo.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/newdemo.c
rename to payloads/libpayload/curses/PDCurses/demos/newdemo.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/ptest.c b/payloads/libpayload/curses/PDCurses/demos/ptest.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/ptest.c
rename to payloads/libpayload/curses/PDCurses/demos/ptest.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/rain.c b/payloads/libpayload/curses/PDCurses/demos/rain.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/rain.c
rename to payloads/libpayload/curses/PDCurses/demos/rain.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/testcurs.c b/payloads/libpayload/curses/PDCurses/demos/testcurs.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/testcurs.c
rename to payloads/libpayload/curses/PDCurses/demos/testcurs.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/tui.c b/payloads/libpayload/curses/PDCurses/demos/tui.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/tui.c
rename to payloads/libpayload/curses/PDCurses/demos/tui.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/tui.h b/payloads/libpayload/curses/PDCurses/demos/tui.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/tui.h
rename to payloads/libpayload/curses/PDCurses/demos/tui.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/tuidemo.c b/payloads/libpayload/curses/PDCurses/demos/tuidemo.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/tuidemo.c
rename to payloads/libpayload/curses/PDCurses/demos/tuidemo.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/worm.c b/payloads/libpayload/curses/PDCurses/demos/worm.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/worm.c
rename to payloads/libpayload/curses/PDCurses/demos/worm.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/demos/xmas.c b/payloads/libpayload/curses/PDCurses/demos/xmas.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/demos/xmas.c
rename to payloads/libpayload/curses/PDCurses/demos/xmas.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/doc/Makefile b/payloads/libpayload/curses/PDCurses/doc/Makefile
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/doc/Makefile
rename to payloads/libpayload/curses/PDCurses/doc/Makefile
diff --git a/payloads/libpayload/curses/PDCurses-3.4/doc/intro.txt b/payloads/libpayload/curses/PDCurses/doc/intro.txt
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/doc/intro.txt
rename to payloads/libpayload/curses/PDCurses/doc/intro.txt
diff --git a/payloads/libpayload/curses/PDCurses-3.4/doc/manext.c b/payloads/libpayload/curses/PDCurses/doc/manext.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/doc/manext.c
rename to payloads/libpayload/curses/PDCurses/doc/manext.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/doc/sdl.txt b/payloads/libpayload/curses/PDCurses/doc/sdl.txt
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/doc/sdl.txt
rename to payloads/libpayload/curses/PDCurses/doc/sdl.txt
diff --git a/payloads/libpayload/curses/PDCurses-3.4/doc/x11.txt b/payloads/libpayload/curses/PDCurses/doc/x11.txt
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/doc/x11.txt
rename to payloads/libpayload/curses/PDCurses/doc/x11.txt
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/README b/payloads/libpayload/curses/PDCurses/dos/README
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/README
rename to payloads/libpayload/curses/PDCurses/dos/README
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/bccdos.lrf b/payloads/libpayload/curses/PDCurses/dos/bccdos.lrf
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/bccdos.lrf
rename to payloads/libpayload/curses/PDCurses/dos/bccdos.lrf
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/bccdos.mak b/payloads/libpayload/curses/PDCurses/dos/bccdos.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/bccdos.mak
rename to payloads/libpayload/curses/PDCurses/dos/bccdos.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/gccdos.mak b/payloads/libpayload/curses/PDCurses/dos/gccdos.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/gccdos.mak
rename to payloads/libpayload/curses/PDCurses/dos/gccdos.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/mscdos.lrf b/payloads/libpayload/curses/PDCurses/dos/mscdos.lrf
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/mscdos.lrf
rename to payloads/libpayload/curses/PDCurses/dos/mscdos.lrf
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/mscdos.mak b/payloads/libpayload/curses/PDCurses/dos/mscdos.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/mscdos.mak
rename to payloads/libpayload/curses/PDCurses/dos/mscdos.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/pdcclip.c b/payloads/libpayload/curses/PDCurses/dos/pdcclip.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/pdcclip.c
rename to payloads/libpayload/curses/PDCurses/dos/pdcclip.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/pdcdisp.c b/payloads/libpayload/curses/PDCurses/dos/pdcdisp.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/pdcdisp.c
rename to payloads/libpayload/curses/PDCurses/dos/pdcdisp.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/pdcdos.h b/payloads/libpayload/curses/PDCurses/dos/pdcdos.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/pdcdos.h
rename to payloads/libpayload/curses/PDCurses/dos/pdcdos.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/pdcgetsc.c b/payloads/libpayload/curses/PDCurses/dos/pdcgetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/pdcgetsc.c
rename to payloads/libpayload/curses/PDCurses/dos/pdcgetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/pdckbd.c b/payloads/libpayload/curses/PDCurses/dos/pdckbd.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/pdckbd.c
rename to payloads/libpayload/curses/PDCurses/dos/pdckbd.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/pdcscrn.c b/payloads/libpayload/curses/PDCurses/dos/pdcscrn.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/pdcscrn.c
rename to payloads/libpayload/curses/PDCurses/dos/pdcscrn.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/pdcsetsc.c b/payloads/libpayload/curses/PDCurses/dos/pdcsetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/pdcsetsc.c
rename to payloads/libpayload/curses/PDCurses/dos/pdcsetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/pdcutil.c b/payloads/libpayload/curses/PDCurses/dos/pdcutil.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/pdcutil.c
rename to payloads/libpayload/curses/PDCurses/dos/pdcutil.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/wccdos16.mak b/payloads/libpayload/curses/PDCurses/dos/wccdos16.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/wccdos16.mak
rename to payloads/libpayload/curses/PDCurses/dos/wccdos16.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/dos/wccdos4g.mak b/payloads/libpayload/curses/PDCurses/dos/wccdos4g.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/dos/wccdos4g.mak
rename to payloads/libpayload/curses/PDCurses/dos/wccdos4g.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/exp-base.def b/payloads/libpayload/curses/PDCurses/exp-base.def
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/exp-base.def
rename to payloads/libpayload/curses/PDCurses/exp-base.def
diff --git a/payloads/libpayload/curses/PDCurses-3.4/exp-wide.def b/payloads/libpayload/curses/PDCurses/exp-wide.def
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/exp-wide.def
rename to payloads/libpayload/curses/PDCurses/exp-wide.def
diff --git a/payloads/libpayload/curses/PDCurses-3.4/install-sh b/payloads/libpayload/curses/PDCurses/install-sh
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/install-sh
rename to payloads/libpayload/curses/PDCurses/install-sh
diff --git a/payloads/libpayload/curses/PDCurses-3.4/libobjs.mif b/payloads/libpayload/curses/PDCurses/libobjs.mif
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/libobjs.mif
rename to payloads/libpayload/curses/PDCurses/libobjs.mif
diff --git a/payloads/libpayload/curses/PDCurses-3.4/makedist.mif b/payloads/libpayload/curses/PDCurses/makedist.mif
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/makedist.mif
rename to payloads/libpayload/curses/PDCurses/makedist.mif
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/README b/payloads/libpayload/curses/PDCurses/os2/README
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/README
rename to payloads/libpayload/curses/PDCurses/os2/README
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/bccos2.mak b/payloads/libpayload/curses/PDCurses/os2/bccos2.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/bccos2.mak
rename to payloads/libpayload/curses/PDCurses/os2/bccos2.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/gccos2.mak b/payloads/libpayload/curses/PDCurses/os2/gccos2.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/gccos2.mak
rename to payloads/libpayload/curses/PDCurses/os2/gccos2.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/iccos2.lrf b/payloads/libpayload/curses/PDCurses/os2/iccos2.lrf
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/iccos2.lrf
rename to payloads/libpayload/curses/PDCurses/os2/iccos2.lrf
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/iccos2.mak b/payloads/libpayload/curses/PDCurses/os2/iccos2.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/iccos2.mak
rename to payloads/libpayload/curses/PDCurses/os2/iccos2.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/pdcclip.c b/payloads/libpayload/curses/PDCurses/os2/pdcclip.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/pdcclip.c
rename to payloads/libpayload/curses/PDCurses/os2/pdcclip.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/pdcdisp.c b/payloads/libpayload/curses/PDCurses/os2/pdcdisp.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/pdcdisp.c
rename to payloads/libpayload/curses/PDCurses/os2/pdcdisp.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/pdcgetsc.c b/payloads/libpayload/curses/PDCurses/os2/pdcgetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/pdcgetsc.c
rename to payloads/libpayload/curses/PDCurses/os2/pdcgetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/pdckbd.c b/payloads/libpayload/curses/PDCurses/os2/pdckbd.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/pdckbd.c
rename to payloads/libpayload/curses/PDCurses/os2/pdckbd.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/pdcos2.h b/payloads/libpayload/curses/PDCurses/os2/pdcos2.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/pdcos2.h
rename to payloads/libpayload/curses/PDCurses/os2/pdcos2.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/pdcscrn.c b/payloads/libpayload/curses/PDCurses/os2/pdcscrn.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/pdcscrn.c
rename to payloads/libpayload/curses/PDCurses/os2/pdcscrn.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/pdcsetsc.c b/payloads/libpayload/curses/PDCurses/os2/pdcsetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/pdcsetsc.c
rename to payloads/libpayload/curses/PDCurses/os2/pdcsetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/pdcutil.c b/payloads/libpayload/curses/PDCurses/os2/pdcutil.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/pdcutil.c
rename to payloads/libpayload/curses/PDCurses/os2/pdcutil.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/os2/wccos2.mak b/payloads/libpayload/curses/PDCurses/os2/wccos2.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/os2/wccos2.mak
rename to payloads/libpayload/curses/PDCurses/os2/wccos2.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/panel.h b/payloads/libpayload/curses/PDCurses/panel.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/panel.h
rename to payloads/libpayload/curses/PDCurses/panel.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/README b/payloads/libpayload/curses/PDCurses/pdcurses/README
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/README
rename to payloads/libpayload/curses/PDCurses/pdcurses/README
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/addch.c b/payloads/libpayload/curses/PDCurses/pdcurses/addch.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/addch.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/addch.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/addchstr.c b/payloads/libpayload/curses/PDCurses/pdcurses/addchstr.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/addchstr.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/addchstr.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/addstr.c b/payloads/libpayload/curses/PDCurses/pdcurses/addstr.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/addstr.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/addstr.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/attr.c b/payloads/libpayload/curses/PDCurses/pdcurses/attr.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/attr.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/attr.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/beep.c b/payloads/libpayload/curses/PDCurses/pdcurses/beep.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/beep.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/beep.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/bkgd.c b/payloads/libpayload/curses/PDCurses/pdcurses/bkgd.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/bkgd.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/bkgd.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/border.c b/payloads/libpayload/curses/PDCurses/pdcurses/border.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/border.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/border.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/clear.c b/payloads/libpayload/curses/PDCurses/pdcurses/clear.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/clear.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/clear.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/color.c b/payloads/libpayload/curses/PDCurses/pdcurses/color.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/color.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/color.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/debug.c b/payloads/libpayload/curses/PDCurses/pdcurses/debug.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/debug.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/debug.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/delch.c b/payloads/libpayload/curses/PDCurses/pdcurses/delch.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/delch.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/delch.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/deleteln.c b/payloads/libpayload/curses/PDCurses/pdcurses/deleteln.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/deleteln.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/deleteln.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/deprec.c b/payloads/libpayload/curses/PDCurses/pdcurses/deprec.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/deprec.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/deprec.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/getch.c b/payloads/libpayload/curses/PDCurses/pdcurses/getch.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/getch.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/getch.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/getstr.c b/payloads/libpayload/curses/PDCurses/pdcurses/getstr.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/getstr.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/getstr.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/getyx.c b/payloads/libpayload/curses/PDCurses/pdcurses/getyx.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/getyx.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/getyx.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/inch.c b/payloads/libpayload/curses/PDCurses/pdcurses/inch.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/inch.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/inch.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/inchstr.c b/payloads/libpayload/curses/PDCurses/pdcurses/inchstr.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/inchstr.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/inchstr.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/initscr.c b/payloads/libpayload/curses/PDCurses/pdcurses/initscr.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/initscr.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/initscr.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/inopts.c b/payloads/libpayload/curses/PDCurses/pdcurses/inopts.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/inopts.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/inopts.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/insch.c b/payloads/libpayload/curses/PDCurses/pdcurses/insch.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/insch.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/insch.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/insstr.c b/payloads/libpayload/curses/PDCurses/pdcurses/insstr.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/insstr.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/insstr.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/instr.c b/payloads/libpayload/curses/PDCurses/pdcurses/instr.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/instr.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/instr.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/kernel.c b/payloads/libpayload/curses/PDCurses/pdcurses/kernel.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/kernel.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/kernel.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/keyname.c b/payloads/libpayload/curses/PDCurses/pdcurses/keyname.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/keyname.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/keyname.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/mouse.c b/payloads/libpayload/curses/PDCurses/pdcurses/mouse.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/mouse.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/mouse.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/move.c b/payloads/libpayload/curses/PDCurses/pdcurses/move.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/move.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/move.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/outopts.c b/payloads/libpayload/curses/PDCurses/pdcurses/outopts.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/outopts.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/outopts.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/overlay.c b/payloads/libpayload/curses/PDCurses/pdcurses/overlay.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/overlay.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/overlay.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/pad.c b/payloads/libpayload/curses/PDCurses/pdcurses/pad.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/pad.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/pad.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/panel.c b/payloads/libpayload/curses/PDCurses/pdcurses/panel.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/panel.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/panel.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/printw.c b/payloads/libpayload/curses/PDCurses/pdcurses/printw.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/printw.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/printw.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/refresh.c b/payloads/libpayload/curses/PDCurses/pdcurses/refresh.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/refresh.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/refresh.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/scanw.c b/payloads/libpayload/curses/PDCurses/pdcurses/scanw.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/scanw.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/scanw.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/scr_dump.c b/payloads/libpayload/curses/PDCurses/pdcurses/scr_dump.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/scr_dump.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/scr_dump.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/scroll.c b/payloads/libpayload/curses/PDCurses/pdcurses/scroll.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/scroll.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/scroll.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/slk.c b/payloads/libpayload/curses/PDCurses/pdcurses/slk.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/slk.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/slk.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/termattr.c b/payloads/libpayload/curses/PDCurses/pdcurses/termattr.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/termattr.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/termattr.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/terminfo.c b/payloads/libpayload/curses/PDCurses/pdcurses/terminfo.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/terminfo.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/terminfo.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/touch.c b/payloads/libpayload/curses/PDCurses/pdcurses/touch.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/touch.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/touch.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/util.c b/payloads/libpayload/curses/PDCurses/pdcurses/util.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/util.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/util.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/pdcurses/window.c b/payloads/libpayload/curses/PDCurses/pdcurses/window.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/pdcurses/window.c
rename to payloads/libpayload/curses/PDCurses/pdcurses/window.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/Makefile b/payloads/libpayload/curses/PDCurses/sdl1/Makefile
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/Makefile
rename to payloads/libpayload/curses/PDCurses/sdl1/Makefile
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/Makefile.mng b/payloads/libpayload/curses/PDCurses/sdl1/Makefile.mng
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/Makefile.mng
rename to payloads/libpayload/curses/PDCurses/sdl1/Makefile.mng
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/README b/payloads/libpayload/curses/PDCurses/sdl1/README
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/README
rename to payloads/libpayload/curses/PDCurses/sdl1/README
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/deffont.h b/payloads/libpayload/curses/PDCurses/sdl1/deffont.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/deffont.h
rename to payloads/libpayload/curses/PDCurses/sdl1/deffont.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/deficon.h b/payloads/libpayload/curses/PDCurses/sdl1/deficon.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/deficon.h
rename to payloads/libpayload/curses/PDCurses/sdl1/deficon.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcclip.c b/payloads/libpayload/curses/PDCurses/sdl1/pdcclip.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcclip.c
rename to payloads/libpayload/curses/PDCurses/sdl1/pdcclip.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcdisp.c b/payloads/libpayload/curses/PDCurses/sdl1/pdcdisp.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcdisp.c
rename to payloads/libpayload/curses/PDCurses/sdl1/pdcdisp.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcgetsc.c b/payloads/libpayload/curses/PDCurses/sdl1/pdcgetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcgetsc.c
rename to payloads/libpayload/curses/PDCurses/sdl1/pdcgetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/pdckbd.c b/payloads/libpayload/curses/PDCurses/sdl1/pdckbd.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/pdckbd.c
rename to payloads/libpayload/curses/PDCurses/sdl1/pdckbd.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcscrn.c b/payloads/libpayload/curses/PDCurses/sdl1/pdcscrn.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcscrn.c
rename to payloads/libpayload/curses/PDCurses/sdl1/pdcscrn.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcsdl.h b/payloads/libpayload/curses/PDCurses/sdl1/pdcsdl.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcsdl.h
rename to payloads/libpayload/curses/PDCurses/sdl1/pdcsdl.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcsetsc.c b/payloads/libpayload/curses/PDCurses/sdl1/pdcsetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcsetsc.c
rename to payloads/libpayload/curses/PDCurses/sdl1/pdcsetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcutil.c b/payloads/libpayload/curses/PDCurses/sdl1/pdcutil.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/pdcutil.c
rename to payloads/libpayload/curses/PDCurses/sdl1/pdcutil.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/sdl1/sdltest.c b/payloads/libpayload/curses/PDCurses/sdl1/sdltest.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/sdl1/sdltest.c
rename to payloads/libpayload/curses/PDCurses/sdl1/sdltest.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/term.h b/payloads/libpayload/curses/PDCurses/term.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/term.h
rename to payloads/libpayload/curses/PDCurses/term.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/version.mif b/payloads/libpayload/curses/PDCurses/version.mif
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/version.mif
rename to payloads/libpayload/curses/PDCurses/version.mif
diff --git a/payloads/libpayload/curses/PDCurses-3.4/watcom.mif b/payloads/libpayload/curses/PDCurses/watcom.mif
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/watcom.mif
rename to payloads/libpayload/curses/PDCurses/watcom.mif
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/README b/payloads/libpayload/curses/PDCurses/win32/README
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/README
rename to payloads/libpayload/curses/PDCurses/win32/README
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/bccwin32.mak b/payloads/libpayload/curses/PDCurses/win32/bccwin32.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/bccwin32.mak
rename to payloads/libpayload/curses/PDCurses/win32/bccwin32.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/dmcwin32.mak b/payloads/libpayload/curses/PDCurses/win32/dmcwin32.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/dmcwin32.mak
rename to payloads/libpayload/curses/PDCurses/win32/dmcwin32.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/gccwin32.mak b/payloads/libpayload/curses/PDCurses/win32/gccwin32.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/gccwin32.mak
rename to payloads/libpayload/curses/PDCurses/win32/gccwin32.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/lccwin32.mak b/payloads/libpayload/curses/PDCurses/win32/lccwin32.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/lccwin32.mak
rename to payloads/libpayload/curses/PDCurses/win32/lccwin32.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/mingwin32.mak b/payloads/libpayload/curses/PDCurses/win32/mingwin32.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/mingwin32.mak
rename to payloads/libpayload/curses/PDCurses/win32/mingwin32.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdcclip.c b/payloads/libpayload/curses/PDCurses/win32/pdcclip.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdcclip.c
rename to payloads/libpayload/curses/PDCurses/win32/pdcclip.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdcdisp.c b/payloads/libpayload/curses/PDCurses/win32/pdcdisp.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdcdisp.c
rename to payloads/libpayload/curses/PDCurses/win32/pdcdisp.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdcgetsc.c b/payloads/libpayload/curses/PDCurses/win32/pdcgetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdcgetsc.c
rename to payloads/libpayload/curses/PDCurses/win32/pdcgetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdckbd.c b/payloads/libpayload/curses/PDCurses/win32/pdckbd.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdckbd.c
rename to payloads/libpayload/curses/PDCurses/win32/pdckbd.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdcscrn.c b/payloads/libpayload/curses/PDCurses/win32/pdcscrn.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdcscrn.c
rename to payloads/libpayload/curses/PDCurses/win32/pdcscrn.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdcsetsc.c b/payloads/libpayload/curses/PDCurses/win32/pdcsetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdcsetsc.c
rename to payloads/libpayload/curses/PDCurses/win32/pdcsetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdcurses.ico b/payloads/libpayload/curses/PDCurses/win32/pdcurses.ico
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdcurses.ico
rename to payloads/libpayload/curses/PDCurses/win32/pdcurses.ico
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdcurses.rc b/payloads/libpayload/curses/PDCurses/win32/pdcurses.rc
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdcurses.rc
rename to payloads/libpayload/curses/PDCurses/win32/pdcurses.rc
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdcutil.c b/payloads/libpayload/curses/PDCurses/win32/pdcutil.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdcutil.c
rename to payloads/libpayload/curses/PDCurses/win32/pdcutil.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/pdcwin.h b/payloads/libpayload/curses/PDCurses/win32/pdcwin.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/pdcwin.h
rename to payloads/libpayload/curses/PDCurses/win32/pdcwin.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/vcwin32.mak b/payloads/libpayload/curses/PDCurses/win32/vcwin32.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/vcwin32.mak
rename to payloads/libpayload/curses/PDCurses/win32/vcwin32.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/win32/wccwin32.mak b/payloads/libpayload/curses/PDCurses/win32/wccwin32.mak
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/win32/wccwin32.mak
rename to payloads/libpayload/curses/PDCurses/win32/wccwin32.mak
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/Makefile.aix.in b/payloads/libpayload/curses/PDCurses/x11/Makefile.aix.in
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/Makefile.aix.in
rename to payloads/libpayload/curses/PDCurses/x11/Makefile.aix.in
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/Makefile.in b/payloads/libpayload/curses/PDCurses/x11/Makefile.in
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/Makefile.in
rename to payloads/libpayload/curses/PDCurses/x11/Makefile.in
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/README b/payloads/libpayload/curses/PDCurses/x11/README
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/README
rename to payloads/libpayload/curses/PDCurses/x11/README
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/ScrollBox.c b/payloads/libpayload/curses/PDCurses/x11/ScrollBox.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/ScrollBox.c
rename to payloads/libpayload/curses/PDCurses/x11/ScrollBox.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/ScrollBox.h b/payloads/libpayload/curses/PDCurses/x11/ScrollBox.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/ScrollBox.h
rename to payloads/libpayload/curses/PDCurses/x11/ScrollBox.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/ScrollBoxP.h b/payloads/libpayload/curses/PDCurses/x11/ScrollBoxP.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/ScrollBoxP.h
rename to payloads/libpayload/curses/PDCurses/x11/ScrollBoxP.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/big_icon.xbm b/payloads/libpayload/curses/PDCurses/x11/big_icon.xbm
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/big_icon.xbm
rename to payloads/libpayload/curses/PDCurses/x11/big_icon.xbm
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/compose.h b/payloads/libpayload/curses/PDCurses/x11/compose.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/compose.h
rename to payloads/libpayload/curses/PDCurses/x11/compose.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/little_icon.xbm b/payloads/libpayload/curses/PDCurses/x11/little_icon.xbm
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/little_icon.xbm
rename to payloads/libpayload/curses/PDCurses/x11/little_icon.xbm
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/ncurses_cfg.h b/payloads/libpayload/curses/PDCurses/x11/ncurses_cfg.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/ncurses_cfg.h
rename to payloads/libpayload/curses/PDCurses/x11/ncurses_cfg.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/pdcclip.c b/payloads/libpayload/curses/PDCurses/x11/pdcclip.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/pdcclip.c
rename to payloads/libpayload/curses/PDCurses/x11/pdcclip.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/pdcdisp.c b/payloads/libpayload/curses/PDCurses/x11/pdcdisp.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/pdcdisp.c
rename to payloads/libpayload/curses/PDCurses/x11/pdcdisp.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/pdcgetsc.c b/payloads/libpayload/curses/PDCurses/x11/pdcgetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/pdcgetsc.c
rename to payloads/libpayload/curses/PDCurses/x11/pdcgetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/pdckbd.c b/payloads/libpayload/curses/PDCurses/x11/pdckbd.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/pdckbd.c
rename to payloads/libpayload/curses/PDCurses/x11/pdckbd.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/pdcscrn.c b/payloads/libpayload/curses/PDCurses/x11/pdcscrn.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/pdcscrn.c
rename to payloads/libpayload/curses/PDCurses/x11/pdcscrn.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/pdcsetsc.c b/payloads/libpayload/curses/PDCurses/x11/pdcsetsc.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/pdcsetsc.c
rename to payloads/libpayload/curses/PDCurses/x11/pdcsetsc.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/pdcutil.c b/payloads/libpayload/curses/PDCurses/x11/pdcutil.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/pdcutil.c
rename to payloads/libpayload/curses/PDCurses/x11/pdcutil.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/pdcx11.c b/payloads/libpayload/curses/PDCurses/x11/pdcx11.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/pdcx11.c
rename to payloads/libpayload/curses/PDCurses/x11/pdcx11.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/pdcx11.h b/payloads/libpayload/curses/PDCurses/x11/pdcx11.h
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/pdcx11.h
rename to payloads/libpayload/curses/PDCurses/x11/pdcx11.h
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/sb.c b/payloads/libpayload/curses/PDCurses/x11/sb.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/sb.c
rename to payloads/libpayload/curses/PDCurses/x11/sb.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/x11.c b/payloads/libpayload/curses/PDCurses/x11/x11.c
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/x11.c
rename to payloads/libpayload/curses/PDCurses/x11/x11.c
diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/xcurses-config.in b/payloads/libpayload/curses/PDCurses/x11/xcurses-config.in
similarity index 100%
rename from payloads/libpayload/curses/PDCurses-3.4/x11/xcurses-config.in
rename to payloads/libpayload/curses/PDCurses/x11/xcurses-config.in