diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..c8cdef6d56
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vircadia-web"]
+	path = vircadia-web
+	url = ../vircadia-web.git
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b303ff2938..77d0413690 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -274,12 +274,18 @@ add_custom_target(cmake SOURCES ${CMAKE_SRC})
 GroupSources("cmake")
 unset(CMAKE_SRC)
 
-file(GLOB_RECURSE JS_SRC scripts/*.js unpublishedScripts/*.js)
+file(GLOB_RECURSE JS_SRC scripts/*.* unpublishedScripts/*.*)
 add_custom_target(js SOURCES ${JS_SRC})
 GroupSources("scripts")
 GroupSources("unpublishedScripts")
 unset(JS_SRC)
 
+file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
+list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
+add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
+GroupSources("vircadia-web")
+unset(WEB_APP_SRC)
+
 set_packaging_parameters()
 
 # Locate the required Qt build on the filesystem
diff --git a/vircadia-web b/vircadia-web
new file mode 160000
index 0000000000..d2e383cab8
--- /dev/null
+++ b/vircadia-web
@@ -0,0 +1 @@
+Subproject commit d2e383cab811018422433fe0d8f224e53e0506cf