diff --git a/guacamole/web-client/.gitignore b/guacamole/java/.gitignore
similarity index 100%
rename from guacamole/web-client/.gitignore
rename to guacamole/java/.gitignore
diff --git a/guacamole/libguac/COPYING b/guacamole/java/COPYING
similarity index 100%
rename from guacamole/libguac/COPYING
rename to guacamole/java/COPYING
diff --git a/guacamole/web-client/doc/example/guacamole.properties b/guacamole/java/doc/example/guacamole.properties
similarity index 100%
rename from guacamole/web-client/doc/example/guacamole.properties
rename to guacamole/java/doc/example/guacamole.properties
diff --git a/guacamole/web-client/doc/example/user-mapping.xml b/guacamole/java/doc/example/user-mapping.xml
similarity index 100%
rename from guacamole/web-client/doc/example/user-mapping.xml
rename to guacamole/java/doc/example/user-mapping.xml
diff --git a/guacamole/web-client/guacamole-common/pom.xml b/guacamole/java/guacamole-common/pom.xml
similarity index 100%
rename from guacamole/web-client/guacamole-common/pom.xml
rename to guacamole/java/guacamole-common/pom.xml
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java
diff --git a/guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java b/guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java
similarity index 100%
rename from guacamole/web-client/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java
rename to guacamole/java/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java
diff --git a/guacamole/web-client/guacamole-default-webapp/pom.xml b/guacamole/java/guacamole-default-webapp/pom.xml
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/pom.xml
rename to guacamole/java/guacamole-default-webapp/pom.xml
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/META-INF/context.xml b/guacamole/java/guacamole-default-webapp/src/main/webapp/META-INF/context.xml
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/META-INF/context.xml
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/META-INF/context.xml
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml b/guacamole/java/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html b/guacamole/java/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js b/guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guacamole.css b/guacamole/java/guacamole-default-webapp/src/main/webapp/guacamole.css
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/guacamole.css
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/guacamole.css
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png b/guacamole/java/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/checker.png b/guacamole/java/guacamole-default-webapp/src/main/webapp/images/checker.png
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/checker.png
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/images/checker.png
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png b/guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png b/guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png b/guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/login-logo.png b/guacamole/java/guacamole-default-webapp/src/main/webapp/images/login-logo.png
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/login-logo.png
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/images/login-logo.png
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png b/guacamole/java/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/index.html b/guacamole/java/guacamole-default-webapp/src/main/webapp/index.html
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/index.html
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/index.html
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/keyboard.css b/guacamole/java/guacamole-default-webapp/src/main/webapp/keyboard.css
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/keyboard.css
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/keyboard.css
diff --git a/guacamole/web-client/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml b/guacamole/java/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml
similarity index 100%
rename from guacamole/web-client/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml
rename to guacamole/java/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml
diff --git a/guacamole/libguac/AUTHORS b/guacamole/native/libguac/AUTHORS
similarity index 100%
rename from guacamole/libguac/AUTHORS
rename to guacamole/native/libguac/AUTHORS
diff --git a/guacamole/proxy-clients/vnc/COPYING b/guacamole/native/libguac/COPYING
similarity index 100%
rename from guacamole/proxy-clients/vnc/COPYING
rename to guacamole/native/libguac/COPYING
diff --git a/guacamole/libguac/ChangeLog b/guacamole/native/libguac/ChangeLog
similarity index 100%
rename from guacamole/libguac/ChangeLog
rename to guacamole/native/libguac/ChangeLog
diff --git a/guacamole/libguac/Doxyfile b/guacamole/native/libguac/Doxyfile
similarity index 100%
rename from guacamole/libguac/Doxyfile
rename to guacamole/native/libguac/Doxyfile
diff --git a/guacamole/libguac/INSTALL b/guacamole/native/libguac/INSTALL
similarity index 100%
rename from guacamole/libguac/INSTALL
rename to guacamole/native/libguac/INSTALL
diff --git a/guacamole/libguac/Makefile.am b/guacamole/native/libguac/Makefile.am
similarity index 100%
rename from guacamole/libguac/Makefile.am
rename to guacamole/native/libguac/Makefile.am
diff --git a/guacamole/libguac/NEWS b/guacamole/native/libguac/NEWS
similarity index 100%
rename from guacamole/libguac/NEWS
rename to guacamole/native/libguac/NEWS
diff --git a/guacamole/libguac/README b/guacamole/native/libguac/README
similarity index 100%
rename from guacamole/libguac/README
rename to guacamole/native/libguac/README
diff --git a/guacamole/libguac/configure.in b/guacamole/native/libguac/configure.in
similarity index 100%
rename from guacamole/libguac/configure.in
rename to guacamole/native/libguac/configure.in
diff --git a/guacamole/libguac/include/client.h b/guacamole/native/libguac/include/client.h
similarity index 100%
rename from guacamole/libguac/include/client.h
rename to guacamole/native/libguac/include/client.h
diff --git a/guacamole/libguac/include/guacio.h b/guacamole/native/libguac/include/guacio.h
similarity index 100%
rename from guacamole/libguac/include/guacio.h
rename to guacamole/native/libguac/include/guacio.h
diff --git a/guacamole/libguac/include/protocol.h b/guacamole/native/libguac/include/protocol.h
similarity index 100%
rename from guacamole/libguac/include/protocol.h
rename to guacamole/native/libguac/include/protocol.h
diff --git a/guacamole/libguac/src/client.c b/guacamole/native/libguac/src/client.c
similarity index 100%
rename from guacamole/libguac/src/client.c
rename to guacamole/native/libguac/src/client.c
diff --git a/guacamole/libguac/src/guacio.c b/guacamole/native/libguac/src/guacio.c
similarity index 100%
rename from guacamole/libguac/src/guacio.c
rename to guacamole/native/libguac/src/guacio.c
diff --git a/guacamole/libguac/src/protocol.c b/guacamole/native/libguac/src/protocol.c
similarity index 100%
rename from guacamole/libguac/src/protocol.c
rename to guacamole/native/libguac/src/protocol.c
diff --git a/guacamole/proxy-clients/vnc/AUTHORS b/guacamole/native/proxy-clients/vnc/AUTHORS
similarity index 100%
rename from guacamole/proxy-clients/vnc/AUTHORS
rename to guacamole/native/proxy-clients/vnc/AUTHORS
diff --git a/guacamole/proxy/COPYING b/guacamole/native/proxy-clients/vnc/COPYING
similarity index 100%
rename from guacamole/proxy/COPYING
rename to guacamole/native/proxy-clients/vnc/COPYING
diff --git a/guacamole/proxy-clients/vnc/ChangeLog b/guacamole/native/proxy-clients/vnc/ChangeLog
similarity index 100%
rename from guacamole/proxy-clients/vnc/ChangeLog
rename to guacamole/native/proxy-clients/vnc/ChangeLog
diff --git a/guacamole/proxy-clients/vnc/INSTALL b/guacamole/native/proxy-clients/vnc/INSTALL
similarity index 100%
rename from guacamole/proxy-clients/vnc/INSTALL
rename to guacamole/native/proxy-clients/vnc/INSTALL
diff --git a/guacamole/proxy-clients/vnc/Makefile.am b/guacamole/native/proxy-clients/vnc/Makefile.am
similarity index 100%
rename from guacamole/proxy-clients/vnc/Makefile.am
rename to guacamole/native/proxy-clients/vnc/Makefile.am
diff --git a/guacamole/proxy-clients/vnc/NEWS b/guacamole/native/proxy-clients/vnc/NEWS
similarity index 100%
rename from guacamole/proxy-clients/vnc/NEWS
rename to guacamole/native/proxy-clients/vnc/NEWS
diff --git a/guacamole/proxy-clients/vnc/README b/guacamole/native/proxy-clients/vnc/README
similarity index 100%
rename from guacamole/proxy-clients/vnc/README
rename to guacamole/native/proxy-clients/vnc/README
diff --git a/guacamole/proxy-clients/vnc/configure.in b/guacamole/native/proxy-clients/vnc/configure.in
similarity index 100%
rename from guacamole/proxy-clients/vnc/configure.in
rename to guacamole/native/proxy-clients/vnc/configure.in
diff --git a/guacamole/proxy-clients/vnc/src/vnc_client.c b/guacamole/native/proxy-clients/vnc/src/vnc_client.c
similarity index 100%
rename from guacamole/proxy-clients/vnc/src/vnc_client.c
rename to guacamole/native/proxy-clients/vnc/src/vnc_client.c
diff --git a/guacamole/proxy/.gitignore b/guacamole/native/proxy/.gitignore
similarity index 100%
rename from guacamole/proxy/.gitignore
rename to guacamole/native/proxy/.gitignore
diff --git a/guacamole/proxy/AUTHORS b/guacamole/native/proxy/AUTHORS
similarity index 100%
rename from guacamole/proxy/AUTHORS
rename to guacamole/native/proxy/AUTHORS
diff --git a/guacamole/web-client/COPYING b/guacamole/native/proxy/COPYING
similarity index 100%
rename from guacamole/web-client/COPYING
rename to guacamole/native/proxy/COPYING
diff --git a/guacamole/proxy/ChangeLog b/guacamole/native/proxy/ChangeLog
similarity index 100%
rename from guacamole/proxy/ChangeLog
rename to guacamole/native/proxy/ChangeLog
diff --git a/guacamole/proxy/INSTALL b/guacamole/native/proxy/INSTALL
similarity index 100%
rename from guacamole/proxy/INSTALL
rename to guacamole/native/proxy/INSTALL
diff --git a/guacamole/proxy/Makefile.am b/guacamole/native/proxy/Makefile.am
similarity index 100%
rename from guacamole/proxy/Makefile.am
rename to guacamole/native/proxy/Makefile.am
diff --git a/guacamole/proxy/NEWS b/guacamole/native/proxy/NEWS
similarity index 100%
rename from guacamole/proxy/NEWS
rename to guacamole/native/proxy/NEWS
diff --git a/guacamole/proxy/README b/guacamole/native/proxy/README
similarity index 100%
rename from guacamole/proxy/README
rename to guacamole/native/proxy/README
diff --git a/guacamole/proxy/configure.in b/guacamole/native/proxy/configure.in
similarity index 100%
rename from guacamole/proxy/configure.in
rename to guacamole/native/proxy/configure.in
diff --git a/guacamole/proxy/src/daemon.c b/guacamole/native/proxy/src/daemon.c
similarity index 100%
rename from guacamole/proxy/src/daemon.c
rename to guacamole/native/proxy/src/daemon.c