diff --git a/reactos/base/applications/tsclient/rdesktop/current/COPYING b/reactos/base/applications/tsclient/current/COPYING
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/COPYING
rename to reactos/base/applications/tsclient/current/COPYING
diff --git a/reactos/base/applications/tsclient/rdesktop/current/Makefile.in b/reactos/base/applications/tsclient/current/Makefile.in
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/Makefile.in
rename to reactos/base/applications/tsclient/current/Makefile.in
diff --git a/reactos/base/applications/tsclient/rdesktop/current/README b/reactos/base/applications/tsclient/current/README
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/README
rename to reactos/base/applications/tsclient/current/README
diff --git a/reactos/base/applications/tsclient/rdesktop/current/bitmap.c b/reactos/base/applications/tsclient/current/bitmap.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/bitmap.c
rename to reactos/base/applications/tsclient/current/bitmap.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/bootstrap b/reactos/base/applications/tsclient/current/bootstrap
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/bootstrap
rename to reactos/base/applications/tsclient/current/bootstrap
diff --git a/reactos/base/applications/tsclient/rdesktop/current/cache.c b/reactos/base/applications/tsclient/current/cache.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/cache.c
rename to reactos/base/applications/tsclient/current/cache.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/channels.c b/reactos/base/applications/tsclient/current/channels.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/channels.c
rename to reactos/base/applications/tsclient/current/channels.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/cliprdr.c b/reactos/base/applications/tsclient/current/cliprdr.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/cliprdr.c
rename to reactos/base/applications/tsclient/current/cliprdr.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/config.guess b/reactos/base/applications/tsclient/current/config.guess
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/config.guess
rename to reactos/base/applications/tsclient/current/config.guess
diff --git a/reactos/base/applications/tsclient/rdesktop/current/config.sub b/reactos/base/applications/tsclient/current/config.sub
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/config.sub
rename to reactos/base/applications/tsclient/current/config.sub
diff --git a/reactos/base/applications/tsclient/rdesktop/current/configure.ac b/reactos/base/applications/tsclient/current/configure.ac
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/configure.ac
rename to reactos/base/applications/tsclient/current/configure.ac
diff --git a/reactos/base/applications/tsclient/rdesktop/current/constants.h b/reactos/base/applications/tsclient/current/constants.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/constants.h
rename to reactos/base/applications/tsclient/current/constants.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/disk.c b/reactos/base/applications/tsclient/current/disk.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/disk.c
rename to reactos/base/applications/tsclient/current/disk.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/disk.h b/reactos/base/applications/tsclient/current/disk.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/disk.h
rename to reactos/base/applications/tsclient/current/disk.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/AUTHORS b/reactos/base/applications/tsclient/current/doc/AUTHORS
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/AUTHORS
rename to reactos/base/applications/tsclient/current/doc/AUTHORS
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/ChangeLog b/reactos/base/applications/tsclient/current/doc/ChangeLog
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/ChangeLog
rename to reactos/base/applications/tsclient/current/doc/ChangeLog
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/HACKING b/reactos/base/applications/tsclient/current/doc/HACKING
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/HACKING
rename to reactos/base/applications/tsclient/current/doc/HACKING
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/TODO b/reactos/base/applications/tsclient/current/doc/TODO
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/TODO
rename to reactos/base/applications/tsclient/current/doc/TODO
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/ipv6.txt b/reactos/base/applications/tsclient/current/doc/ipv6.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/ipv6.txt
rename to reactos/base/applications/tsclient/current/doc/ipv6.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/keymap-names.txt b/reactos/base/applications/tsclient/current/doc/keymap-names.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/keymap-names.txt
rename to reactos/base/applications/tsclient/current/doc/keymap-names.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/keymapping.txt b/reactos/base/applications/tsclient/current/doc/keymapping.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/keymapping.txt
rename to reactos/base/applications/tsclient/current/doc/keymapping.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/keynums.png b/reactos/base/applications/tsclient/current/doc/keynums.png
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/keynums.png
rename to reactos/base/applications/tsclient/current/doc/keynums.png
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/licensing.txt b/reactos/base/applications/tsclient/current/doc/licensing.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/licensing.txt
rename to reactos/base/applications/tsclient/current/doc/licensing.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/lspci-channel.txt b/reactos/base/applications/tsclient/current/doc/lspci-channel.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/lspci-channel.txt
rename to reactos/base/applications/tsclient/current/doc/lspci-channel.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/patches.txt b/reactos/base/applications/tsclient/current/doc/patches.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/patches.txt
rename to reactos/base/applications/tsclient/current/doc/patches.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/rdesktop.1 b/reactos/base/applications/tsclient/current/doc/rdesktop.1
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/rdesktop.1
rename to reactos/base/applications/tsclient/current/doc/rdesktop.1
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/redirection.txt b/reactos/base/applications/tsclient/current/doc/redirection.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/redirection.txt
rename to reactos/base/applications/tsclient/current/doc/redirection.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/doc/seamlessrdp-channel.txt b/reactos/base/applications/tsclient/current/doc/seamlessrdp-channel.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/doc/seamlessrdp-channel.txt
rename to reactos/base/applications/tsclient/current/doc/seamlessrdp-channel.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/ewmhints.c b/reactos/base/applications/tsclient/current/ewmhints.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/ewmhints.c
rename to reactos/base/applications/tsclient/current/ewmhints.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/indent-all.sh b/reactos/base/applications/tsclient/current/indent-all.sh
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/indent-all.sh
rename to reactos/base/applications/tsclient/current/indent-all.sh
diff --git a/reactos/base/applications/tsclient/rdesktop/current/install-sh b/reactos/base/applications/tsclient/current/install-sh
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/install-sh
rename to reactos/base/applications/tsclient/current/install-sh
diff --git a/reactos/base/applications/tsclient/rdesktop/current/iso.c b/reactos/base/applications/tsclient/current/iso.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/iso.c
rename to reactos/base/applications/tsclient/current/iso.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/ar b/reactos/base/applications/tsclient/current/keymaps/ar
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/ar
rename to reactos/base/applications/tsclient/current/keymaps/ar
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/common b/reactos/base/applications/tsclient/current/keymaps/common
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/common
rename to reactos/base/applications/tsclient/current/keymaps/common
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/convert-map b/reactos/base/applications/tsclient/current/keymaps/convert-map
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/convert-map
rename to reactos/base/applications/tsclient/current/keymaps/convert-map
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/cs b/reactos/base/applications/tsclient/current/keymaps/cs
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/cs
rename to reactos/base/applications/tsclient/current/keymaps/cs
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/da b/reactos/base/applications/tsclient/current/keymaps/da
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/da
rename to reactos/base/applications/tsclient/current/keymaps/da
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/de b/reactos/base/applications/tsclient/current/keymaps/de
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/de
rename to reactos/base/applications/tsclient/current/keymaps/de
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/de-ch b/reactos/base/applications/tsclient/current/keymaps/de-ch
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/de-ch
rename to reactos/base/applications/tsclient/current/keymaps/de-ch
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/en-dv b/reactos/base/applications/tsclient/current/keymaps/en-dv
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/en-dv
rename to reactos/base/applications/tsclient/current/keymaps/en-dv
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/en-gb b/reactos/base/applications/tsclient/current/keymaps/en-gb
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/en-gb
rename to reactos/base/applications/tsclient/current/keymaps/en-gb
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/en-us b/reactos/base/applications/tsclient/current/keymaps/en-us
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/en-us
rename to reactos/base/applications/tsclient/current/keymaps/en-us
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/es b/reactos/base/applications/tsclient/current/keymaps/es
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/es
rename to reactos/base/applications/tsclient/current/keymaps/es
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/et b/reactos/base/applications/tsclient/current/keymaps/et
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/et
rename to reactos/base/applications/tsclient/current/keymaps/et
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/fi b/reactos/base/applications/tsclient/current/keymaps/fi
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/fi
rename to reactos/base/applications/tsclient/current/keymaps/fi
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/fo b/reactos/base/applications/tsclient/current/keymaps/fo
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/fo
rename to reactos/base/applications/tsclient/current/keymaps/fo
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/fr b/reactos/base/applications/tsclient/current/keymaps/fr
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/fr
rename to reactos/base/applications/tsclient/current/keymaps/fr
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/fr-be b/reactos/base/applications/tsclient/current/keymaps/fr-be
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/fr-be
rename to reactos/base/applications/tsclient/current/keymaps/fr-be
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/fr-ca b/reactos/base/applications/tsclient/current/keymaps/fr-ca
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/fr-ca
rename to reactos/base/applications/tsclient/current/keymaps/fr-ca
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/fr-ch b/reactos/base/applications/tsclient/current/keymaps/fr-ch
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/fr-ch
rename to reactos/base/applications/tsclient/current/keymaps/fr-ch
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/he b/reactos/base/applications/tsclient/current/keymaps/he
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/he
rename to reactos/base/applications/tsclient/current/keymaps/he
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/hr b/reactos/base/applications/tsclient/current/keymaps/hr
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/hr
rename to reactos/base/applications/tsclient/current/keymaps/hr
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/hu b/reactos/base/applications/tsclient/current/keymaps/hu
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/hu
rename to reactos/base/applications/tsclient/current/keymaps/hu
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/is b/reactos/base/applications/tsclient/current/keymaps/is
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/is
rename to reactos/base/applications/tsclient/current/keymaps/is
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/it b/reactos/base/applications/tsclient/current/keymaps/it
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/it
rename to reactos/base/applications/tsclient/current/keymaps/it
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/ja b/reactos/base/applications/tsclient/current/keymaps/ja
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/ja
rename to reactos/base/applications/tsclient/current/keymaps/ja
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/ko b/reactos/base/applications/tsclient/current/keymaps/ko
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/ko
rename to reactos/base/applications/tsclient/current/keymaps/ko
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/lt b/reactos/base/applications/tsclient/current/keymaps/lt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/lt
rename to reactos/base/applications/tsclient/current/keymaps/lt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/lv b/reactos/base/applications/tsclient/current/keymaps/lv
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/lv
rename to reactos/base/applications/tsclient/current/keymaps/lv
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/mk b/reactos/base/applications/tsclient/current/keymaps/mk
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/mk
rename to reactos/base/applications/tsclient/current/keymaps/mk
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/modifiers b/reactos/base/applications/tsclient/current/keymaps/modifiers
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/modifiers
rename to reactos/base/applications/tsclient/current/keymaps/modifiers
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/nl b/reactos/base/applications/tsclient/current/keymaps/nl
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/nl
rename to reactos/base/applications/tsclient/current/keymaps/nl
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/nl-be b/reactos/base/applications/tsclient/current/keymaps/nl-be
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/nl-be
rename to reactos/base/applications/tsclient/current/keymaps/nl-be
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/no b/reactos/base/applications/tsclient/current/keymaps/no
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/no
rename to reactos/base/applications/tsclient/current/keymaps/no
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/pl b/reactos/base/applications/tsclient/current/keymaps/pl
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/pl
rename to reactos/base/applications/tsclient/current/keymaps/pl
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/pt b/reactos/base/applications/tsclient/current/keymaps/pt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/pt
rename to reactos/base/applications/tsclient/current/keymaps/pt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/pt-br b/reactos/base/applications/tsclient/current/keymaps/pt-br
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/pt-br
rename to reactos/base/applications/tsclient/current/keymaps/pt-br
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/ru b/reactos/base/applications/tsclient/current/keymaps/ru
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/ru
rename to reactos/base/applications/tsclient/current/keymaps/ru
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/sl b/reactos/base/applications/tsclient/current/keymaps/sl
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/sl
rename to reactos/base/applications/tsclient/current/keymaps/sl
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/sv b/reactos/base/applications/tsclient/current/keymaps/sv
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/sv
rename to reactos/base/applications/tsclient/current/keymaps/sv
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/th b/reactos/base/applications/tsclient/current/keymaps/th
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/th
rename to reactos/base/applications/tsclient/current/keymaps/th
diff --git a/reactos/base/applications/tsclient/rdesktop/current/keymaps/tr b/reactos/base/applications/tsclient/current/keymaps/tr
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/keymaps/tr
rename to reactos/base/applications/tsclient/current/keymaps/tr
diff --git a/reactos/base/applications/tsclient/rdesktop/current/licence.c b/reactos/base/applications/tsclient/current/licence.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/licence.c
rename to reactos/base/applications/tsclient/current/licence.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/lspci.c b/reactos/base/applications/tsclient/current/lspci.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/lspci.c
rename to reactos/base/applications/tsclient/current/lspci.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/mcs.c b/reactos/base/applications/tsclient/current/mcs.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/mcs.c
rename to reactos/base/applications/tsclient/current/mcs.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/mppc.c b/reactos/base/applications/tsclient/current/mppc.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/mppc.c
rename to reactos/base/applications/tsclient/current/mppc.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/orders.c b/reactos/base/applications/tsclient/current/orders.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/orders.c
rename to reactos/base/applications/tsclient/current/orders.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/orders.h b/reactos/base/applications/tsclient/current/orders.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/orders.h
rename to reactos/base/applications/tsclient/current/orders.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/parallel.c b/reactos/base/applications/tsclient/current/parallel.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/parallel.c
rename to reactos/base/applications/tsclient/current/parallel.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/parse.h b/reactos/base/applications/tsclient/current/parse.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/parse.h
rename to reactos/base/applications/tsclient/current/parse.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/printer.c b/reactos/base/applications/tsclient/current/printer.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/printer.c
rename to reactos/base/applications/tsclient/current/printer.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/printercache.c b/reactos/base/applications/tsclient/current/printercache.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/printercache.c
rename to reactos/base/applications/tsclient/current/printercache.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/proto.h b/reactos/base/applications/tsclient/current/proto.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/proto.h
rename to reactos/base/applications/tsclient/current/proto.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/proto.head b/reactos/base/applications/tsclient/current/proto.head
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/proto.head
rename to reactos/base/applications/tsclient/current/proto.head
diff --git a/reactos/base/applications/tsclient/rdesktop/current/proto.tail b/reactos/base/applications/tsclient/current/proto.tail
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/proto.tail
rename to reactos/base/applications/tsclient/current/proto.tail
diff --git a/reactos/base/applications/tsclient/rdesktop/current/pstcache.c b/reactos/base/applications/tsclient/current/pstcache.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/pstcache.c
rename to reactos/base/applications/tsclient/current/pstcache.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdesktop.c b/reactos/base/applications/tsclient/current/rdesktop.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdesktop.c
rename to reactos/base/applications/tsclient/current/rdesktop.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdesktop.h b/reactos/base/applications/tsclient/current/rdesktop.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdesktop.h
rename to reactos/base/applications/tsclient/current/rdesktop.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdesktop.spec b/reactos/base/applications/tsclient/current/rdesktop.spec
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdesktop.spec
rename to reactos/base/applications/tsclient/current/rdesktop.spec
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdp.c b/reactos/base/applications/tsclient/current/rdp.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdp.c
rename to reactos/base/applications/tsclient/current/rdp.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdp5.c b/reactos/base/applications/tsclient/current/rdp5.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdp5.c
rename to reactos/base/applications/tsclient/current/rdp5.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdpdr.c b/reactos/base/applications/tsclient/current/rdpdr.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdpdr.c
rename to reactos/base/applications/tsclient/current/rdpdr.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdpsnd.c b/reactos/base/applications/tsclient/current/rdpsnd.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdpsnd.c
rename to reactos/base/applications/tsclient/current/rdpsnd.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdpsnd_libao.c b/reactos/base/applications/tsclient/current/rdpsnd_libao.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdpsnd_libao.c
rename to reactos/base/applications/tsclient/current/rdpsnd_libao.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdpsnd_oss.c b/reactos/base/applications/tsclient/current/rdpsnd_oss.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdpsnd_oss.c
rename to reactos/base/applications/tsclient/current/rdpsnd_oss.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdpsnd_sgi.c b/reactos/base/applications/tsclient/current/rdpsnd_sgi.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdpsnd_sgi.c
rename to reactos/base/applications/tsclient/current/rdpsnd_sgi.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/rdpsnd_sun.c b/reactos/base/applications/tsclient/current/rdpsnd_sun.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/rdpsnd_sun.c
rename to reactos/base/applications/tsclient/current/rdpsnd_sun.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/scancodes.h b/reactos/base/applications/tsclient/current/scancodes.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/scancodes.h
rename to reactos/base/applications/tsclient/current/scancodes.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/seamless.c b/reactos/base/applications/tsclient/current/seamless.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/seamless.c
rename to reactos/base/applications/tsclient/current/seamless.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/seamless.h b/reactos/base/applications/tsclient/current/seamless.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/seamless.h
rename to reactos/base/applications/tsclient/current/seamless.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/secure.c b/reactos/base/applications/tsclient/current/secure.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/secure.c
rename to reactos/base/applications/tsclient/current/secure.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/serial.c b/reactos/base/applications/tsclient/current/serial.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/serial.c
rename to reactos/base/applications/tsclient/current/serial.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/tcp.c b/reactos/base/applications/tsclient/current/tcp.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/tcp.c
rename to reactos/base/applications/tsclient/current/tcp.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/types.h b/reactos/base/applications/tsclient/current/types.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/types.h
rename to reactos/base/applications/tsclient/current/types.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_nanox b/reactos/base/applications/tsclient/current/uiports/makefile_nanox
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_nanox
rename to reactos/base/applications/tsclient/current/uiports/makefile_nanox
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_qt b/reactos/base/applications/tsclient/current/uiports/makefile_qt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_qt
rename to reactos/base/applications/tsclient/current/uiports/makefile_qt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_qte b/reactos/base/applications/tsclient/current/uiports/makefile_qte
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_qte
rename to reactos/base/applications/tsclient/current/uiports/makefile_qte
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_svga b/reactos/base/applications/tsclient/current/uiports/makefile_svga
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_svga
rename to reactos/base/applications/tsclient/current/uiports/makefile_svga
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_xxx b/reactos/base/applications/tsclient/current/uiports/makefile_xxx
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/makefile_xxx
rename to reactos/base/applications/tsclient/current/uiports/makefile_xxx
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/nanoxreadme.txt b/reactos/base/applications/tsclient/current/uiports/nanoxreadme.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/nanoxreadme.txt
rename to reactos/base/applications/tsclient/current/uiports/nanoxreadme.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/nanoxwin.c b/reactos/base/applications/tsclient/current/uiports/nanoxwin.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/nanoxwin.c
rename to reactos/base/applications/tsclient/current/uiports/nanoxwin.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/qtereadme.txt b/reactos/base/applications/tsclient/current/uiports/qtereadme.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/qtereadme.txt
rename to reactos/base/applications/tsclient/current/uiports/qtereadme.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/qtewin.cpp b/reactos/base/applications/tsclient/current/uiports/qtewin.cpp
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/qtewin.cpp
rename to reactos/base/applications/tsclient/current/uiports/qtewin.cpp
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/qtewin.h b/reactos/base/applications/tsclient/current/uiports/qtewin.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/qtewin.h
rename to reactos/base/applications/tsclient/current/uiports/qtewin.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/qtreadme.txt b/reactos/base/applications/tsclient/current/uiports/qtreadme.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/qtreadme.txt
rename to reactos/base/applications/tsclient/current/uiports/qtreadme.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/qtwin.cpp b/reactos/base/applications/tsclient/current/uiports/qtwin.cpp
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/qtwin.cpp
rename to reactos/base/applications/tsclient/current/uiports/qtwin.cpp
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/qtwin.h b/reactos/base/applications/tsclient/current/uiports/qtwin.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/qtwin.h
rename to reactos/base/applications/tsclient/current/uiports/qtwin.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/readme.txt b/reactos/base/applications/tsclient/current/uiports/readme.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/readme.txt
rename to reactos/base/applications/tsclient/current/uiports/readme.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/svgareadme.txt b/reactos/base/applications/tsclient/current/uiports/svgareadme.txt
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/svgareadme.txt
rename to reactos/base/applications/tsclient/current/uiports/svgareadme.txt
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/svgawin.c b/reactos/base/applications/tsclient/current/uiports/svgawin.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/svgawin.c
rename to reactos/base/applications/tsclient/current/uiports/svgawin.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/uiports/xxxwin.c b/reactos/base/applications/tsclient/current/uiports/xxxwin.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/uiports/xxxwin.c
rename to reactos/base/applications/tsclient/current/uiports/xxxwin.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/vnc/vnc.c b/reactos/base/applications/tsclient/current/vnc/vnc.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/vnc/vnc.c
rename to reactos/base/applications/tsclient/current/vnc/vnc.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/vnc/vnc.h b/reactos/base/applications/tsclient/current/vnc/vnc.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/vnc/vnc.h
rename to reactos/base/applications/tsclient/current/vnc/vnc.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/vnc/x11stubs.c b/reactos/base/applications/tsclient/current/vnc/x11stubs.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/vnc/x11stubs.c
rename to reactos/base/applications/tsclient/current/vnc/x11stubs.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/vnc/x11stubs.h b/reactos/base/applications/tsclient/current/vnc/x11stubs.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/vnc/x11stubs.h
rename to reactos/base/applications/tsclient/current/vnc/x11stubs.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/xclip.c b/reactos/base/applications/tsclient/current/xclip.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/xclip.c
rename to reactos/base/applications/tsclient/current/xclip.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/xkeymap.c b/reactos/base/applications/tsclient/current/xkeymap.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/xkeymap.c
rename to reactos/base/applications/tsclient/current/xkeymap.c
diff --git a/reactos/base/applications/tsclient/rdesktop/current/xproto.h b/reactos/base/applications/tsclient/current/xproto.h
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/xproto.h
rename to reactos/base/applications/tsclient/current/xproto.h
diff --git a/reactos/base/applications/tsclient/rdesktop/current/xwin.c b/reactos/base/applications/tsclient/current/xwin.c
similarity index 100%
rename from reactos/base/applications/tsclient/rdesktop/current/xwin.c
rename to reactos/base/applications/tsclient/current/xwin.c