diff --git a/guacamole/vnc/AUTHORS b/guacamole/proxy-clients/vnc/AUTHORS
similarity index 100%
rename from guacamole/vnc/AUTHORS
rename to guacamole/proxy-clients/vnc/AUTHORS
diff --git a/guacamole/client/COPYING b/guacamole/proxy-clients/vnc/COPYING
similarity index 100%
rename from guacamole/client/COPYING
rename to guacamole/proxy-clients/vnc/COPYING
diff --git a/guacamole/vnc/ChangeLog b/guacamole/proxy-clients/vnc/ChangeLog
similarity index 100%
rename from guacamole/vnc/ChangeLog
rename to guacamole/proxy-clients/vnc/ChangeLog
diff --git a/guacamole/vnc/INSTALL b/guacamole/proxy-clients/vnc/INSTALL
similarity index 100%
rename from guacamole/vnc/INSTALL
rename to guacamole/proxy-clients/vnc/INSTALL
diff --git a/guacamole/vnc/Makefile.am b/guacamole/proxy-clients/vnc/Makefile.am
similarity index 100%
rename from guacamole/vnc/Makefile.am
rename to guacamole/proxy-clients/vnc/Makefile.am
diff --git a/guacamole/vnc/NEWS b/guacamole/proxy-clients/vnc/NEWS
similarity index 100%
rename from guacamole/vnc/NEWS
rename to guacamole/proxy-clients/vnc/NEWS
diff --git a/guacamole/vnc/README b/guacamole/proxy-clients/vnc/README
similarity index 100%
rename from guacamole/vnc/README
rename to guacamole/proxy-clients/vnc/README
diff --git a/guacamole/vnc/configure.in b/guacamole/proxy-clients/vnc/configure.in
similarity index 100%
rename from guacamole/vnc/configure.in
rename to guacamole/proxy-clients/vnc/configure.in
diff --git a/guacamole/vnc/src/vnc_client.c b/guacamole/proxy-clients/vnc/src/vnc_client.c
similarity index 100%
rename from guacamole/vnc/src/vnc_client.c
rename to guacamole/proxy-clients/vnc/src/vnc_client.c
diff --git a/guacamole/client/.gitignore b/guacamole/web-client/.gitignore
similarity index 100%
rename from guacamole/client/.gitignore
rename to guacamole/web-client/.gitignore
diff --git a/guacamole/vnc/COPYING b/guacamole/web-client/COPYING
similarity index 100%
rename from guacamole/vnc/COPYING
rename to guacamole/web-client/COPYING
diff --git a/guacamole/client/Makefile b/guacamole/web-client/Makefile
similarity index 100%
rename from guacamole/client/Makefile
rename to guacamole/web-client/Makefile
diff --git a/guacamole/client/ant/build.properties b/guacamole/web-client/ant/build.properties
similarity index 100%
rename from guacamole/client/ant/build.properties
rename to guacamole/web-client/ant/build.properties
diff --git a/guacamole/client/build.xml b/guacamole/web-client/build.xml
similarity index 100%
rename from guacamole/client/build.xml
rename to guacamole/web-client/build.xml
diff --git a/guacamole/client/doc/example/guacamole-users.xml b/guacamole/web-client/doc/example/guacamole-users.xml
similarity index 100%
rename from guacamole/client/doc/example/guacamole-users.xml
rename to guacamole/web-client/doc/example/guacamole-users.xml
diff --git a/guacamole/client/doc/example/guacamole.xml b/guacamole/web-client/doc/example/guacamole.xml
similarity index 100%
rename from guacamole/client/doc/example/guacamole.xml
rename to guacamole/web-client/doc/example/guacamole.xml
diff --git a/guacamole/client/src/net/sourceforge/guacamole/Client.java b/guacamole/web-client/src/net/sourceforge/guacamole/Client.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/Client.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/Client.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/GuacamoleClient.java b/guacamole/web-client/src/net/sourceforge/guacamole/GuacamoleClient.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/GuacamoleClient.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/GuacamoleClient.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/GuacamoleException.java b/guacamole/web-client/src/net/sourceforge/guacamole/GuacamoleException.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/GuacamoleException.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/GuacamoleException.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/event/Event.java b/guacamole/web-client/src/net/sourceforge/guacamole/event/Event.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/event/Event.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/event/Event.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/event/EventHandler.java b/guacamole/web-client/src/net/sourceforge/guacamole/event/EventHandler.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/event/EventHandler.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/event/EventHandler.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/event/EventQueue.java b/guacamole/web-client/src/net/sourceforge/guacamole/event/EventQueue.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/event/EventQueue.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/event/EventQueue.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/event/KeyEvent.java b/guacamole/web-client/src/net/sourceforge/guacamole/event/KeyEvent.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/event/KeyEvent.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/event/KeyEvent.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/event/PointerEvent.java b/guacamole/web-client/src/net/sourceforge/guacamole/event/PointerEvent.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/event/PointerEvent.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/event/PointerEvent.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/Base64.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/Base64.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/net/Base64.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/net/Base64.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/Configuration.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/Configuration.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/net/Configuration.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/net/Configuration.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleServlet.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleServlet.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleServlet.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleServlet.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleSession.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/XMLGuacamoleServlet.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/XMLGuacamoleServlet.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/net/XMLGuacamoleServlet.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/net/XMLGuacamoleServlet.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/input/Inbound.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/input/Inbound.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/net/input/Inbound.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/net/input/Inbound.java
diff --git a/guacamole/client/src/net/sourceforge/guacamole/net/output/InstructionStream.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/output/InstructionStream.java
similarity index 100%
rename from guacamole/client/src/net/sourceforge/guacamole/net/output/InstructionStream.java
rename to guacamole/web-client/src/net/sourceforge/guacamole/net/output/InstructionStream.java
diff --git a/guacamole/client/web/WEB-INF/web.xml b/guacamole/web-client/web/WEB-INF/web.xml
similarity index 100%
rename from guacamole/client/web/WEB-INF/web.xml
rename to guacamole/web-client/web/WEB-INF/web.xml
diff --git a/guacamole/client/web/agpl-3.0-standalone.html b/guacamole/web-client/web/agpl-3.0-standalone.html
similarity index 100%
rename from guacamole/client/web/agpl-3.0-standalone.html
rename to guacamole/web-client/web/agpl-3.0-standalone.html
diff --git a/guacamole/client/web/guacamole.css b/guacamole/web-client/web/guacamole.css
similarity index 100%
rename from guacamole/client/web/guacamole.css
rename to guacamole/web-client/web/guacamole.css
diff --git a/guacamole/client/web/images/agpl-logo.png b/guacamole/web-client/web/images/agpl-logo.png
similarity index 100%
rename from guacamole/client/web/images/agpl-logo.png
rename to guacamole/web-client/web/images/agpl-logo.png
diff --git a/guacamole/client/web/images/checker.png b/guacamole/web-client/web/images/checker.png
similarity index 100%
rename from guacamole/client/web/images/checker.png
rename to guacamole/web-client/web/images/checker.png
diff --git a/guacamole/client/web/images/guacamole-64-icon.png b/guacamole/web-client/web/images/guacamole-64-icon.png
similarity index 100%
rename from guacamole/client/web/images/guacamole-64-icon.png
rename to guacamole/web-client/web/images/guacamole-64-icon.png
diff --git a/guacamole/client/web/images/guacamole-icon-64.png b/guacamole/web-client/web/images/guacamole-icon-64.png
similarity index 100%
rename from guacamole/client/web/images/guacamole-icon-64.png
rename to guacamole/web-client/web/images/guacamole-icon-64.png
diff --git a/guacamole/client/web/images/guacamole-logo.png b/guacamole/web-client/web/images/guacamole-logo.png
similarity index 100%
rename from guacamole/client/web/images/guacamole-logo.png
rename to guacamole/web-client/web/images/guacamole-logo.png
diff --git a/guacamole/client/web/images/mouse/blank.cur b/guacamole/web-client/web/images/mouse/blank.cur
similarity index 100%
rename from guacamole/client/web/images/mouse/blank.cur
rename to guacamole/web-client/web/images/mouse/blank.cur
diff --git a/guacamole/client/web/images/mouse/blank.gif b/guacamole/web-client/web/images/mouse/blank.gif
similarity index 100%
rename from guacamole/client/web/images/mouse/blank.gif
rename to guacamole/web-client/web/images/mouse/blank.gif
diff --git a/guacamole/client/web/images/mouse/dot.gif b/guacamole/web-client/web/images/mouse/dot.gif
similarity index 100%
rename from guacamole/client/web/images/mouse/dot.gif
rename to guacamole/web-client/web/images/mouse/dot.gif
diff --git a/guacamole/client/web/images/noguacamole-logo.png b/guacamole/web-client/web/images/noguacamole-logo.png
similarity index 100%
rename from guacamole/client/web/images/noguacamole-logo.png
rename to guacamole/web-client/web/images/noguacamole-logo.png
diff --git a/guacamole/client/web/images/noimage92.png b/guacamole/web-client/web/images/noimage92.png
similarity index 100%
rename from guacamole/client/web/images/noimage92.png
rename to guacamole/web-client/web/images/noimage92.png
diff --git a/guacamole/client/web/images/spinner92.gif b/guacamole/web-client/web/images/spinner92.gif
similarity index 100%
rename from guacamole/client/web/images/spinner92.gif
rename to guacamole/web-client/web/images/spinner92.gif
diff --git a/guacamole/client/web/index.html b/guacamole/web-client/web/index.html
similarity index 100%
rename from guacamole/client/web/index.html
rename to guacamole/web-client/web/index.html
diff --git a/guacamole/client/web/javascript/guacamole.js b/guacamole/web-client/web/javascript/guacamole.js
similarity index 100%
rename from guacamole/client/web/javascript/guacamole.js
rename to guacamole/web-client/web/javascript/guacamole.js
diff --git a/guacamole/client/web/javascript/keyboard.js b/guacamole/web-client/web/javascript/keyboard.js
similarity index 100%
rename from guacamole/client/web/javascript/keyboard.js
rename to guacamole/web-client/web/javascript/keyboard.js
diff --git a/guacamole/client/web/javascript/keymap.js b/guacamole/web-client/web/javascript/keymap.js
similarity index 100%
rename from guacamole/client/web/javascript/keymap.js
rename to guacamole/web-client/web/javascript/keymap.js
diff --git a/guacamole/client/web/javascript/layer.js b/guacamole/web-client/web/javascript/layer.js
similarity index 100%
rename from guacamole/client/web/javascript/layer.js
rename to guacamole/web-client/web/javascript/layer.js
diff --git a/guacamole/client/web/javascript/message.js b/guacamole/web-client/web/javascript/message.js
similarity index 100%
rename from guacamole/client/web/javascript/message.js
rename to guacamole/web-client/web/javascript/message.js
diff --git a/guacamole/client/web/javascript/mouse.js b/guacamole/web-client/web/javascript/mouse.js
similarity index 100%
rename from guacamole/client/web/javascript/mouse.js
rename to guacamole/web-client/web/javascript/mouse.js
diff --git a/guacamole/client/web/javascript/oskeyboard.js b/guacamole/web-client/web/javascript/oskeyboard.js
similarity index 100%
rename from guacamole/client/web/javascript/oskeyboard.js
rename to guacamole/web-client/web/javascript/oskeyboard.js
diff --git a/guacamole/client/web/keyboard.css b/guacamole/web-client/web/keyboard.css
similarity index 100%
rename from guacamole/client/web/keyboard.css
rename to guacamole/web-client/web/keyboard.css
diff --git a/guacamole/client/web/layouts/en-us-qwerty.xml b/guacamole/web-client/web/layouts/en-us-qwerty.xml
similarity index 100%
rename from guacamole/client/web/layouts/en-us-qwerty.xml
rename to guacamole/web-client/web/layouts/en-us-qwerty.xml