diff --git a/MANIFEST.in b/MANIFEST.in
index e1043fb57c..a1a77ff540 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 recursive-include docs *
 recursive-include tests *.py
 recursive-include synapse/storage/schema *.sql
-recursive-include webclient *
+recursive-include syweb/webclient *
diff --git a/syweb/__init__.py b/syweb/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/webclient/CAPTCHA_SETUP b/syweb/webclient/CAPTCHA_SETUP
similarity index 100%
rename from webclient/CAPTCHA_SETUP
rename to syweb/webclient/CAPTCHA_SETUP
diff --git a/webclient/README b/syweb/webclient/README
similarity index 100%
rename from webclient/README
rename to syweb/webclient/README
diff --git a/webclient/app-controller.js b/syweb/webclient/app-controller.js
similarity index 100%
rename from webclient/app-controller.js
rename to syweb/webclient/app-controller.js
diff --git a/webclient/app-directive.js b/syweb/webclient/app-directive.js
similarity index 100%
rename from webclient/app-directive.js
rename to syweb/webclient/app-directive.js
diff --git a/webclient/app-filter.js b/syweb/webclient/app-filter.js
similarity index 100%
rename from webclient/app-filter.js
rename to syweb/webclient/app-filter.js
diff --git a/webclient/app.css b/syweb/webclient/app.css
similarity index 100%
rename from webclient/app.css
rename to syweb/webclient/app.css
diff --git a/webclient/app.js b/syweb/webclient/app.js
similarity index 100%
rename from webclient/app.js
rename to syweb/webclient/app.js
diff --git a/webclient/bootstrap.css b/syweb/webclient/bootstrap.css
similarity index 100%
rename from webclient/bootstrap.css
rename to syweb/webclient/bootstrap.css
diff --git a/webclient/components/fileInput/file-input-directive.js b/syweb/webclient/components/fileInput/file-input-directive.js
similarity index 100%
rename from webclient/components/fileInput/file-input-directive.js
rename to syweb/webclient/components/fileInput/file-input-directive.js
diff --git a/webclient/components/fileUpload/file-upload-service.js b/syweb/webclient/components/fileUpload/file-upload-service.js
similarity index 100%
rename from webclient/components/fileUpload/file-upload-service.js
rename to syweb/webclient/components/fileUpload/file-upload-service.js
diff --git a/webclient/components/matrix/event-handler-service.js b/syweb/webclient/components/matrix/event-handler-service.js
similarity index 100%
rename from webclient/components/matrix/event-handler-service.js
rename to syweb/webclient/components/matrix/event-handler-service.js
diff --git a/webclient/components/matrix/event-stream-service.js b/syweb/webclient/components/matrix/event-stream-service.js
similarity index 100%
rename from webclient/components/matrix/event-stream-service.js
rename to syweb/webclient/components/matrix/event-stream-service.js
diff --git a/webclient/components/matrix/matrix-call.js b/syweb/webclient/components/matrix/matrix-call.js
similarity index 100%
rename from webclient/components/matrix/matrix-call.js
rename to syweb/webclient/components/matrix/matrix-call.js
diff --git a/webclient/components/matrix/matrix-filter.js b/syweb/webclient/components/matrix/matrix-filter.js
similarity index 100%
rename from webclient/components/matrix/matrix-filter.js
rename to syweb/webclient/components/matrix/matrix-filter.js
diff --git a/webclient/components/matrix/matrix-phone-service.js b/syweb/webclient/components/matrix/matrix-phone-service.js
similarity index 100%
rename from webclient/components/matrix/matrix-phone-service.js
rename to syweb/webclient/components/matrix/matrix-phone-service.js
diff --git a/webclient/components/matrix/matrix-service.js b/syweb/webclient/components/matrix/matrix-service.js
similarity index 100%
rename from webclient/components/matrix/matrix-service.js
rename to syweb/webclient/components/matrix/matrix-service.js
diff --git a/webclient/components/matrix/model-service.js b/syweb/webclient/components/matrix/model-service.js
similarity index 100%
rename from webclient/components/matrix/model-service.js
rename to syweb/webclient/components/matrix/model-service.js
diff --git a/webclient/components/matrix/notification-service.js b/syweb/webclient/components/matrix/notification-service.js
similarity index 100%
rename from webclient/components/matrix/notification-service.js
rename to syweb/webclient/components/matrix/notification-service.js
diff --git a/webclient/components/matrix/presence-service.js b/syweb/webclient/components/matrix/presence-service.js
similarity index 100%
rename from webclient/components/matrix/presence-service.js
rename to syweb/webclient/components/matrix/presence-service.js
diff --git a/webclient/components/utilities/utilities-service.js b/syweb/webclient/components/utilities/utilities-service.js
similarity index 100%
rename from webclient/components/utilities/utilities-service.js
rename to syweb/webclient/components/utilities/utilities-service.js
diff --git a/webclient/favicon.ico b/syweb/webclient/favicon.ico
similarity index 100%
rename from webclient/favicon.ico
rename to syweb/webclient/favicon.ico
diff --git a/webclient/home/home-controller.js b/syweb/webclient/home/home-controller.js
similarity index 100%
rename from webclient/home/home-controller.js
rename to syweb/webclient/home/home-controller.js
diff --git a/webclient/home/home.html b/syweb/webclient/home/home.html
similarity index 100%
rename from webclient/home/home.html
rename to syweb/webclient/home/home.html
diff --git a/webclient/img/close.png b/syweb/webclient/img/close.png
similarity index 100%
rename from webclient/img/close.png
rename to syweb/webclient/img/close.png
diff --git a/webclient/img/default-profile.png b/syweb/webclient/img/default-profile.png
similarity index 100%
rename from webclient/img/default-profile.png
rename to syweb/webclient/img/default-profile.png
diff --git a/webclient/img/gradient.png b/syweb/webclient/img/gradient.png
similarity index 100%
rename from webclient/img/gradient.png
rename to syweb/webclient/img/gradient.png
diff --git a/webclient/img/green_phone.png b/syweb/webclient/img/green_phone.png
similarity index 100%
rename from webclient/img/green_phone.png
rename to syweb/webclient/img/green_phone.png
diff --git a/webclient/img/logo-small.png b/syweb/webclient/img/logo-small.png
similarity index 100%
rename from webclient/img/logo-small.png
rename to syweb/webclient/img/logo-small.png
diff --git a/webclient/img/logo.png b/syweb/webclient/img/logo.png
similarity index 100%
rename from webclient/img/logo.png
rename to syweb/webclient/img/logo.png
diff --git a/webclient/img/red_phone.png b/syweb/webclient/img/red_phone.png
similarity index 100%
rename from webclient/img/red_phone.png
rename to syweb/webclient/img/red_phone.png
diff --git a/webclient/index.html b/syweb/webclient/index.html
similarity index 100%
rename from webclient/index.html
rename to syweb/webclient/index.html
diff --git a/webclient/js/angular-animate.js b/syweb/webclient/js/angular-animate.js
similarity index 100%
rename from webclient/js/angular-animate.js
rename to syweb/webclient/js/angular-animate.js
diff --git a/webclient/js/angular-animate.min.js b/syweb/webclient/js/angular-animate.min.js
similarity index 100%
rename from webclient/js/angular-animate.min.js
rename to syweb/webclient/js/angular-animate.min.js
diff --git a/webclient/js/angular-mocks.js b/syweb/webclient/js/angular-mocks.js
similarity index 100%
rename from webclient/js/angular-mocks.js
rename to syweb/webclient/js/angular-mocks.js
diff --git a/webclient/js/angular-route.js b/syweb/webclient/js/angular-route.js
similarity index 100%
rename from webclient/js/angular-route.js
rename to syweb/webclient/js/angular-route.js
diff --git a/webclient/js/angular-route.min.js b/syweb/webclient/js/angular-route.min.js
similarity index 100%
rename from webclient/js/angular-route.min.js
rename to syweb/webclient/js/angular-route.min.js
diff --git a/webclient/js/angular-sanitize.js b/syweb/webclient/js/angular-sanitize.js
similarity index 100%
rename from webclient/js/angular-sanitize.js
rename to syweb/webclient/js/angular-sanitize.js
diff --git a/webclient/js/angular-sanitize.min.js b/syweb/webclient/js/angular-sanitize.min.js
similarity index 100%
rename from webclient/js/angular-sanitize.min.js
rename to syweb/webclient/js/angular-sanitize.min.js
diff --git a/webclient/js/angular.js b/syweb/webclient/js/angular.js
similarity index 100%
rename from webclient/js/angular.js
rename to syweb/webclient/js/angular.js
diff --git a/webclient/js/angular.min.js b/syweb/webclient/js/angular.min.js
similarity index 100%
rename from webclient/js/angular.min.js
rename to syweb/webclient/js/angular.min.js
diff --git a/webclient/js/autofill-event.js b/syweb/webclient/js/autofill-event.js
similarity index 100%
rename from webclient/js/autofill-event.js
rename to syweb/webclient/js/autofill-event.js
diff --git a/webclient/js/elastic.js b/syweb/webclient/js/elastic.js
similarity index 100%
rename from webclient/js/elastic.js
rename to syweb/webclient/js/elastic.js
diff --git a/webclient/js/jquery-1.8.3.min.js b/syweb/webclient/js/jquery-1.8.3.min.js
similarity index 100%
rename from webclient/js/jquery-1.8.3.min.js
rename to syweb/webclient/js/jquery-1.8.3.min.js
diff --git a/webclient/js/ng-infinite-scroll-matrix.js b/syweb/webclient/js/ng-infinite-scroll-matrix.js
similarity index 100%
rename from webclient/js/ng-infinite-scroll-matrix.js
rename to syweb/webclient/js/ng-infinite-scroll-matrix.js
diff --git a/webclient/js/ui-bootstrap-tpls-0.11.2.js b/syweb/webclient/js/ui-bootstrap-tpls-0.11.2.js
similarity index 100%
rename from webclient/js/ui-bootstrap-tpls-0.11.2.js
rename to syweb/webclient/js/ui-bootstrap-tpls-0.11.2.js
diff --git a/webclient/login/login-controller.js b/syweb/webclient/login/login-controller.js
similarity index 100%
rename from webclient/login/login-controller.js
rename to syweb/webclient/login/login-controller.js
diff --git a/webclient/login/login.html b/syweb/webclient/login/login.html
similarity index 100%
rename from webclient/login/login.html
rename to syweb/webclient/login/login.html
diff --git a/webclient/login/register-controller.js b/syweb/webclient/login/register-controller.js
similarity index 100%
rename from webclient/login/register-controller.js
rename to syweb/webclient/login/register-controller.js
diff --git a/webclient/login/register.html b/syweb/webclient/login/register.html
similarity index 100%
rename from webclient/login/register.html
rename to syweb/webclient/login/register.html
diff --git a/webclient/media/busy.mp3 b/syweb/webclient/media/busy.mp3
similarity index 100%
rename from webclient/media/busy.mp3
rename to syweb/webclient/media/busy.mp3
diff --git a/webclient/media/busy.ogg b/syweb/webclient/media/busy.ogg
similarity index 100%
rename from webclient/media/busy.ogg
rename to syweb/webclient/media/busy.ogg
diff --git a/webclient/media/callend.mp3 b/syweb/webclient/media/callend.mp3
similarity index 100%
rename from webclient/media/callend.mp3
rename to syweb/webclient/media/callend.mp3
diff --git a/webclient/media/callend.ogg b/syweb/webclient/media/callend.ogg
similarity index 100%
rename from webclient/media/callend.ogg
rename to syweb/webclient/media/callend.ogg
diff --git a/webclient/media/ring.mp3 b/syweb/webclient/media/ring.mp3
similarity index 100%
rename from webclient/media/ring.mp3
rename to syweb/webclient/media/ring.mp3
diff --git a/webclient/media/ring.ogg b/syweb/webclient/media/ring.ogg
similarity index 100%
rename from webclient/media/ring.ogg
rename to syweb/webclient/media/ring.ogg
diff --git a/webclient/media/ringback.mp3 b/syweb/webclient/media/ringback.mp3
similarity index 100%
rename from webclient/media/ringback.mp3
rename to syweb/webclient/media/ringback.mp3
diff --git a/webclient/media/ringback.ogg b/syweb/webclient/media/ringback.ogg
similarity index 100%
rename from webclient/media/ringback.ogg
rename to syweb/webclient/media/ringback.ogg
diff --git a/webclient/mobile.css b/syweb/webclient/mobile.css
similarity index 100%
rename from webclient/mobile.css
rename to syweb/webclient/mobile.css
diff --git a/webclient/recents/recents-controller.js b/syweb/webclient/recents/recents-controller.js
similarity index 100%
rename from webclient/recents/recents-controller.js
rename to syweb/webclient/recents/recents-controller.js
diff --git a/webclient/recents/recents-filter.js b/syweb/webclient/recents/recents-filter.js
similarity index 100%
rename from webclient/recents/recents-filter.js
rename to syweb/webclient/recents/recents-filter.js
diff --git a/webclient/recents/recents.html b/syweb/webclient/recents/recents.html
similarity index 100%
rename from webclient/recents/recents.html
rename to syweb/webclient/recents/recents.html
diff --git a/webclient/room/room-controller.js b/syweb/webclient/room/room-controller.js
similarity index 100%
rename from webclient/room/room-controller.js
rename to syweb/webclient/room/room-controller.js
diff --git a/webclient/room/room-directive.js b/syweb/webclient/room/room-directive.js
similarity index 100%
rename from webclient/room/room-directive.js
rename to syweb/webclient/room/room-directive.js
diff --git a/webclient/room/room.html b/syweb/webclient/room/room.html
similarity index 100%
rename from webclient/room/room.html
rename to syweb/webclient/room/room.html
diff --git a/webclient/settings/settings-controller.js b/syweb/webclient/settings/settings-controller.js
similarity index 100%
rename from webclient/settings/settings-controller.js
rename to syweb/webclient/settings/settings-controller.js
diff --git a/webclient/settings/settings.html b/syweb/webclient/settings/settings.html
similarity index 100%
rename from webclient/settings/settings.html
rename to syweb/webclient/settings/settings.html
diff --git a/webclient/test/README b/syweb/webclient/test/README
similarity index 100%
rename from webclient/test/README
rename to syweb/webclient/test/README
diff --git a/webclient/test/e2e/home.spec.js b/syweb/webclient/test/e2e/home.spec.js
similarity index 100%
rename from webclient/test/e2e/home.spec.js
rename to syweb/webclient/test/e2e/home.spec.js
diff --git a/webclient/test/karma.conf.js b/syweb/webclient/test/karma.conf.js
similarity index 100%
rename from webclient/test/karma.conf.js
rename to syweb/webclient/test/karma.conf.js
diff --git a/webclient/test/protractor.conf.js b/syweb/webclient/test/protractor.conf.js
similarity index 100%
rename from webclient/test/protractor.conf.js
rename to syweb/webclient/test/protractor.conf.js
diff --git a/webclient/test/unit/user-controller.spec.js b/syweb/webclient/test/unit/user-controller.spec.js
similarity index 100%
rename from webclient/test/unit/user-controller.spec.js
rename to syweb/webclient/test/unit/user-controller.spec.js
diff --git a/webclient/user/user-controller.js b/syweb/webclient/user/user-controller.js
similarity index 100%
rename from webclient/user/user-controller.js
rename to syweb/webclient/user/user-controller.js
diff --git a/webclient/user/user.html b/syweb/webclient/user/user.html
similarity index 100%
rename from webclient/user/user.html
rename to syweb/webclient/user/user.html