diff --git a/BUILD.gn b/BUILD.gn
index 894cd95b9d..e3f696c0f8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -117,34 +117,34 @@ template("glslang_sources_common") {
     }
 
     sources = [
-      "SPIRV/GLSL.ext.AMD.h",
-      "SPIRV/GLSL.ext.EXT.h",
-      "SPIRV/GLSL.ext.KHR.h",
-      "SPIRV/GLSL.ext.NV.h",
-      "SPIRV/GLSL.ext.ARM.h",
-      "SPIRV/GLSL.ext.QCOM.h",
-      "SPIRV/GLSL.std.450.h",
-      "SPIRV/GlslangToSpv.cpp",
-      "SPIRV/GlslangToSpv.h",
-      "SPIRV/InReadableOrder.cpp",
-      "SPIRV/Logger.cpp",
-      "SPIRV/Logger.h",
-      "SPIRV/NonSemanticDebugPrintf.h",
-      "SPIRV/NonSemanticShaderDebugInfo100.h",
-      "SPIRV/SPVRemapper.cpp",
-      "SPIRV/SPVRemapper.h",
-      "SPIRV/SpvBuilder.cpp",
-      "SPIRV/SpvBuilder.h",
-      "SPIRV/SpvPostProcess.cpp",
-      "SPIRV/SpvTools.h",
-      "SPIRV/bitutils.h",
-      "SPIRV/disassemble.cpp",
-      "SPIRV/disassemble.h",
-      "SPIRV/doc.cpp",
-      "SPIRV/doc.h",
-      "SPIRV/hex_float.h",
-      "SPIRV/spirv.hpp",
-      "SPIRV/spvIR.h",
+      "glslang/SPIRV/GLSL.ext.AMD.h",
+      "glslang/SPIRV/GLSL.ext.EXT.h",
+      "glslang/SPIRV/GLSL.ext.KHR.h",
+      "glslang/SPIRV/GLSL.ext.NV.h",
+      "glslang/SPIRV/GLSL.ext.ARM.h",
+      "glslang/SPIRV/GLSL.ext.QCOM.h",
+      "glslang/SPIRV/GLSL.std.450.h",
+      "glslang/SPIRV/GlslangToSpv.cpp",
+      "glslang/SPIRV/GlslangToSpv.h",
+      "glslang/SPIRV/InReadableOrder.cpp",
+      "glslang/SPIRV/Logger.cpp",
+      "glslang/SPIRV/Logger.h",
+      "glslang/SPIRV/NonSemanticDebugPrintf.h",
+      "glslang/SPIRV/NonSemanticShaderDebugInfo100.h",
+      "glslang/SPIRV/SPVRemapper.cpp",
+      "glslang/SPIRV/SPVRemapper.h",
+      "glslang/SPIRV/SpvBuilder.cpp",
+      "glslang/SPIRV/SpvBuilder.h",
+      "glslang/SPIRV/SpvPostProcess.cpp",
+      "glslang/SPIRV/SpvTools.h",
+      "glslang/SPIRV/bitutils.h",
+      "glslang/SPIRV/disassemble.cpp",
+      "glslang/SPIRV/disassemble.h",
+      "glslang/SPIRV/doc.cpp",
+      "glslang/SPIRV/doc.h",
+      "glslang/SPIRV/hex_float.h",
+      "glslang/SPIRV/spirv.hpp",
+      "glslang/SPIRV/spvIR.h",
       "glslang/GenericCodeGen/CodeGen.cpp",
       "glslang/GenericCodeGen/Link.cpp",
       "glslang/Include/BaseTypes.h",
@@ -237,7 +237,7 @@ template("glslang_sources_common") {
 
     defines = [ "ENABLE_SPIRV=1" ]
     if (invoker.enable_opt) {
-      sources += [ "SPIRV/SpvTools.cpp" ]
+      sources += [ "glslang/SPIRV/SpvTools.cpp" ]
       defines += [ "ENABLE_OPT=1" ]
     }
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index adcf8bdb67..d692217ad7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -315,7 +315,7 @@ else()
 endif()
 
 if(ENABLE_SPIRV)
-    add_subdirectory(SPIRV)
+    add_subdirectory(glslang/SPIRV)
 endif()
 add_subdirectory(glslang)
 if(ENABLE_GLSLANG_BINARIES)
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 15181ee060..68b099bbda 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -44,11 +44,11 @@
 #include "glslang/Public/ResourceLimits.h"
 #include "Worklist.h"
 #include "DirStackFileIncluder.h"
-#include "./../glslang/Public/ShaderLang.h"
-#include "../glslang/MachineIndependent/localintermediate.h"
-#include "../SPIRV/GlslangToSpv.h"
-#include "../SPIRV/GLSL.std.450.h"
-#include "../SPIRV/disassemble.h"
+#include "glslang/Public/ShaderLang.h"
+#include "glslang/MachineIndependent/localintermediate.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/SPIRV/GLSL.std.450.h"
+#include "glslang/SPIRV/disassemble.h"
 
 #include <array>
 #include <atomic>
diff --git a/StandAlone/spirv-remap.cpp b/StandAlone/spirv-remap.cpp
index 1bd4a2d6a6..db7520ddcc 100644
--- a/StandAlone/spirv-remap.cpp
+++ b/StandAlone/spirv-remap.cpp
@@ -42,7 +42,7 @@
 //
 // Include remapper
 //
-#include "../SPIRV/SPVRemapper.h"
+#include "glslang/SPIRV/SPVRemapper.h"
 
 namespace {
 
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index eb1dc68e39..cd6d784074 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -242,8 +242,8 @@ if(WIN32)
     source_group("MachineIndependent\\Preprocessor" REGULAR_EXPRESSION "MachineIndependent/preprocessor/*")
     source_group("HLSL" REGULAR_EXPRESSION "HLSL/*")
     source_group("CInterface" REGULAR_EXPRESSION "CInterface/*")
-    source_group("SPIRV" REGULAR_EXPRESSION "SPIRV/[^/]*")
-    source_group("SPIRV\\CInterface" REGULAR_EXPRESSION "SPIRV/CInterface/*")
+    source_group("SPIRV" REGULAR_EXPRESSION "glslang/SPIRV/[^/]*")
+    source_group("SPIRV\\CInterface" REGULAR_EXPRESSION "glslang/SPIRV/CInterface/*")
 endif()
 
 ################################################################################
diff --git a/glslang/OSDependent/Web/glslang.js.cpp b/glslang/OSDependent/Web/glslang.js.cpp
index c820da6aa4..116d00ee6c 100644
--- a/glslang/OSDependent/Web/glslang.js.cpp
+++ b/glslang/OSDependent/Web/glslang.js.cpp
@@ -41,8 +41,8 @@
 #include <emscripten.h>
 #endif
 
-#include "../../../SPIRV/GlslangToSpv.h"
-#include "../../../glslang/Public/ShaderLang.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/Public/ShaderLang.h"
 
 #ifndef __EMSCRIPTEN__
 #define EMSCRIPTEN_KEEPALIVE
diff --git a/SPIRV/CInterface/spirv_c_interface.cpp b/glslang/SPIRV/CInterface/spirv_c_interface.cpp
similarity index 97%
rename from SPIRV/CInterface/spirv_c_interface.cpp
rename to glslang/SPIRV/CInterface/spirv_c_interface.cpp
index 631d19d799..fe5e38b9a3 100644
--- a/SPIRV/CInterface/spirv_c_interface.cpp
+++ b/glslang/SPIRV/CInterface/spirv_c_interface.cpp
@@ -34,9 +34,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cstring>
 #include "glslang/Public/ShaderLang.h"
-#include "SPIRV/GlslangToSpv.h"
-#include "SPIRV/Logger.h"
-#include "SPIRV/SpvTools.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/SPIRV/Logger.h"
+#include "glslang/SPIRV/SpvTools.h"
 
 static_assert(sizeof(glslang_spv_options_t) == sizeof(glslang::SpvOptions), "");
 
diff --git a/SPIRV/CMakeLists.txt b/glslang/SPIRV/CMakeLists.txt
similarity index 98%
rename from SPIRV/CMakeLists.txt
rename to glslang/SPIRV/CMakeLists.txt
index 2004dd59cf..425682b1fe 100644
--- a/SPIRV/CMakeLists.txt
+++ b/glslang/SPIRV/CMakeLists.txt
@@ -81,7 +81,7 @@ set(PUBLIC_HEADERS
     SPVRemapper.h
     SpvTools.h)
 
-add_library(SPIRV ${LIB_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/../glslang/stub.cpp)
+add_library(SPIRV ${LIB_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/../stub.cpp)
 add_library(glslang::SPIRV ALIAS SPIRV)
 set_target_properties(SPIRV PROPERTIES
     FOLDER glslang
diff --git a/SPIRV/GLSL.ext.AMD.h b/glslang/SPIRV/GLSL.ext.AMD.h
similarity index 100%
rename from SPIRV/GLSL.ext.AMD.h
rename to glslang/SPIRV/GLSL.ext.AMD.h
diff --git a/SPIRV/GLSL.ext.ARM.h b/glslang/SPIRV/GLSL.ext.ARM.h
similarity index 100%
rename from SPIRV/GLSL.ext.ARM.h
rename to glslang/SPIRV/GLSL.ext.ARM.h
diff --git a/SPIRV/GLSL.ext.EXT.h b/glslang/SPIRV/GLSL.ext.EXT.h
similarity index 100%
rename from SPIRV/GLSL.ext.EXT.h
rename to glslang/SPIRV/GLSL.ext.EXT.h
diff --git a/SPIRV/GLSL.ext.KHR.h b/glslang/SPIRV/GLSL.ext.KHR.h
similarity index 100%
rename from SPIRV/GLSL.ext.KHR.h
rename to glslang/SPIRV/GLSL.ext.KHR.h
diff --git a/SPIRV/GLSL.ext.NV.h b/glslang/SPIRV/GLSL.ext.NV.h
similarity index 100%
rename from SPIRV/GLSL.ext.NV.h
rename to glslang/SPIRV/GLSL.ext.NV.h
diff --git a/SPIRV/GLSL.ext.QCOM.h b/glslang/SPIRV/GLSL.ext.QCOM.h
similarity index 100%
rename from SPIRV/GLSL.ext.QCOM.h
rename to glslang/SPIRV/GLSL.ext.QCOM.h
diff --git a/SPIRV/GLSL.std.450.h b/glslang/SPIRV/GLSL.std.450.h
similarity index 100%
rename from SPIRV/GLSL.std.450.h
rename to glslang/SPIRV/GLSL.std.450.h
diff --git a/SPIRV/GlslangToSpv.cpp b/glslang/SPIRV/GlslangToSpv.cpp
similarity index 99%
rename from SPIRV/GlslangToSpv.cpp
rename to glslang/SPIRV/GlslangToSpv.cpp
index 0fdec041f2..02c7203955 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/glslang/SPIRV/GlslangToSpv.cpp
@@ -56,9 +56,9 @@ namespace spv {
 }
 
 // Glslang includes
-#include "../glslang/MachineIndependent/localintermediate.h"
-#include "../glslang/MachineIndependent/SymbolTable.h"
-#include "../glslang/Include/Common.h"
+#include "glslang/MachineIndependent/localintermediate.h"
+#include "glslang/MachineIndependent/SymbolTable.h"
+#include "glslang/Include/Common.h"
 
 // Build-time generated includes
 #include "glslang/build_info.h"
diff --git a/SPIRV/GlslangToSpv.h b/glslang/SPIRV/GlslangToSpv.h
similarity index 100%
rename from SPIRV/GlslangToSpv.h
rename to glslang/SPIRV/GlslangToSpv.h
diff --git a/SPIRV/InReadableOrder.cpp b/glslang/SPIRV/InReadableOrder.cpp
similarity index 100%
rename from SPIRV/InReadableOrder.cpp
rename to glslang/SPIRV/InReadableOrder.cpp
diff --git a/SPIRV/Logger.cpp b/glslang/SPIRV/Logger.cpp
similarity index 100%
rename from SPIRV/Logger.cpp
rename to glslang/SPIRV/Logger.cpp
diff --git a/SPIRV/Logger.h b/glslang/SPIRV/Logger.h
similarity index 100%
rename from SPIRV/Logger.h
rename to glslang/SPIRV/Logger.h
diff --git a/SPIRV/NonSemanticDebugPrintf.h b/glslang/SPIRV/NonSemanticDebugPrintf.h
similarity index 100%
rename from SPIRV/NonSemanticDebugPrintf.h
rename to glslang/SPIRV/NonSemanticDebugPrintf.h
diff --git a/SPIRV/NonSemanticShaderDebugInfo100.h b/glslang/SPIRV/NonSemanticShaderDebugInfo100.h
similarity index 100%
rename from SPIRV/NonSemanticShaderDebugInfo100.h
rename to glslang/SPIRV/NonSemanticShaderDebugInfo100.h
diff --git a/SPIRV/SPVRemapper.cpp b/glslang/SPIRV/SPVRemapper.cpp
similarity index 100%
rename from SPIRV/SPVRemapper.cpp
rename to glslang/SPIRV/SPVRemapper.cpp
diff --git a/SPIRV/SPVRemapper.h b/glslang/SPIRV/SPVRemapper.h
similarity index 100%
rename from SPIRV/SPVRemapper.h
rename to glslang/SPIRV/SPVRemapper.h
diff --git a/SPIRV/SpvBuilder.cpp b/glslang/SPIRV/SpvBuilder.cpp
similarity index 100%
rename from SPIRV/SpvBuilder.cpp
rename to glslang/SPIRV/SpvBuilder.cpp
diff --git a/SPIRV/SpvBuilder.h b/glslang/SPIRV/SpvBuilder.h
similarity index 100%
rename from SPIRV/SpvBuilder.h
rename to glslang/SPIRV/SpvBuilder.h
diff --git a/SPIRV/SpvPostProcess.cpp b/glslang/SPIRV/SpvPostProcess.cpp
similarity index 100%
rename from SPIRV/SpvPostProcess.cpp
rename to glslang/SPIRV/SpvPostProcess.cpp
diff --git a/SPIRV/SpvTools.cpp b/glslang/SPIRV/SpvTools.cpp
similarity index 100%
rename from SPIRV/SpvTools.cpp
rename to glslang/SPIRV/SpvTools.cpp
diff --git a/SPIRV/SpvTools.h b/glslang/SPIRV/SpvTools.h
similarity index 100%
rename from SPIRV/SpvTools.h
rename to glslang/SPIRV/SpvTools.h
diff --git a/SPIRV/bitutils.h b/glslang/SPIRV/bitutils.h
similarity index 100%
rename from SPIRV/bitutils.h
rename to glslang/SPIRV/bitutils.h
diff --git a/SPIRV/disassemble.cpp b/glslang/SPIRV/disassemble.cpp
similarity index 100%
rename from SPIRV/disassemble.cpp
rename to glslang/SPIRV/disassemble.cpp
diff --git a/SPIRV/disassemble.h b/glslang/SPIRV/disassemble.h
similarity index 100%
rename from SPIRV/disassemble.h
rename to glslang/SPIRV/disassemble.h
diff --git a/SPIRV/doc.cpp b/glslang/SPIRV/doc.cpp
similarity index 100%
rename from SPIRV/doc.cpp
rename to glslang/SPIRV/doc.cpp
diff --git a/SPIRV/doc.h b/glslang/SPIRV/doc.h
similarity index 100%
rename from SPIRV/doc.h
rename to glslang/SPIRV/doc.h
diff --git a/SPIRV/hex_float.h b/glslang/SPIRV/hex_float.h
similarity index 100%
rename from SPIRV/hex_float.h
rename to glslang/SPIRV/hex_float.h
diff --git a/SPIRV/spirv.hpp b/glslang/SPIRV/spirv.hpp
similarity index 100%
rename from SPIRV/spirv.hpp
rename to glslang/SPIRV/spirv.hpp
diff --git a/SPIRV/spvIR.h b/glslang/SPIRV/spvIR.h
similarity index 100%
rename from SPIRV/spvIR.h
rename to glslang/SPIRV/spvIR.h
diff --git a/gtests/HexFloat.cpp b/gtests/HexFloat.cpp
index 0a11d96149..70dc92ed79 100644
--- a/gtests/HexFloat.cpp
+++ b/gtests/HexFloat.cpp
@@ -20,7 +20,7 @@
 #include <tuple>
 
 #include <gmock/gmock.h>
-#include "SPIRV/hex_float.h"
+#include "glslang/SPIRV/hex_float.h"
 
 namespace {
 using ::testing::Eq;
diff --git a/gtests/TestFixture.h b/gtests/TestFixture.h
index 68bb3c6a85..baab967f1f 100644
--- a/gtests/TestFixture.h
+++ b/gtests/TestFixture.h
@@ -45,10 +45,10 @@
 
 #include <gtest/gtest.h>
 
-#include "SPIRV/GlslangToSpv.h"
-#include "SPIRV/disassemble.h"
-#include "SPIRV/doc.h"
-#include "SPIRV/SPVRemapper.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/SPIRV/disassemble.h"
+#include "glslang/SPIRV/doc.h"
+#include "glslang/SPIRV/SPVRemapper.h"
 #include "glslang/Include/Types.h"
 #include "glslang/Public/ResourceLimits.h"
 #include "glslang/Public/ShaderLang.h"
@@ -378,7 +378,7 @@ class GlslangTest : public GT {
 
         glslang::TProgram program;
         program.addShader(&shader);
-        
+
         success &= program.link(controls);
         if (success)
             program.mapIO();
diff --git a/license-checker.cfg b/license-checker.cfg
index 15b8f9729e..7d404dcce1 100644
--- a/license-checker.cfg
+++ b/license-checker.cfg
@@ -34,10 +34,10 @@
                     "Test/**",
                     "External/spirv-tools/**",
 
-                    "SPIRV/GLSL.*.h",
-                    "SPIRV/NonSemanticDebugPrintf.h",
-                    "SPIRV/NonSemanticShaderDebugInfo100.h",
-                    "SPIRV/spirv.hpp"
+                    "glslang/SPIRV/GLSL.*.h",
+                    "glslang/SPIRV/NonSemanticDebugPrintf.h",
+                    "glslang/SPIRV/NonSemanticShaderDebugInfo100.h",
+                    "glslang/SPIRV/spirv.hpp"
                 ]
             }
         ]
diff --git a/ndk_test/test.cpp b/ndk_test/test.cpp
index dec53d01f5..dc0f3cf930 100644
--- a/ndk_test/test.cpp
+++ b/ndk_test/test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "SPIRV/GlslangToSpv.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
 
 void android_main(struct android_app* state) {
   int version = glslang::GetSpirvGeneratorVersion();