diff --git a/guacamole/web-client/web/META-INF/context.xml b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/META-INF/context.xml
similarity index 100%
rename from guacamole/web-client/web/META-INF/context.xml
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/META-INF/context.xml
diff --git a/guacamole/web-client/web/WEB-INF/web.xml b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from guacamole/web-client/web/WEB-INF/web.xml
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/guacamole/web-client/web/agpl-3.0-standalone.html b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html
similarity index 100%
rename from guacamole/web-client/web/agpl-3.0-standalone.html
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html
diff --git a/guacamole/web-client/web/guac-web-lib/css/guacamole.css b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/css/guacamole.css
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css
diff --git a/guacamole/web-client/web/guac-web-lib/images/mouse/blank.cur b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/images/mouse/blank.cur
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur
diff --git a/guacamole/web-client/web/guac-web-lib/images/mouse/blank.gif b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/images/mouse/blank.gif
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif
diff --git a/guacamole/web-client/web/guac-web-lib/images/mouse/dot.gif b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/images/mouse/dot.gif
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif
diff --git a/guacamole/web-client/web/guac-web-lib/images/noimage92.png b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/images/noimage92.png
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png
diff --git a/guacamole/web-client/web/guac-web-lib/images/spinner92.gif b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/images/spinner92.gif
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif
diff --git a/guacamole/web-client/web/guac-web-lib/javascript/guacamole.js b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/javascript/guacamole.js
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js
diff --git a/guacamole/web-client/web/guac-web-lib/javascript/keyboard.js b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/javascript/keyboard.js
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js
diff --git a/guacamole/web-client/web/guac-web-lib/javascript/keymap.js b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/javascript/keymap.js
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js
diff --git a/guacamole/web-client/web/guac-web-lib/javascript/layer.js b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/javascript/layer.js
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js
diff --git a/guacamole/web-client/web/guac-web-lib/javascript/mouse.js b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/javascript/mouse.js
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js
diff --git a/guacamole/web-client/web/guac-web-lib/javascript/oskeyboard.js b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js
similarity index 100%
rename from guacamole/web-client/web/guac-web-lib/javascript/oskeyboard.js
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js
diff --git a/guacamole/web-client/web/guacamole.css b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/guacamole.css
similarity index 100%
rename from guacamole/web-client/web/guacamole.css
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/guacamole.css
diff --git a/guacamole/web-client/web/images/agpl-logo.png b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png
similarity index 100%
rename from guacamole/web-client/web/images/agpl-logo.png
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png
diff --git a/guacamole/web-client/web/images/checker.png b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/checker.png
similarity index 100%
rename from guacamole/web-client/web/images/checker.png
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/checker.png
diff --git a/guacamole/web-client/web/images/guacamole-64-icon.png b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png
similarity index 100%
rename from guacamole/web-client/web/images/guacamole-64-icon.png
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png
diff --git a/guacamole/web-client/web/images/guacamole-icon-64.png b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png
similarity index 100%
rename from guacamole/web-client/web/images/guacamole-icon-64.png
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png
diff --git a/guacamole/web-client/web/images/guacamole-logo.png b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png
similarity index 100%
rename from guacamole/web-client/web/images/guacamole-logo.png
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png
diff --git a/guacamole/web-client/web/images/login-logo.png b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/login-logo.png
similarity index 100%
rename from guacamole/web-client/web/images/login-logo.png
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/login-logo.png
diff --git a/guacamole/web-client/web/images/noguacamole-logo.png b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png
similarity index 100%
rename from guacamole/web-client/web/images/noguacamole-logo.png
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png
diff --git a/guacamole/web-client/web/index.html b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/index.html
similarity index 100%
rename from guacamole/web-client/web/index.html
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/index.html
diff --git a/guacamole/web-client/web/keyboard.css b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/keyboard.css
similarity index 100%
rename from guacamole/web-client/web/keyboard.css
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/keyboard.css
diff --git a/guacamole/web-client/web/layouts/en-us-qwerty.xml b/guacamole/web-client/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml
similarity index 100%
rename from guacamole/web-client/web/layouts/en-us-qwerty.xml
rename to guacamole/web-client/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml