diff --git a/guacamole/native/proxy/.gitignore b/guacamole/native/guacd/.gitignore
similarity index 100%
rename from guacamole/native/proxy/.gitignore
rename to guacamole/native/guacd/.gitignore
diff --git a/guacamole/native/proxy-clients/vnc/AUTHORS b/guacamole/native/guacd/AUTHORS
similarity index 100%
rename from guacamole/native/proxy-clients/vnc/AUTHORS
rename to guacamole/native/guacd/AUTHORS
diff --git a/guacamole/native/proxy-clients/vnc/COPYING b/guacamole/native/guacd/COPYING
similarity index 100%
rename from guacamole/native/proxy-clients/vnc/COPYING
rename to guacamole/native/guacd/COPYING
diff --git a/guacamole/native/proxy-clients/vnc/ChangeLog b/guacamole/native/guacd/ChangeLog
similarity index 100%
rename from guacamole/native/proxy-clients/vnc/ChangeLog
rename to guacamole/native/guacd/ChangeLog
diff --git a/guacamole/native/proxy-clients/vnc/INSTALL b/guacamole/native/guacd/INSTALL
similarity index 100%
rename from guacamole/native/proxy-clients/vnc/INSTALL
rename to guacamole/native/guacd/INSTALL
diff --git a/guacamole/native/proxy/Makefile.am b/guacamole/native/guacd/Makefile.am
similarity index 100%
rename from guacamole/native/proxy/Makefile.am
rename to guacamole/native/guacd/Makefile.am
diff --git a/guacamole/native/proxy-clients/vnc/NEWS b/guacamole/native/guacd/NEWS
similarity index 100%
rename from guacamole/native/proxy-clients/vnc/NEWS
rename to guacamole/native/guacd/NEWS
diff --git a/guacamole/native/proxy-clients/vnc/README b/guacamole/native/guacd/README
similarity index 100%
rename from guacamole/native/proxy-clients/vnc/README
rename to guacamole/native/guacd/README
diff --git a/guacamole/native/proxy/configure.in b/guacamole/native/guacd/configure.in
similarity index 100%
rename from guacamole/native/proxy/configure.in
rename to guacamole/native/guacd/configure.in
diff --git a/guacamole/native/proxy/src/daemon.c b/guacamole/native/guacd/src/daemon.c
similarity index 100%
rename from guacamole/native/proxy/src/daemon.c
rename to guacamole/native/guacd/src/daemon.c
diff --git a/guacamole/native/proxy/AUTHORS b/guacamole/native/libguac-clients/vnc/AUTHORS
similarity index 100%
rename from guacamole/native/proxy/AUTHORS
rename to guacamole/native/libguac-clients/vnc/AUTHORS
diff --git a/guacamole/native/proxy/COPYING b/guacamole/native/libguac-clients/vnc/COPYING
similarity index 100%
rename from guacamole/native/proxy/COPYING
rename to guacamole/native/libguac-clients/vnc/COPYING
diff --git a/guacamole/native/proxy/ChangeLog b/guacamole/native/libguac-clients/vnc/ChangeLog
similarity index 100%
rename from guacamole/native/proxy/ChangeLog
rename to guacamole/native/libguac-clients/vnc/ChangeLog
diff --git a/guacamole/native/proxy/INSTALL b/guacamole/native/libguac-clients/vnc/INSTALL
similarity index 100%
rename from guacamole/native/proxy/INSTALL
rename to guacamole/native/libguac-clients/vnc/INSTALL
diff --git a/guacamole/native/proxy-clients/vnc/Makefile.am b/guacamole/native/libguac-clients/vnc/Makefile.am
similarity index 100%
rename from guacamole/native/proxy-clients/vnc/Makefile.am
rename to guacamole/native/libguac-clients/vnc/Makefile.am
diff --git a/guacamole/native/proxy/NEWS b/guacamole/native/libguac-clients/vnc/NEWS
similarity index 100%
rename from guacamole/native/proxy/NEWS
rename to guacamole/native/libguac-clients/vnc/NEWS
diff --git a/guacamole/native/proxy/README b/guacamole/native/libguac-clients/vnc/README
similarity index 100%
rename from guacamole/native/proxy/README
rename to guacamole/native/libguac-clients/vnc/README
diff --git a/guacamole/native/proxy-clients/vnc/configure.in b/guacamole/native/libguac-clients/vnc/configure.in
similarity index 100%
rename from guacamole/native/proxy-clients/vnc/configure.in
rename to guacamole/native/libguac-clients/vnc/configure.in
diff --git a/guacamole/native/proxy-clients/vnc/src/vnc_client.c b/guacamole/native/libguac-clients/vnc/src/vnc_client.c
similarity index 100%
rename from guacamole/native/proxy-clients/vnc/src/vnc_client.c
rename to guacamole/native/libguac-clients/vnc/src/vnc_client.c