commit 648a9edc065ad9600af293f20e794198677a1726
author Jason Macnak <natsu@google.com> Fri May 19 10:31:36 2023 -0700
committer Jason Macnak <natsu@google.com> Fri May 19 15:09:46 2023 -0700
tree fab4b9510d337bb6dcbe798c88443d4e01245798
parent 70c637469588ffcd2f75c607bd39ee58f1ae6b7a

Rename stream-servers to host

Bug: b/271464937
Test: m
Change-Id: I89553dfe2e27170e1e968e234b364f13e76b2f88

Android.bp

diff --git a/Android.bp b/Android.bp
index 828c866..89e0385 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,10 +41,10 @@
         ".",
         "include",
         "gl-host-common/include",
-        "stream-servers",
-        "stream-servers/gl",
-        "stream-servers/gl/glestranslator/include",
-        "stream-servers/vulkan",
+        "host",
+        "host/gl",
+        "host/gl/glestranslator/include",
+        "host/vulkan",
         "utils/include",
     ],
     header_libs: [
@@ -67,7 +67,7 @@
     name: "gfxstream_x11_headers",
     host_supported: true,
     export_include_dirs: [
-        "stream-servers/apigen-codec-common",
+        "host/apigen-codec-common",
     ],
     apex_available: [
         "//apex_available:platform",

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a8cc12..9846d81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,7 +142,7 @@
 
 add_subdirectory(utils)
 add_subdirectory(gl-host-common)
-add_subdirectory(stream-servers)
+add_subdirectory(host)
 
 # Protocols and associated code generators######################################
 

host/Android.bp

diff --git a/stream-servers/Android.bp b/host/Android.bp
similarity index 100%
rename from stream-servers/Android.bp
rename to host/Android.bp

host/BlobManager.cpp

diff --git a/stream-servers/BlobManager.cpp b/host/BlobManager.cpp
similarity index 100%
rename from stream-servers/BlobManager.cpp
rename to host/BlobManager.cpp

host/BlobManager.h

diff --git a/stream-servers/BlobManager.h b/host/BlobManager.h
similarity index 100%
rename from stream-servers/BlobManager.h
rename to host/BlobManager.h

host/BorrowedImage.h

diff --git a/stream-servers/BorrowedImage.h b/host/BorrowedImage.h
similarity index 100%
rename from stream-servers/BorrowedImage.h
rename to host/BorrowedImage.h

host/Buffer.cpp

diff --git a/stream-servers/Buffer.cpp b/host/Buffer.cpp
similarity index 100%
rename from stream-servers/Buffer.cpp
rename to host/Buffer.cpp

host/Buffer.h

diff --git a/stream-servers/Buffer.h b/host/Buffer.h
similarity index 100%
rename from stream-servers/Buffer.h
rename to host/Buffer.h

host/CMakeLists.txt

diff --git a/stream-servers/CMakeLists.txt b/host/CMakeLists.txt
similarity index 92%
rename from stream-servers/CMakeLists.txt
rename to host/CMakeLists.txt
index 26b3df5..c33493f 100644
--- a/stream-servers/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -77,13 +77,13 @@
         PUBLIC
         ${GFXSTREAM_REPO_ROOT}
         ${GFXSTREAM_REPO_ROOT}/include
-        ${GFXSTREAM_REPO_ROOT}/stream-servers
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/gl
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glestranslator/include
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/magma
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/magma/magma_dec
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/vulkan
+        ${GFXSTREAM_REPO_ROOT}/host
+        ${GFXSTREAM_REPO_ROOT}/host/apigen-codec-common
+        ${GFXSTREAM_REPO_ROOT}/host/gl
+        ${GFXSTREAM_REPO_ROOT}/host/gl/glestranslator/include
+        ${GFXSTREAM_REPO_ROOT}/host/magma
+        ${GFXSTREAM_REPO_ROOT}/host/magma/magma_dec
+        ${GFXSTREAM_REPO_ROOT}/host/vulkan
         ${GFXSTREAM_REPO_ROOT}/third-party/fuchsia/magma/include
         ${GFXSTREAM_REPO_ROOT}/third-party/glm/include)
 
@@ -184,11 +184,11 @@
         PUBLIC
         ${GFXSTREAM_REPO_ROOT}
         ${GFXSTREAM_REPO_ROOT}/include
-        ${GFXSTREAM_REPO_ROOT}/stream-servers
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glestranslator/GLES_CM
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glestranslator/include
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/vulkan)
+        ${GFXSTREAM_REPO_ROOT}/host
+        ${GFXSTREAM_REPO_ROOT}/host/gl/glestranslator/GLES_CM
+        ${GFXSTREAM_REPO_ROOT}/host/gl/glestranslator/include
+        ${GFXSTREAM_REPO_ROOT}/host/apigen-codec-common
+        ${GFXSTREAM_REPO_ROOT}/host/vulkan)
     target_link_libraries(
         stream-server-testing-support
         PUBLIC

host/ChannelStream.cpp

diff --git a/stream-servers/ChannelStream.cpp b/host/ChannelStream.cpp
similarity index 100%
rename from stream-servers/ChannelStream.cpp
rename to host/ChannelStream.cpp

host/ChannelStream.h

diff --git a/stream-servers/ChannelStream.h b/host/ChannelStream.h
similarity index 100%
rename from stream-servers/ChannelStream.h
rename to host/ChannelStream.h

host/ColorBuffer.cpp

diff --git a/stream-servers/ColorBuffer.cpp b/host/ColorBuffer.cpp
similarity index 100%
rename from stream-servers/ColorBuffer.cpp
rename to host/ColorBuffer.cpp

host/ColorBuffer.h

diff --git a/stream-servers/ColorBuffer.h b/host/ColorBuffer.h
similarity index 100%
rename from stream-servers/ColorBuffer.h
rename to host/ColorBuffer.h

host/Compositor.h

diff --git a/stream-servers/Compositor.h b/host/Compositor.h
similarity index 100%
rename from stream-servers/Compositor.h
rename to host/Compositor.h

host/ContextHelper.h

diff --git a/stream-servers/ContextHelper.h b/host/ContextHelper.h
similarity index 100%
rename from stream-servers/ContextHelper.h
rename to host/ContextHelper.h

host/Display.h

diff --git a/stream-servers/Display.h b/host/Display.h
similarity index 100%
rename from stream-servers/Display.h
rename to host/Display.h

host/DisplaySurface.cpp

diff --git a/stream-servers/DisplaySurface.cpp b/host/DisplaySurface.cpp
similarity index 100%
rename from stream-servers/DisplaySurface.cpp
rename to host/DisplaySurface.cpp

host/DisplaySurface.h

diff --git a/stream-servers/DisplaySurface.h b/host/DisplaySurface.h
similarity index 100%
rename from stream-servers/DisplaySurface.h
rename to host/DisplaySurface.h

host/DisplaySurfaceUser.cpp

diff --git a/stream-servers/DisplaySurfaceUser.cpp b/host/DisplaySurfaceUser.cpp
similarity index 100%
rename from stream-servers/DisplaySurfaceUser.cpp
rename to host/DisplaySurfaceUser.cpp

host/DisplaySurfaceUser.h

diff --git a/stream-servers/DisplaySurfaceUser.h b/host/DisplaySurfaceUser.h
similarity index 100%
rename from stream-servers/DisplaySurfaceUser.h
rename to host/DisplaySurfaceUser.h

host/FrameBuffer.cpp

diff --git a/stream-servers/FrameBuffer.cpp b/host/FrameBuffer.cpp
similarity index 100%
rename from stream-servers/FrameBuffer.cpp
rename to host/FrameBuffer.cpp

host/FrameBuffer.h

diff --git a/stream-servers/FrameBuffer.h b/host/FrameBuffer.h
similarity index 100%
rename from stream-servers/FrameBuffer.h
rename to host/FrameBuffer.h

host/FrameworkFormats.h

diff --git a/stream-servers/FrameworkFormats.h b/host/FrameworkFormats.h
similarity index 100%
rename from stream-servers/FrameworkFormats.h
rename to host/FrameworkFormats.h

host/GfxStreamAgents.cpp

diff --git a/stream-servers/GfxStreamAgents.cpp b/host/GfxStreamAgents.cpp
similarity index 100%
rename from stream-servers/GfxStreamAgents.cpp
rename to host/GfxStreamAgents.cpp

host/GfxStreamAgents.h

diff --git a/stream-servers/GfxStreamAgents.h b/host/GfxStreamAgents.h
similarity index 100%
rename from stream-servers/GfxStreamAgents.h
rename to host/GfxStreamAgents.h

host/GfxStreamBackendInitOverride.cpp

diff --git a/stream-servers/GfxStreamBackendInitOverride.cpp b/host/GfxStreamBackendInitOverride.cpp
similarity index 100%
rename from stream-servers/GfxStreamBackendInitOverride.cpp
rename to host/GfxStreamBackendInitOverride.cpp

host/Handle.h

diff --git a/stream-servers/Handle.h b/host/Handle.h
similarity index 100%
rename from stream-servers/Handle.h
rename to host/Handle.h

host/Hwc2.cpp

diff --git a/stream-servers/Hwc2.cpp b/host/Hwc2.cpp
similarity index 100%
rename from stream-servers/Hwc2.cpp
rename to host/Hwc2.cpp

host/Hwc2.h

diff --git a/stream-servers/Hwc2.h b/host/Hwc2.h
similarity index 100%
rename from stream-servers/Hwc2.h
rename to host/Hwc2.h

host/NativeSubWindow.h

diff --git a/stream-servers/NativeSubWindow.h b/host/NativeSubWindow.h
similarity index 100%
rename from stream-servers/NativeSubWindow.h
rename to host/NativeSubWindow.h

host/NativeSubWindow_android.cpp

diff --git a/stream-servers/NativeSubWindow_android.cpp b/host/NativeSubWindow_android.cpp
similarity index 100%
rename from stream-servers/NativeSubWindow_android.cpp
rename to host/NativeSubWindow_android.cpp

host/NativeSubWindow_cocoa.m

diff --git a/stream-servers/NativeSubWindow_cocoa.m b/host/NativeSubWindow_cocoa.m
similarity index 100%
rename from stream-servers/NativeSubWindow_cocoa.m
rename to host/NativeSubWindow_cocoa.m

host/NativeSubWindow_win32.cpp

diff --git a/stream-servers/NativeSubWindow_win32.cpp b/host/NativeSubWindow_win32.cpp
similarity index 100%
rename from stream-servers/NativeSubWindow_win32.cpp
rename to host/NativeSubWindow_win32.cpp

host/NativeSubWindow_x11.cpp

diff --git a/stream-servers/NativeSubWindow_x11.cpp b/host/NativeSubWindow_x11.cpp
similarity index 100%
rename from stream-servers/NativeSubWindow_x11.cpp
rename to host/NativeSubWindow_x11.cpp

host/PostCommands.h

diff --git a/stream-servers/PostCommands.h b/host/PostCommands.h
similarity index 100%
rename from stream-servers/PostCommands.h
rename to host/PostCommands.h

host/PostWorker.cpp

diff --git a/stream-servers/PostWorker.cpp b/host/PostWorker.cpp
similarity index 100%
rename from stream-servers/PostWorker.cpp
rename to host/PostWorker.cpp

host/PostWorker.h

diff --git a/stream-servers/PostWorker.h b/host/PostWorker.h
similarity index 100%
rename from stream-servers/PostWorker.h
rename to host/PostWorker.h

host/PostWorkerGl.cpp

diff --git a/stream-servers/PostWorkerGl.cpp b/host/PostWorkerGl.cpp
similarity index 100%
rename from stream-servers/PostWorkerGl.cpp
rename to host/PostWorkerGl.cpp

host/PostWorkerGl.h

diff --git a/stream-servers/PostWorkerGl.h b/host/PostWorkerGl.h
similarity index 100%
rename from stream-servers/PostWorkerGl.h
rename to host/PostWorkerGl.h

host/ReadBuffer.cpp

diff --git a/stream-servers/ReadBuffer.cpp b/host/ReadBuffer.cpp
similarity index 100%
rename from stream-servers/ReadBuffer.cpp
rename to host/ReadBuffer.cpp

host/ReadBuffer.h

diff --git a/stream-servers/ReadBuffer.h b/host/ReadBuffer.h
similarity index 100%
rename from stream-servers/ReadBuffer.h
rename to host/ReadBuffer.h

host/ReadbackWorker.h

diff --git a/stream-servers/ReadbackWorker.h b/host/ReadbackWorker.h
similarity index 100%
rename from stream-servers/ReadbackWorker.h
rename to host/ReadbackWorker.h

host/RenderChannelImpl.cpp

diff --git a/stream-servers/RenderChannelImpl.cpp b/host/RenderChannelImpl.cpp
similarity index 100%
rename from stream-servers/RenderChannelImpl.cpp
rename to host/RenderChannelImpl.cpp

host/RenderChannelImpl.h

diff --git a/stream-servers/RenderChannelImpl.h b/host/RenderChannelImpl.h
similarity index 100%
rename from stream-servers/RenderChannelImpl.h
rename to host/RenderChannelImpl.h

host/RenderControl.cpp

diff --git a/stream-servers/RenderControl.cpp b/host/RenderControl.cpp
similarity index 99%
rename from stream-servers/RenderControl.cpp
rename to host/RenderControl.cpp
index 902cdbf..7c0abad 100644
--- a/stream-servers/RenderControl.cpp
+++ b/host/RenderControl.cpp
@@ -36,7 +36,7 @@
 #include "host-common/misc.h"
 #include "host-common/opengl/misc.h"
 #include "host-common/sync_device.h"
-#include "stream-servers/compressedTextureFormats/AstcCpuDecompressor.h"
+#include "host/compressedTextureFormats/AstcCpuDecompressor.h"
 #include "vulkan/VkCommonOperations.h"
 #include "vulkan/VkDecoderGlobalState.h"
 

host/RenderControl.h

diff --git a/stream-servers/RenderControl.h b/host/RenderControl.h
similarity index 100%
rename from stream-servers/RenderControl.h
rename to host/RenderControl.h

host/RenderLibImpl.cpp

diff --git a/stream-servers/RenderLibImpl.cpp b/host/RenderLibImpl.cpp
similarity index 100%
rename from stream-servers/RenderLibImpl.cpp
rename to host/RenderLibImpl.cpp

host/RenderLibImpl.h

diff --git a/stream-servers/RenderLibImpl.h b/host/RenderLibImpl.h
similarity index 100%
rename from stream-servers/RenderLibImpl.h
rename to host/RenderLibImpl.h

host/RenderThread.cpp

diff --git a/stream-servers/RenderThread.cpp b/host/RenderThread.cpp
similarity index 100%
rename from stream-servers/RenderThread.cpp
rename to host/RenderThread.cpp

host/RenderThread.h

diff --git a/stream-servers/RenderThread.h b/host/RenderThread.h
similarity index 100%
rename from stream-servers/RenderThread.h
rename to host/RenderThread.h

host/RenderThreadInfo.cpp

diff --git a/stream-servers/RenderThreadInfo.cpp b/host/RenderThreadInfo.cpp
similarity index 100%
rename from stream-servers/RenderThreadInfo.cpp
rename to host/RenderThreadInfo.cpp

host/RenderThreadInfo.h

diff --git a/stream-servers/RenderThreadInfo.h b/host/RenderThreadInfo.h
similarity index 100%
rename from stream-servers/RenderThreadInfo.h
rename to host/RenderThreadInfo.h

host/RenderThreadInfoGl.cpp

diff --git a/stream-servers/RenderThreadInfoGl.cpp b/host/RenderThreadInfoGl.cpp
similarity index 100%
rename from stream-servers/RenderThreadInfoGl.cpp
rename to host/RenderThreadInfoGl.cpp

host/RenderThreadInfoGl.h

diff --git a/stream-servers/RenderThreadInfoGl.h b/host/RenderThreadInfoGl.h
similarity index 100%
rename from stream-servers/RenderThreadInfoGl.h
rename to host/RenderThreadInfoGl.h

host/RenderThreadInfoMagma.cpp

diff --git a/stream-servers/RenderThreadInfoMagma.cpp b/host/RenderThreadInfoMagma.cpp
similarity index 100%
rename from stream-servers/RenderThreadInfoMagma.cpp
rename to host/RenderThreadInfoMagma.cpp

host/RenderThreadInfoMagma.h

diff --git a/stream-servers/RenderThreadInfoMagma.h b/host/RenderThreadInfoMagma.h
similarity index 100%
rename from stream-servers/RenderThreadInfoMagma.h
rename to host/RenderThreadInfoMagma.h

host/RenderWindow.cpp

diff --git a/stream-servers/RenderWindow.cpp b/host/RenderWindow.cpp
similarity index 100%
rename from stream-servers/RenderWindow.cpp
rename to host/RenderWindow.cpp

host/RenderWindow.h

diff --git a/stream-servers/RenderWindow.h b/host/RenderWindow.h
similarity index 100%
rename from stream-servers/RenderWindow.h
rename to host/RenderWindow.h

host/RendererImpl.cpp

diff --git a/stream-servers/RendererImpl.cpp b/host/RendererImpl.cpp
similarity index 100%
rename from stream-servers/RendererImpl.cpp
rename to host/RendererImpl.cpp

host/RendererImpl.h

diff --git a/stream-servers/RendererImpl.h b/host/RendererImpl.h
similarity index 100%
rename from stream-servers/RendererImpl.h
rename to host/RendererImpl.h

host/RingStream.cpp

diff --git a/stream-servers/RingStream.cpp b/host/RingStream.cpp
similarity index 100%
rename from stream-servers/RingStream.cpp
rename to host/RingStream.cpp

host/RingStream.h

diff --git a/stream-servers/RingStream.h b/host/RingStream.h
similarity index 100%
rename from stream-servers/RingStream.h
rename to host/RingStream.h

host/StalePtrRegistry.h

diff --git a/stream-servers/StalePtrRegistry.h b/host/StalePtrRegistry.h
similarity index 100%
rename from stream-servers/StalePtrRegistry.h
rename to host/StalePtrRegistry.h

host/SyncThread.cpp

diff --git a/stream-servers/SyncThread.cpp b/host/SyncThread.cpp
similarity index 100%
rename from stream-servers/SyncThread.cpp
rename to host/SyncThread.cpp

host/SyncThread.h

diff --git a/stream-servers/SyncThread.h b/host/SyncThread.h
similarity index 100%
rename from stream-servers/SyncThread.h
rename to host/SyncThread.h

host/VirtioGpuTimelines.cpp

diff --git a/stream-servers/VirtioGpuTimelines.cpp b/host/VirtioGpuTimelines.cpp
similarity index 100%
rename from stream-servers/VirtioGpuTimelines.cpp
rename to host/VirtioGpuTimelines.cpp

host/VirtioGpuTimelines.h

diff --git a/stream-servers/VirtioGpuTimelines.h b/host/VirtioGpuTimelines.h
similarity index 100%
rename from stream-servers/VirtioGpuTimelines.h
rename to host/VirtioGpuTimelines.h

host/VsyncThread.cpp

diff --git a/stream-servers/VsyncThread.cpp b/host/VsyncThread.cpp
similarity index 100%
rename from stream-servers/VsyncThread.cpp
rename to host/VsyncThread.cpp

host/VsyncThread.h

diff --git a/stream-servers/VsyncThread.h b/host/VsyncThread.h
similarity index 100%
rename from stream-servers/VsyncThread.h
rename to host/VsyncThread.h

host/apigen-codec-common/Android.bp

diff --git a/stream-servers/apigen-codec-common/Android.bp b/host/apigen-codec-common/Android.bp
similarity index 100%
rename from stream-servers/apigen-codec-common/Android.bp
rename to host/apigen-codec-common/Android.bp

host/apigen-codec-common/CMakeLists.txt

diff --git a/stream-servers/apigen-codec-common/CMakeLists.txt b/host/apigen-codec-common/CMakeLists.txt
similarity index 87%
rename from stream-servers/apigen-codec-common/CMakeLists.txt
rename to host/apigen-codec-common/CMakeLists.txt
index b775694..c9dd664 100644
--- a/stream-servers/apigen-codec-common/CMakeLists.txt
+++ b/host/apigen-codec-common/CMakeLists.txt
@@ -25,7 +25,7 @@
 target_include_directories(
     apigen-codec-common
     PUBLIC
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common
+    ${GFXSTREAM_REPO_ROOT}/host/apigen-codec-common
     PRIVATE
-    ${GFXSTREAM_REPO_ROOT}/stream-servers
+    ${GFXSTREAM_REPO_ROOT}/host
     ${GFXSTREAM_REPO_ROOT}/include)

host/apigen-codec-common/ChecksumCalculator.cpp

diff --git a/stream-servers/apigen-codec-common/ChecksumCalculator.cpp b/host/apigen-codec-common/ChecksumCalculator.cpp
similarity index 100%
rename from stream-servers/apigen-codec-common/ChecksumCalculator.cpp
rename to host/apigen-codec-common/ChecksumCalculator.cpp

host/apigen-codec-common/ChecksumCalculator.h

diff --git a/stream-servers/apigen-codec-common/ChecksumCalculator.h b/host/apigen-codec-common/ChecksumCalculator.h
similarity index 100%
rename from stream-servers/apigen-codec-common/ChecksumCalculator.h
rename to host/apigen-codec-common/ChecksumCalculator.h

host/apigen-codec-common/ChecksumCalculatorThreadInfo.cpp

diff --git a/stream-servers/apigen-codec-common/ChecksumCalculatorThreadInfo.cpp b/host/apigen-codec-common/ChecksumCalculatorThreadInfo.cpp
similarity index 100%
rename from stream-servers/apigen-codec-common/ChecksumCalculatorThreadInfo.cpp
rename to host/apigen-codec-common/ChecksumCalculatorThreadInfo.cpp

host/apigen-codec-common/ChecksumCalculatorThreadInfo.h

diff --git a/stream-servers/apigen-codec-common/ChecksumCalculatorThreadInfo.h b/host/apigen-codec-common/ChecksumCalculatorThreadInfo.h
similarity index 100%
rename from stream-servers/apigen-codec-common/ChecksumCalculatorThreadInfo.h
rename to host/apigen-codec-common/ChecksumCalculatorThreadInfo.h

host/apigen-codec-common/GL/dri_interface.h

diff --git a/stream-servers/apigen-codec-common/GL/dri_interface.h b/host/apigen-codec-common/GL/dri_interface.h
similarity index 100%
rename from stream-servers/apigen-codec-common/GL/dri_interface.h
rename to host/apigen-codec-common/GL/dri_interface.h

host/apigen-codec-common/GL/gl.h

diff --git a/stream-servers/apigen-codec-common/GL/gl.h b/host/apigen-codec-common/GL/gl.h
similarity index 100%
rename from stream-servers/apigen-codec-common/GL/gl.h
rename to host/apigen-codec-common/GL/gl.h

host/apigen-codec-common/GL/gl_mangle.h

diff --git a/stream-servers/apigen-codec-common/GL/gl_mangle.h b/host/apigen-codec-common/GL/gl_mangle.h
similarity index 100%
rename from stream-servers/apigen-codec-common/GL/gl_mangle.h
rename to host/apigen-codec-common/GL/gl_mangle.h

host/apigen-codec-common/GL/glext.h

diff --git a/stream-servers/apigen-codec-common/GL/glext.h b/host/apigen-codec-common/GL/glext.h
similarity index 100%
rename from stream-servers/apigen-codec-common/GL/glext.h
rename to host/apigen-codec-common/GL/glext.h

host/apigen-codec-common/GL/glx.h

diff --git a/stream-servers/apigen-codec-common/GL/glx.h b/host/apigen-codec-common/GL/glx.h
similarity index 100%
rename from stream-servers/apigen-codec-common/GL/glx.h
rename to host/apigen-codec-common/GL/glx.h

host/apigen-codec-common/GL/glx_mangle.h

diff --git a/stream-servers/apigen-codec-common/GL/glx_mangle.h b/host/apigen-codec-common/GL/glx_mangle.h
similarity index 100%
rename from stream-servers/apigen-codec-common/GL/glx_mangle.h
rename to host/apigen-codec-common/GL/glx_mangle.h

host/apigen-codec-common/GL/glxext.h

diff --git a/stream-servers/apigen-codec-common/GL/glxext.h b/host/apigen-codec-common/GL/glxext.h
similarity index 100%
rename from stream-servers/apigen-codec-common/GL/glxext.h
rename to host/apigen-codec-common/GL/glxext.h

host/apigen-codec-common/GL/internal/dri_interface.h

diff --git a/stream-servers/apigen-codec-common/GL/internal/dri_interface.h b/host/apigen-codec-common/GL/internal/dri_interface.h
similarity index 100%
rename from stream-servers/apigen-codec-common/GL/internal/dri_interface.h
rename to host/apigen-codec-common/GL/internal/dri_interface.h

host/apigen-codec-common/GLDecoderContextData.h

diff --git a/stream-servers/apigen-codec-common/GLDecoderContextData.h b/host/apigen-codec-common/GLDecoderContextData.h
similarity index 100%
rename from stream-servers/apigen-codec-common/GLDecoderContextData.h
rename to host/apigen-codec-common/GLDecoderContextData.h

host/apigen-codec-common/Makefile

diff --git a/stream-servers/apigen-codec-common/Makefile b/host/apigen-codec-common/Makefile
similarity index 100%
rename from stream-servers/apigen-codec-common/Makefile
rename to host/apigen-codec-common/Makefile

host/apigen-codec-common/ProtocolUtils.h

diff --git a/stream-servers/apigen-codec-common/ProtocolUtils.h b/host/apigen-codec-common/ProtocolUtils.h
similarity index 100%
rename from stream-servers/apigen-codec-common/ProtocolUtils.h
rename to host/apigen-codec-common/ProtocolUtils.h

host/apigen-codec-common/X11/DECkeysym.h

diff --git a/stream-servers/apigen-codec-common/X11/DECkeysym.h b/host/apigen-codec-common/X11/DECkeysym.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/DECkeysym.h
rename to host/apigen-codec-common/X11/DECkeysym.h

host/apigen-codec-common/X11/HPkeysym.h

diff --git a/stream-servers/apigen-codec-common/X11/HPkeysym.h b/host/apigen-codec-common/X11/HPkeysym.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/HPkeysym.h
rename to host/apigen-codec-common/X11/HPkeysym.h

host/apigen-codec-common/X11/ImUtil.h

diff --git a/stream-servers/apigen-codec-common/X11/ImUtil.h b/host/apigen-codec-common/X11/ImUtil.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/ImUtil.h
rename to host/apigen-codec-common/X11/ImUtil.h

host/apigen-codec-common/X11/Sunkeysym.h

diff --git a/stream-servers/apigen-codec-common/X11/Sunkeysym.h b/host/apigen-codec-common/X11/Sunkeysym.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Sunkeysym.h
rename to host/apigen-codec-common/X11/Sunkeysym.h

host/apigen-codec-common/X11/X.h

diff --git a/stream-servers/apigen-codec-common/X11/X.h b/host/apigen-codec-common/X11/X.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/X.h
rename to host/apigen-codec-common/X11/X.h

host/apigen-codec-common/X11/XF86keysym.h

diff --git a/stream-servers/apigen-codec-common/X11/XF86keysym.h b/host/apigen-codec-common/X11/XF86keysym.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/XF86keysym.h
rename to host/apigen-codec-common/X11/XF86keysym.h

host/apigen-codec-common/X11/XKBlib.h

diff --git a/stream-servers/apigen-codec-common/X11/XKBlib.h b/host/apigen-codec-common/X11/XKBlib.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/XKBlib.h
rename to host/apigen-codec-common/X11/XKBlib.h

host/apigen-codec-common/X11/XWDFile.h

diff --git a/stream-servers/apigen-codec-common/X11/XWDFile.h b/host/apigen-codec-common/X11/XWDFile.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/XWDFile.h
rename to host/apigen-codec-common/X11/XWDFile.h

host/apigen-codec-common/X11/Xalloca.h

diff --git a/stream-servers/apigen-codec-common/X11/Xalloca.h b/host/apigen-codec-common/X11/Xalloca.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xalloca.h
rename to host/apigen-codec-common/X11/Xalloca.h

host/apigen-codec-common/X11/Xarch.h

diff --git a/stream-servers/apigen-codec-common/X11/Xarch.h b/host/apigen-codec-common/X11/Xarch.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xarch.h
rename to host/apigen-codec-common/X11/Xarch.h

host/apigen-codec-common/X11/Xatom.h

diff --git a/stream-servers/apigen-codec-common/X11/Xatom.h b/host/apigen-codec-common/X11/Xatom.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xatom.h
rename to host/apigen-codec-common/X11/Xatom.h

host/apigen-codec-common/X11/Xcms.h

diff --git a/stream-servers/apigen-codec-common/X11/Xcms.h b/host/apigen-codec-common/X11/Xcms.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xcms.h
rename to host/apigen-codec-common/X11/Xcms.h

host/apigen-codec-common/X11/Xdefs.h

diff --git a/stream-servers/apigen-codec-common/X11/Xdefs.h b/host/apigen-codec-common/X11/Xdefs.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xdefs.h
rename to host/apigen-codec-common/X11/Xdefs.h

host/apigen-codec-common/X11/Xfuncproto.h

diff --git a/stream-servers/apigen-codec-common/X11/Xfuncproto.h b/host/apigen-codec-common/X11/Xfuncproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xfuncproto.h
rename to host/apigen-codec-common/X11/Xfuncproto.h

host/apigen-codec-common/X11/Xfuncs.h

diff --git a/stream-servers/apigen-codec-common/X11/Xfuncs.h b/host/apigen-codec-common/X11/Xfuncs.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xfuncs.h
rename to host/apigen-codec-common/X11/Xfuncs.h

host/apigen-codec-common/X11/Xlib.h

diff --git a/stream-servers/apigen-codec-common/X11/Xlib.h b/host/apigen-codec-common/X11/Xlib.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xlib.h
rename to host/apigen-codec-common/X11/Xlib.h

host/apigen-codec-common/X11/XlibConf.h

diff --git a/stream-servers/apigen-codec-common/X11/XlibConf.h b/host/apigen-codec-common/X11/XlibConf.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/XlibConf.h
rename to host/apigen-codec-common/X11/XlibConf.h

host/apigen-codec-common/X11/Xlibint.h

diff --git a/stream-servers/apigen-codec-common/X11/Xlibint.h b/host/apigen-codec-common/X11/Xlibint.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xlibint.h
rename to host/apigen-codec-common/X11/Xlibint.h

host/apigen-codec-common/X11/Xlocale.h

diff --git a/stream-servers/apigen-codec-common/X11/Xlocale.h b/host/apigen-codec-common/X11/Xlocale.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xlocale.h
rename to host/apigen-codec-common/X11/Xlocale.h

host/apigen-codec-common/X11/Xmd.h

diff --git a/stream-servers/apigen-codec-common/X11/Xmd.h b/host/apigen-codec-common/X11/Xmd.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xmd.h
rename to host/apigen-codec-common/X11/Xmd.h

host/apigen-codec-common/X11/Xos.h

diff --git a/stream-servers/apigen-codec-common/X11/Xos.h b/host/apigen-codec-common/X11/Xos.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xos.h
rename to host/apigen-codec-common/X11/Xos.h

host/apigen-codec-common/X11/Xos_r.h

diff --git a/stream-servers/apigen-codec-common/X11/Xos_r.h b/host/apigen-codec-common/X11/Xos_r.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xos_r.h
rename to host/apigen-codec-common/X11/Xos_r.h

host/apigen-codec-common/X11/Xosdefs.h

diff --git a/stream-servers/apigen-codec-common/X11/Xosdefs.h b/host/apigen-codec-common/X11/Xosdefs.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xosdefs.h
rename to host/apigen-codec-common/X11/Xosdefs.h

host/apigen-codec-common/X11/Xpoll.h

diff --git a/stream-servers/apigen-codec-common/X11/Xpoll.h b/host/apigen-codec-common/X11/Xpoll.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xpoll.h
rename to host/apigen-codec-common/X11/Xpoll.h

host/apigen-codec-common/X11/Xproto.h

diff --git a/stream-servers/apigen-codec-common/X11/Xproto.h b/host/apigen-codec-common/X11/Xproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xproto.h
rename to host/apigen-codec-common/X11/Xproto.h

host/apigen-codec-common/X11/Xprotostr.h

diff --git a/stream-servers/apigen-codec-common/X11/Xprotostr.h b/host/apigen-codec-common/X11/Xprotostr.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xprotostr.h
rename to host/apigen-codec-common/X11/Xprotostr.h

host/apigen-codec-common/X11/Xregion.h

diff --git a/stream-servers/apigen-codec-common/X11/Xregion.h b/host/apigen-codec-common/X11/Xregion.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xregion.h
rename to host/apigen-codec-common/X11/Xregion.h

host/apigen-codec-common/X11/Xresource.h

diff --git a/stream-servers/apigen-codec-common/X11/Xresource.h b/host/apigen-codec-common/X11/Xresource.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xresource.h
rename to host/apigen-codec-common/X11/Xresource.h

host/apigen-codec-common/X11/Xthreads.h

diff --git a/stream-servers/apigen-codec-common/X11/Xthreads.h b/host/apigen-codec-common/X11/Xthreads.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xthreads.h
rename to host/apigen-codec-common/X11/Xthreads.h

host/apigen-codec-common/X11/Xutil.h

diff --git a/stream-servers/apigen-codec-common/X11/Xutil.h b/host/apigen-codec-common/X11/Xutil.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xutil.h
rename to host/apigen-codec-common/X11/Xutil.h

host/apigen-codec-common/X11/Xw32defs.h

diff --git a/stream-servers/apigen-codec-common/X11/Xw32defs.h b/host/apigen-codec-common/X11/Xw32defs.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xw32defs.h
rename to host/apigen-codec-common/X11/Xw32defs.h

host/apigen-codec-common/X11/Xwindows.h

diff --git a/stream-servers/apigen-codec-common/X11/Xwindows.h b/host/apigen-codec-common/X11/Xwindows.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xwindows.h
rename to host/apigen-codec-common/X11/Xwindows.h

host/apigen-codec-common/X11/Xwinsock.h

diff --git a/stream-servers/apigen-codec-common/X11/Xwinsock.h b/host/apigen-codec-common/X11/Xwinsock.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/Xwinsock.h
rename to host/apigen-codec-common/X11/Xwinsock.h

host/apigen-codec-common/X11/ap_keysym.h

diff --git a/stream-servers/apigen-codec-common/X11/ap_keysym.h b/host/apigen-codec-common/X11/ap_keysym.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/ap_keysym.h
rename to host/apigen-codec-common/X11/ap_keysym.h

host/apigen-codec-common/X11/cursorfont.h

diff --git a/stream-servers/apigen-codec-common/X11/cursorfont.h b/host/apigen-codec-common/X11/cursorfont.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/cursorfont.h
rename to host/apigen-codec-common/X11/cursorfont.h

host/apigen-codec-common/X11/extensions/EVI.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/EVI.h b/host/apigen-codec-common/X11/extensions/EVI.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/EVI.h
rename to host/apigen-codec-common/X11/extensions/EVI.h

host/apigen-codec-common/X11/extensions/EVIproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/EVIproto.h b/host/apigen-codec-common/X11/extensions/EVIproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/EVIproto.h
rename to host/apigen-codec-common/X11/extensions/EVIproto.h

host/apigen-codec-common/X11/extensions/MITMisc.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/MITMisc.h b/host/apigen-codec-common/X11/extensions/MITMisc.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/MITMisc.h
rename to host/apigen-codec-common/X11/extensions/MITMisc.h

host/apigen-codec-common/X11/extensions/XEVI.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XEVI.h b/host/apigen-codec-common/X11/extensions/XEVI.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XEVI.h
rename to host/apigen-codec-common/X11/extensions/XEVI.h

host/apigen-codec-common/X11/extensions/XI.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XI.h b/host/apigen-codec-common/X11/extensions/XI.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XI.h
rename to host/apigen-codec-common/X11/extensions/XI.h

host/apigen-codec-common/X11/extensions/XI2.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XI2.h b/host/apigen-codec-common/X11/extensions/XI2.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XI2.h
rename to host/apigen-codec-common/X11/extensions/XI2.h

host/apigen-codec-common/X11/extensions/XI2proto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XI2proto.h b/host/apigen-codec-common/X11/extensions/XI2proto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XI2proto.h
rename to host/apigen-codec-common/X11/extensions/XI2proto.h

host/apigen-codec-common/X11/extensions/XInput.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XInput.h b/host/apigen-codec-common/X11/extensions/XInput.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XInput.h
rename to host/apigen-codec-common/X11/extensions/XInput.h

host/apigen-codec-common/X11/extensions/XInput2.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XInput2.h b/host/apigen-codec-common/X11/extensions/XInput2.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XInput2.h
rename to host/apigen-codec-common/X11/extensions/XInput2.h

host/apigen-codec-common/X11/extensions/XIproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XIproto.h b/host/apigen-codec-common/X11/extensions/XIproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XIproto.h
rename to host/apigen-codec-common/X11/extensions/XIproto.h

host/apigen-codec-common/X11/extensions/XKB.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XKB.h b/host/apigen-codec-common/X11/extensions/XKB.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XKB.h
rename to host/apigen-codec-common/X11/extensions/XKB.h

host/apigen-codec-common/X11/extensions/XKBgeom.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XKBgeom.h b/host/apigen-codec-common/X11/extensions/XKBgeom.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XKBgeom.h
rename to host/apigen-codec-common/X11/extensions/XKBgeom.h

host/apigen-codec-common/X11/extensions/XKBproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XKBproto.h b/host/apigen-codec-common/X11/extensions/XKBproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XKBproto.h
rename to host/apigen-codec-common/X11/extensions/XKBproto.h

host/apigen-codec-common/X11/extensions/XKBsrv.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XKBsrv.h b/host/apigen-codec-common/X11/extensions/XKBsrv.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XKBsrv.h
rename to host/apigen-codec-common/X11/extensions/XKBsrv.h

host/apigen-codec-common/X11/extensions/XKBstr.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XKBstr.h b/host/apigen-codec-common/X11/extensions/XKBstr.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XKBstr.h
rename to host/apigen-codec-common/X11/extensions/XKBstr.h

host/apigen-codec-common/X11/extensions/XLbx.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XLbx.h b/host/apigen-codec-common/X11/extensions/XLbx.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XLbx.h
rename to host/apigen-codec-common/X11/extensions/XLbx.h

host/apigen-codec-common/X11/extensions/XShm.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/XShm.h b/host/apigen-codec-common/X11/extensions/XShm.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/XShm.h
rename to host/apigen-codec-common/X11/extensions/XShm.h

host/apigen-codec-common/X11/extensions/Xag.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/Xag.h b/host/apigen-codec-common/X11/extensions/Xag.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/Xag.h
rename to host/apigen-codec-common/X11/extensions/Xag.h

host/apigen-codec-common/X11/extensions/Xcup.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/Xcup.h b/host/apigen-codec-common/X11/extensions/Xcup.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/Xcup.h
rename to host/apigen-codec-common/X11/extensions/Xcup.h

host/apigen-codec-common/X11/extensions/Xdbe.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/Xdbe.h b/host/apigen-codec-common/X11/extensions/Xdbe.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/Xdbe.h
rename to host/apigen-codec-common/X11/extensions/Xdbe.h

host/apigen-codec-common/X11/extensions/Xext.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/Xext.h b/host/apigen-codec-common/X11/extensions/Xext.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/Xext.h
rename to host/apigen-codec-common/X11/extensions/Xext.h

host/apigen-codec-common/X11/extensions/Xfixes.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/Xfixes.h b/host/apigen-codec-common/X11/extensions/Xfixes.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/Xfixes.h
rename to host/apigen-codec-common/X11/extensions/Xfixes.h

host/apigen-codec-common/X11/extensions/Xge.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/Xge.h b/host/apigen-codec-common/X11/extensions/Xge.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/Xge.h
rename to host/apigen-codec-common/X11/extensions/Xge.h

host/apigen-codec-common/X11/extensions/ag.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/ag.h b/host/apigen-codec-common/X11/extensions/ag.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/ag.h
rename to host/apigen-codec-common/X11/extensions/ag.h

host/apigen-codec-common/X11/extensions/agproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/agproto.h b/host/apigen-codec-common/X11/extensions/agproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/agproto.h
rename to host/apigen-codec-common/X11/extensions/agproto.h

host/apigen-codec-common/X11/extensions/cup.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/cup.h b/host/apigen-codec-common/X11/extensions/cup.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/cup.h
rename to host/apigen-codec-common/X11/extensions/cup.h

host/apigen-codec-common/X11/extensions/cupproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/cupproto.h b/host/apigen-codec-common/X11/extensions/cupproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/cupproto.h
rename to host/apigen-codec-common/X11/extensions/cupproto.h

host/apigen-codec-common/X11/extensions/dbe.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/dbe.h b/host/apigen-codec-common/X11/extensions/dbe.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/dbe.h
rename to host/apigen-codec-common/X11/extensions/dbe.h

host/apigen-codec-common/X11/extensions/dbeproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/dbeproto.h b/host/apigen-codec-common/X11/extensions/dbeproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/dbeproto.h
rename to host/apigen-codec-common/X11/extensions/dbeproto.h

host/apigen-codec-common/X11/extensions/dpms.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/dpms.h b/host/apigen-codec-common/X11/extensions/dpms.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/dpms.h
rename to host/apigen-codec-common/X11/extensions/dpms.h

host/apigen-codec-common/X11/extensions/dpmsconst.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/dpmsconst.h b/host/apigen-codec-common/X11/extensions/dpmsconst.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/dpmsconst.h
rename to host/apigen-codec-common/X11/extensions/dpmsconst.h

host/apigen-codec-common/X11/extensions/dpmsproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/dpmsproto.h b/host/apigen-codec-common/X11/extensions/dpmsproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/dpmsproto.h
rename to host/apigen-codec-common/X11/extensions/dpmsproto.h

host/apigen-codec-common/X11/extensions/extutil.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/extutil.h b/host/apigen-codec-common/X11/extensions/extutil.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/extutil.h
rename to host/apigen-codec-common/X11/extensions/extutil.h

host/apigen-codec-common/X11/extensions/ge.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/ge.h b/host/apigen-codec-common/X11/extensions/ge.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/ge.h
rename to host/apigen-codec-common/X11/extensions/ge.h

host/apigen-codec-common/X11/extensions/geproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/geproto.h b/host/apigen-codec-common/X11/extensions/geproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/geproto.h
rename to host/apigen-codec-common/X11/extensions/geproto.h

host/apigen-codec-common/X11/extensions/lbx.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/lbx.h b/host/apigen-codec-common/X11/extensions/lbx.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/lbx.h
rename to host/apigen-codec-common/X11/extensions/lbx.h

host/apigen-codec-common/X11/extensions/lbxproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/lbxproto.h b/host/apigen-codec-common/X11/extensions/lbxproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/lbxproto.h
rename to host/apigen-codec-common/X11/extensions/lbxproto.h

host/apigen-codec-common/X11/extensions/mitmiscconst.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/mitmiscconst.h b/host/apigen-codec-common/X11/extensions/mitmiscconst.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/mitmiscconst.h
rename to host/apigen-codec-common/X11/extensions/mitmiscconst.h

host/apigen-codec-common/X11/extensions/mitmiscproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/mitmiscproto.h b/host/apigen-codec-common/X11/extensions/mitmiscproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/mitmiscproto.h
rename to host/apigen-codec-common/X11/extensions/mitmiscproto.h

host/apigen-codec-common/X11/extensions/multibuf.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/multibuf.h b/host/apigen-codec-common/X11/extensions/multibuf.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/multibuf.h
rename to host/apigen-codec-common/X11/extensions/multibuf.h

host/apigen-codec-common/X11/extensions/multibufconst.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/multibufconst.h b/host/apigen-codec-common/X11/extensions/multibufconst.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/multibufconst.h
rename to host/apigen-codec-common/X11/extensions/multibufconst.h

host/apigen-codec-common/X11/extensions/multibufproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/multibufproto.h b/host/apigen-codec-common/X11/extensions/multibufproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/multibufproto.h
rename to host/apigen-codec-common/X11/extensions/multibufproto.h

host/apigen-codec-common/X11/extensions/secur.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/secur.h b/host/apigen-codec-common/X11/extensions/secur.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/secur.h
rename to host/apigen-codec-common/X11/extensions/secur.h

host/apigen-codec-common/X11/extensions/security.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/security.h b/host/apigen-codec-common/X11/extensions/security.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/security.h
rename to host/apigen-codec-common/X11/extensions/security.h

host/apigen-codec-common/X11/extensions/securproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/securproto.h b/host/apigen-codec-common/X11/extensions/securproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/securproto.h
rename to host/apigen-codec-common/X11/extensions/securproto.h

host/apigen-codec-common/X11/extensions/shape.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/shape.h b/host/apigen-codec-common/X11/extensions/shape.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/shape.h
rename to host/apigen-codec-common/X11/extensions/shape.h

host/apigen-codec-common/X11/extensions/shapeconst.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/shapeconst.h b/host/apigen-codec-common/X11/extensions/shapeconst.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/shapeconst.h
rename to host/apigen-codec-common/X11/extensions/shapeconst.h

host/apigen-codec-common/X11/extensions/shapeproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/shapeproto.h b/host/apigen-codec-common/X11/extensions/shapeproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/shapeproto.h
rename to host/apigen-codec-common/X11/extensions/shapeproto.h

host/apigen-codec-common/X11/extensions/shapestr.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/shapestr.h b/host/apigen-codec-common/X11/extensions/shapestr.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/shapestr.h
rename to host/apigen-codec-common/X11/extensions/shapestr.h

host/apigen-codec-common/X11/extensions/shm.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/shm.h b/host/apigen-codec-common/X11/extensions/shm.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/shm.h
rename to host/apigen-codec-common/X11/extensions/shm.h

host/apigen-codec-common/X11/extensions/shmproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/shmproto.h b/host/apigen-codec-common/X11/extensions/shmproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/shmproto.h
rename to host/apigen-codec-common/X11/extensions/shmproto.h

host/apigen-codec-common/X11/extensions/shmstr.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/shmstr.h b/host/apigen-codec-common/X11/extensions/shmstr.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/shmstr.h
rename to host/apigen-codec-common/X11/extensions/shmstr.h

host/apigen-codec-common/X11/extensions/sync.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/sync.h b/host/apigen-codec-common/X11/extensions/sync.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/sync.h
rename to host/apigen-codec-common/X11/extensions/sync.h

host/apigen-codec-common/X11/extensions/syncconst.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/syncconst.h b/host/apigen-codec-common/X11/extensions/syncconst.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/syncconst.h
rename to host/apigen-codec-common/X11/extensions/syncconst.h

host/apigen-codec-common/X11/extensions/syncproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/syncproto.h b/host/apigen-codec-common/X11/extensions/syncproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/syncproto.h
rename to host/apigen-codec-common/X11/extensions/syncproto.h

host/apigen-codec-common/X11/extensions/syncstr.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/syncstr.h b/host/apigen-codec-common/X11/extensions/syncstr.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/syncstr.h
rename to host/apigen-codec-common/X11/extensions/syncstr.h

host/apigen-codec-common/X11/extensions/xfixesproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/xfixesproto.h b/host/apigen-codec-common/X11/extensions/xfixesproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/xfixesproto.h
rename to host/apigen-codec-common/X11/extensions/xfixesproto.h

host/apigen-codec-common/X11/extensions/xfixeswire.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/xfixeswire.h b/host/apigen-codec-common/X11/extensions/xfixeswire.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/xfixeswire.h
rename to host/apigen-codec-common/X11/extensions/xfixeswire.h

host/apigen-codec-common/X11/extensions/xtestconst.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/xtestconst.h b/host/apigen-codec-common/X11/extensions/xtestconst.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/xtestconst.h
rename to host/apigen-codec-common/X11/extensions/xtestconst.h

host/apigen-codec-common/X11/extensions/xtestext1.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/xtestext1.h b/host/apigen-codec-common/X11/extensions/xtestext1.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/xtestext1.h
rename to host/apigen-codec-common/X11/extensions/xtestext1.h

host/apigen-codec-common/X11/extensions/xtestext1const.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/xtestext1const.h b/host/apigen-codec-common/X11/extensions/xtestext1const.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/xtestext1const.h
rename to host/apigen-codec-common/X11/extensions/xtestext1const.h

host/apigen-codec-common/X11/extensions/xtestext1proto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/xtestext1proto.h b/host/apigen-codec-common/X11/extensions/xtestext1proto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/xtestext1proto.h
rename to host/apigen-codec-common/X11/extensions/xtestext1proto.h

host/apigen-codec-common/X11/extensions/xtestproto.h

diff --git a/stream-servers/apigen-codec-common/X11/extensions/xtestproto.h b/host/apigen-codec-common/X11/extensions/xtestproto.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/extensions/xtestproto.h
rename to host/apigen-codec-common/X11/extensions/xtestproto.h

host/apigen-codec-common/X11/keysym.h

diff --git a/stream-servers/apigen-codec-common/X11/keysym.h b/host/apigen-codec-common/X11/keysym.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/keysym.h
rename to host/apigen-codec-common/X11/keysym.h

host/apigen-codec-common/X11/keysymdef.h

diff --git a/stream-servers/apigen-codec-common/X11/keysymdef.h b/host/apigen-codec-common/X11/keysymdef.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11/keysymdef.h
rename to host/apigen-codec-common/X11/keysymdef.h

host/apigen-codec-common/X11Support.cpp

diff --git a/stream-servers/apigen-codec-common/X11Support.cpp b/host/apigen-codec-common/X11Support.cpp
similarity index 100%
rename from stream-servers/apigen-codec-common/X11Support.cpp
rename to host/apigen-codec-common/X11Support.cpp

host/apigen-codec-common/X11Support.h

diff --git a/stream-servers/apigen-codec-common/X11Support.h b/host/apigen-codec-common/X11Support.h
similarity index 100%
rename from stream-servers/apigen-codec-common/X11Support.h
rename to host/apigen-codec-common/X11Support.h

host/apigen-codec-common/glUtils.cpp

diff --git a/stream-servers/apigen-codec-common/glUtils.cpp b/host/apigen-codec-common/glUtils.cpp
similarity index 100%
rename from stream-servers/apigen-codec-common/glUtils.cpp
rename to host/apigen-codec-common/glUtils.cpp

host/apigen-codec-common/glUtils.h

diff --git a/stream-servers/apigen-codec-common/glUtils.h b/host/apigen-codec-common/glUtils.h
similarity index 100%
rename from stream-servers/apigen-codec-common/glUtils.h
rename to host/apigen-codec-common/glUtils.h

host/apigen-codec-common/gl_base_types.h

diff --git a/stream-servers/apigen-codec-common/gl_base_types.h b/host/apigen-codec-common/gl_base_types.h
similarity index 100%
rename from stream-servers/apigen-codec-common/gl_base_types.h
rename to host/apigen-codec-common/gl_base_types.h

host/compressedTextureFormats/Android.bp

diff --git a/stream-servers/compressedTextureFormats/Android.bp b/host/compressedTextureFormats/Android.bp
similarity index 100%
rename from stream-servers/compressedTextureFormats/Android.bp
rename to host/compressedTextureFormats/Android.bp

host/compressedTextureFormats/AstcCpuDecompressor.h

diff --git a/stream-servers/compressedTextureFormats/AstcCpuDecompressor.h b/host/compressedTextureFormats/AstcCpuDecompressor.h
similarity index 100%
rename from stream-servers/compressedTextureFormats/AstcCpuDecompressor.h
rename to host/compressedTextureFormats/AstcCpuDecompressor.h

host/compressedTextureFormats/AstcCpuDecompressorImpl.cpp

diff --git a/stream-servers/compressedTextureFormats/AstcCpuDecompressorImpl.cpp b/host/compressedTextureFormats/AstcCpuDecompressorImpl.cpp
similarity index 100%
rename from stream-servers/compressedTextureFormats/AstcCpuDecompressorImpl.cpp
rename to host/compressedTextureFormats/AstcCpuDecompressorImpl.cpp

host/compressedTextureFormats/AstcCpuDecompressorNoOp.cpp

diff --git a/stream-servers/compressedTextureFormats/AstcCpuDecompressorNoOp.cpp b/host/compressedTextureFormats/AstcCpuDecompressorNoOp.cpp
similarity index 100%
rename from stream-servers/compressedTextureFormats/AstcCpuDecompressorNoOp.cpp
rename to host/compressedTextureFormats/AstcCpuDecompressorNoOp.cpp

host/compressedTextureFormats/AstcCpuDecompressor_unittest.cpp

diff --git a/stream-servers/compressedTextureFormats/AstcCpuDecompressor_unittest.cpp b/host/compressedTextureFormats/AstcCpuDecompressor_unittest.cpp
similarity index 100%
rename from stream-servers/compressedTextureFormats/AstcCpuDecompressor_unittest.cpp
rename to host/compressedTextureFormats/AstcCpuDecompressor_unittest.cpp

host/compressedTextureFormats/CMakeLists.txt

diff --git a/stream-servers/compressedTextureFormats/CMakeLists.txt b/host/compressedTextureFormats/CMakeLists.txt
similarity index 100%
rename from stream-servers/compressedTextureFormats/CMakeLists.txt
rename to host/compressedTextureFormats/CMakeLists.txt

host/compressedTextureFormats/etc.cpp

diff --git a/stream-servers/compressedTextureFormats/etc.cpp b/host/compressedTextureFormats/etc.cpp
similarity index 100%
rename from stream-servers/compressedTextureFormats/etc.cpp
rename to host/compressedTextureFormats/etc.cpp

host/compressedTextureFormats/etc.h

diff --git a/stream-servers/compressedTextureFormats/etc.h b/host/compressedTextureFormats/etc.h
similarity index 100%
rename from stream-servers/compressedTextureFormats/etc.h
rename to host/compressedTextureFormats/etc.h

host/drm_fourcc.h

diff --git a/stream-servers/drm_fourcc.h b/host/drm_fourcc.h
similarity index 100%
rename from stream-servers/drm_fourcc.h
rename to host/drm_fourcc.h

host/gfxstream_unittest.cpp

diff --git a/stream-servers/gfxstream_unittest.cpp b/host/gfxstream_unittest.cpp
similarity index 100%
rename from stream-servers/gfxstream_unittest.cpp
rename to host/gfxstream_unittest.cpp

host/gl/Android.bp

diff --git a/stream-servers/gl/Android.bp b/host/gl/Android.bp
similarity index 100%
rename from stream-servers/gl/Android.bp
rename to host/gl/Android.bp

host/gl/BorrowedImageGl.h

diff --git a/stream-servers/gl/BorrowedImageGl.h b/host/gl/BorrowedImageGl.h
similarity index 100%
rename from stream-servers/gl/BorrowedImageGl.h
rename to host/gl/BorrowedImageGl.h

host/gl/BufferGl.cpp

diff --git a/stream-servers/gl/BufferGl.cpp b/host/gl/BufferGl.cpp
similarity index 100%
rename from stream-servers/gl/BufferGl.cpp
rename to host/gl/BufferGl.cpp

host/gl/BufferGl.h

diff --git a/stream-servers/gl/BufferGl.h b/host/gl/BufferGl.h
similarity index 100%
rename from stream-servers/gl/BufferGl.h
rename to host/gl/BufferGl.h

host/gl/CMakeLists.txt

diff --git a/stream-servers/gl/CMakeLists.txt b/host/gl/CMakeLists.txt
similarity index 91%
rename from stream-servers/gl/CMakeLists.txt
rename to host/gl/CMakeLists.txt
index 14a16d5..54e3ab2 100644
--- a/stream-servers/gl/CMakeLists.txt
+++ b/host/gl/CMakeLists.txt
@@ -52,6 +52,6 @@
                            ${GFXSTREAM_REPO_ROOT}
                            ${GFXSTREAM_REPO_ROOT}/gldispatch/include
                            ${GFXSTREAM_REPO_ROOT}/include
-                           ${GFXSTREAM_REPO_ROOT}/stream-servers
-                           ${GFXSTREAM_REPO_ROOT}/stream-servers/gl
+                           ${GFXSTREAM_REPO_ROOT}/host
+                           ${GFXSTREAM_REPO_ROOT}/host/gl
                            ${GFXSTREAM_REPO_ROOT}/third-party/glm/include)

host/gl/ColorBufferGl.cpp

diff --git a/stream-servers/gl/ColorBufferGl.cpp b/host/gl/ColorBufferGl.cpp
similarity index 100%
rename from stream-servers/gl/ColorBufferGl.cpp
rename to host/gl/ColorBufferGl.cpp

host/gl/ColorBufferGl.h

diff --git a/stream-servers/gl/ColorBufferGl.h b/host/gl/ColorBufferGl.h
similarity index 100%
rename from stream-servers/gl/ColorBufferGl.h
rename to host/gl/ColorBufferGl.h

host/gl/CompositorGl.cpp

diff --git a/stream-servers/gl/CompositorGl.cpp b/host/gl/CompositorGl.cpp
similarity index 100%
rename from stream-servers/gl/CompositorGl.cpp
rename to host/gl/CompositorGl.cpp

host/gl/CompositorGl.h

diff --git a/stream-servers/gl/CompositorGl.h b/host/gl/CompositorGl.h
similarity index 100%
rename from stream-servers/gl/CompositorGl.h
rename to host/gl/CompositorGl.h

host/gl/DebugGl.cpp

diff --git a/stream-servers/gl/DebugGl.cpp b/host/gl/DebugGl.cpp
similarity index 100%
rename from stream-servers/gl/DebugGl.cpp
rename to host/gl/DebugGl.cpp

host/gl/DebugGl.h

diff --git a/stream-servers/gl/DebugGl.h b/host/gl/DebugGl.h
similarity index 100%
rename from stream-servers/gl/DebugGl.h
rename to host/gl/DebugGl.h

host/gl/DisplayGl.cpp

diff --git a/stream-servers/gl/DisplayGl.cpp b/host/gl/DisplayGl.cpp
similarity index 100%
rename from stream-servers/gl/DisplayGl.cpp
rename to host/gl/DisplayGl.cpp

host/gl/DisplayGl.h

diff --git a/stream-servers/gl/DisplayGl.h b/host/gl/DisplayGl.h
similarity index 100%
rename from stream-servers/gl/DisplayGl.h
rename to host/gl/DisplayGl.h

host/gl/DisplaySurfaceGl.cpp

diff --git a/stream-servers/gl/DisplaySurfaceGl.cpp b/host/gl/DisplaySurfaceGl.cpp
similarity index 100%
rename from stream-servers/gl/DisplaySurfaceGl.cpp
rename to host/gl/DisplaySurfaceGl.cpp

host/gl/DisplaySurfaceGl.h

diff --git a/stream-servers/gl/DisplaySurfaceGl.h b/host/gl/DisplaySurfaceGl.h
similarity index 100%
rename from stream-servers/gl/DisplaySurfaceGl.h
rename to host/gl/DisplaySurfaceGl.h

host/gl/EmulatedEglConfig.cpp

diff --git a/stream-servers/gl/EmulatedEglConfig.cpp b/host/gl/EmulatedEglConfig.cpp
similarity index 100%
rename from stream-servers/gl/EmulatedEglConfig.cpp
rename to host/gl/EmulatedEglConfig.cpp

host/gl/EmulatedEglConfig.h

diff --git a/stream-servers/gl/EmulatedEglConfig.h b/host/gl/EmulatedEglConfig.h
similarity index 100%
rename from stream-servers/gl/EmulatedEglConfig.h
rename to host/gl/EmulatedEglConfig.h

host/gl/EmulatedEglContext.cpp

diff --git a/stream-servers/gl/EmulatedEglContext.cpp b/host/gl/EmulatedEglContext.cpp
similarity index 100%
rename from stream-servers/gl/EmulatedEglContext.cpp
rename to host/gl/EmulatedEglContext.cpp

host/gl/EmulatedEglContext.h

diff --git a/stream-servers/gl/EmulatedEglContext.h b/host/gl/EmulatedEglContext.h
similarity index 100%
rename from stream-servers/gl/EmulatedEglContext.h
rename to host/gl/EmulatedEglContext.h

host/gl/EmulatedEglFenceSync.cpp

diff --git a/stream-servers/gl/EmulatedEglFenceSync.cpp b/host/gl/EmulatedEglFenceSync.cpp
similarity index 100%
rename from stream-servers/gl/EmulatedEglFenceSync.cpp
rename to host/gl/EmulatedEglFenceSync.cpp

host/gl/EmulatedEglFenceSync.h

diff --git a/stream-servers/gl/EmulatedEglFenceSync.h b/host/gl/EmulatedEglFenceSync.h
similarity index 100%
rename from stream-servers/gl/EmulatedEglFenceSync.h
rename to host/gl/EmulatedEglFenceSync.h

host/gl/EmulatedEglImage.cpp

diff --git a/stream-servers/gl/EmulatedEglImage.cpp b/host/gl/EmulatedEglImage.cpp
similarity index 100%
rename from stream-servers/gl/EmulatedEglImage.cpp
rename to host/gl/EmulatedEglImage.cpp

host/gl/EmulatedEglImage.h

diff --git a/stream-servers/gl/EmulatedEglImage.h b/host/gl/EmulatedEglImage.h
similarity index 100%
rename from stream-servers/gl/EmulatedEglImage.h
rename to host/gl/EmulatedEglImage.h

host/gl/EmulatedEglWindowSurface.cpp

diff --git a/stream-servers/gl/EmulatedEglWindowSurface.cpp b/host/gl/EmulatedEglWindowSurface.cpp
similarity index 100%
rename from stream-servers/gl/EmulatedEglWindowSurface.cpp
rename to host/gl/EmulatedEglWindowSurface.cpp

host/gl/EmulatedEglWindowSurface.h

diff --git a/stream-servers/gl/EmulatedEglWindowSurface.h b/host/gl/EmulatedEglWindowSurface.h
similarity index 100%
rename from stream-servers/gl/EmulatedEglWindowSurface.h
rename to host/gl/EmulatedEglWindowSurface.h

host/gl/EmulationGl.cpp

diff --git a/stream-servers/gl/EmulationGl.cpp b/host/gl/EmulationGl.cpp
similarity index 100%
rename from stream-servers/gl/EmulationGl.cpp
rename to host/gl/EmulationGl.cpp

host/gl/EmulationGl.h

diff --git a/stream-servers/gl/EmulationGl.h b/host/gl/EmulationGl.h
similarity index 100%
rename from stream-servers/gl/EmulationGl.h
rename to host/gl/EmulationGl.h

host/gl/GLESVersionDetector.cpp

diff --git a/stream-servers/gl/GLESVersionDetector.cpp b/host/gl/GLESVersionDetector.cpp
similarity index 100%
rename from stream-servers/gl/GLESVersionDetector.cpp
rename to host/gl/GLESVersionDetector.cpp

host/gl/GLESVersionDetector.h

diff --git a/stream-servers/gl/GLESVersionDetector.h b/host/gl/GLESVersionDetector.h
similarity index 100%
rename from stream-servers/gl/GLESVersionDetector.h
rename to host/gl/GLESVersionDetector.h

host/gl/OpenGLESDispatch/Android.bp

diff --git a/stream-servers/gl/OpenGLESDispatch/Android.bp b/host/gl/OpenGLESDispatch/Android.bp
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/Android.bp
rename to host/gl/OpenGLESDispatch/Android.bp

host/gl/OpenGLESDispatch/CMakeLists.txt

diff --git a/stream-servers/gl/OpenGLESDispatch/CMakeLists.txt b/host/gl/OpenGLESDispatch/CMakeLists.txt
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/CMakeLists.txt
rename to host/gl/OpenGLESDispatch/CMakeLists.txt

host/gl/OpenGLESDispatch/EGLDispatch.cpp

diff --git a/stream-servers/gl/OpenGLESDispatch/EGLDispatch.cpp b/host/gl/OpenGLESDispatch/EGLDispatch.cpp
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/EGLDispatch.cpp
rename to host/gl/OpenGLESDispatch/EGLDispatch.cpp

host/gl/OpenGLESDispatch/GLESv1Dispatch.cpp

diff --git a/stream-servers/gl/OpenGLESDispatch/GLESv1Dispatch.cpp b/host/gl/OpenGLESDispatch/GLESv1Dispatch.cpp
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/GLESv1Dispatch.cpp
rename to host/gl/OpenGLESDispatch/GLESv1Dispatch.cpp

host/gl/OpenGLESDispatch/GLESv2Dispatch.cpp

diff --git a/stream-servers/gl/OpenGLESDispatch/GLESv2Dispatch.cpp b/host/gl/OpenGLESDispatch/GLESv2Dispatch.cpp
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/GLESv2Dispatch.cpp
rename to host/gl/OpenGLESDispatch/GLESv2Dispatch.cpp

host/gl/OpenGLESDispatch/OpenGLDispatchLoader.cpp

diff --git a/stream-servers/gl/OpenGLESDispatch/OpenGLDispatchLoader.cpp b/host/gl/OpenGLESDispatch/OpenGLDispatchLoader.cpp
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/OpenGLDispatchLoader.cpp
rename to host/gl/OpenGLESDispatch/OpenGLDispatchLoader.cpp

host/gl/OpenGLESDispatch/StaticDispatch.cpp

diff --git a/stream-servers/gl/OpenGLESDispatch/StaticDispatch.cpp b/host/gl/OpenGLESDispatch/StaticDispatch.cpp
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/StaticDispatch.cpp
rename to host/gl/OpenGLESDispatch/StaticDispatch.cpp

host/gl/OpenGLESDispatch/gles12tr.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles12tr.entries b/host/gl/OpenGLESDispatch/gles12tr.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles12tr.entries
rename to host/gl/OpenGLESDispatch/gles12tr.entries

host/gl/OpenGLESDispatch/gles12tr_internal.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles12tr_internal.entries b/host/gl/OpenGLESDispatch/gles12tr_internal.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles12tr_internal.entries
rename to host/gl/OpenGLESDispatch/gles12tr_internal.entries

host/gl/OpenGLESDispatch/gles1_extensions.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles1_extensions.entries b/host/gl/OpenGLESDispatch/gles1_extensions.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles1_extensions.entries
rename to host/gl/OpenGLESDispatch/gles1_extensions.entries

host/gl/OpenGLESDispatch/gles1_extensions_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles1_extensions_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles1_extensions_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles1_extensions_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles1_extensions_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles1_only.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles1_only.entries b/host/gl/OpenGLESDispatch/gles1_only.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles1_only.entries
rename to host/gl/OpenGLESDispatch/gles1_only.entries

host/gl/OpenGLESDispatch/gles1_only_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles1_only_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles1_only_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles1_only_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles1_only_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.cpp

diff --git a/stream-servers/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.cpp b/host/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.cpp
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.cpp
rename to host/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.cpp

host/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.entries b/host/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.entries
rename to host/gl/OpenGLESDispatch/gles1_stubbed_in_translator_namespace.entries

host/gl/OpenGLESDispatch/gles2_extensions.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles2_extensions.entries b/host/gl/OpenGLESDispatch/gles2_extensions.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles2_extensions.entries
rename to host/gl/OpenGLESDispatch/gles2_extensions.entries

host/gl/OpenGLESDispatch/gles2_extensions_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles2_extensions_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles2_extensions_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles2_extensions_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles2_extensions_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles2_only.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles2_only.entries b/host/gl/OpenGLESDispatch/gles2_only.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles2_only.entries
rename to host/gl/OpenGLESDispatch/gles2_only.entries

host/gl/OpenGLESDispatch/gles2_only_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles2_only_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles2_only_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles2_only_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles2_only_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.cpp

diff --git a/stream-servers/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.cpp b/host/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.cpp
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.cpp
rename to host/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.cpp

host/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.entries b/host/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.entries
rename to host/gl/OpenGLESDispatch/gles2_stubbed_in_translator_namespace.entries

host/gl/OpenGLESDispatch/gles31_only.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles31_only.entries b/host/gl/OpenGLESDispatch/gles31_only.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles31_only.entries
rename to host/gl/OpenGLESDispatch/gles31_only.entries

host/gl/OpenGLESDispatch/gles31_only_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles31_only_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles31_only_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles31_only_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles31_only_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles32_only.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles32_only.entries b/host/gl/OpenGLESDispatch/gles32_only.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles32_only.entries
rename to host/gl/OpenGLESDispatch/gles32_only.entries

host/gl/OpenGLESDispatch/gles32_only_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles32_only_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles32_only_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles32_only_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles32_only_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles3_extensions.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles3_extensions.entries b/host/gl/OpenGLESDispatch/gles3_extensions.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles3_extensions.entries
rename to host/gl/OpenGLESDispatch/gles3_extensions.entries

host/gl/OpenGLESDispatch/gles3_extensions_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles3_extensions_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles3_extensions_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles3_extensions_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles3_extensions_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles3_only.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles3_only.entries b/host/gl/OpenGLESDispatch/gles3_only.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles3_only.entries
rename to host/gl/OpenGLESDispatch/gles3_only.entries

host/gl/OpenGLESDispatch/gles3_only_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles3_only_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles3_only_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles3_only_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles3_only_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles_common.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles_common.entries b/host/gl/OpenGLESDispatch/gles_common.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles_common.entries
rename to host/gl/OpenGLESDispatch/gles_common.entries

host/gl/OpenGLESDispatch/gles_common_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles_common_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles_common_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles_common_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles_common_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles_common_for_gles1.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles_common_for_gles1.entries b/host/gl/OpenGLESDispatch/gles_common_for_gles1.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles_common_for_gles1.entries
rename to host/gl/OpenGLESDispatch/gles_common_for_gles1.entries

host/gl/OpenGLESDispatch/gles_common_for_gles2.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles_common_for_gles2.entries b/host/gl/OpenGLESDispatch/gles_common_for_gles2.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles_common_for_gles2.entries
rename to host/gl/OpenGLESDispatch/gles_common_for_gles2.entries

host/gl/OpenGLESDispatch/gles_extensions.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles_extensions.entries b/host/gl/OpenGLESDispatch/gles_extensions.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles_extensions.entries
rename to host/gl/OpenGLESDispatch/gles_extensions.entries

host/gl/OpenGLESDispatch/gles_extensions_dispatch_logging_wrappers.impl

diff --git a/stream-servers/gl/OpenGLESDispatch/gles_extensions_dispatch_logging_wrappers.impl b/host/gl/OpenGLESDispatch/gles_extensions_dispatch_logging_wrappers.impl
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles_extensions_dispatch_logging_wrappers.impl
rename to host/gl/OpenGLESDispatch/gles_extensions_dispatch_logging_wrappers.impl

host/gl/OpenGLESDispatch/gles_extensions_for_gles1.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles_extensions_for_gles1.entries b/host/gl/OpenGLESDispatch/gles_extensions_for_gles1.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles_extensions_for_gles1.entries
rename to host/gl/OpenGLESDispatch/gles_extensions_for_gles1.entries

host/gl/OpenGLESDispatch/gles_extensions_for_gles2.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/gles_extensions_for_gles2.entries b/host/gl/OpenGLESDispatch/gles_extensions_for_gles2.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/gles_extensions_for_gles2.entries
rename to host/gl/OpenGLESDispatch/gles_extensions_for_gles2.entries

host/gl/OpenGLESDispatch/render_egl.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/render_egl.entries b/host/gl/OpenGLESDispatch/render_egl.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/render_egl.entries
rename to host/gl/OpenGLESDispatch/render_egl.entries

host/gl/OpenGLESDispatch/render_egl_extensions.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/render_egl_extensions.entries b/host/gl/OpenGLESDispatch/render_egl_extensions.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/render_egl_extensions.entries
rename to host/gl/OpenGLESDispatch/render_egl_extensions.entries

host/gl/OpenGLESDispatch/render_egl_snapshot.entries

diff --git a/stream-servers/gl/OpenGLESDispatch/render_egl_snapshot.entries b/host/gl/OpenGLESDispatch/render_egl_snapshot.entries
similarity index 100%
rename from stream-servers/gl/OpenGLESDispatch/render_egl_snapshot.entries
rename to host/gl/OpenGLESDispatch/render_egl_snapshot.entries

host/gl/ReadbackWorkerGl.cpp

diff --git a/stream-servers/gl/ReadbackWorkerGl.cpp b/host/gl/ReadbackWorkerGl.cpp
similarity index 100%
rename from stream-servers/gl/ReadbackWorkerGl.cpp
rename to host/gl/ReadbackWorkerGl.cpp

host/gl/ReadbackWorkerGl.h

diff --git a/stream-servers/gl/ReadbackWorkerGl.h b/host/gl/ReadbackWorkerGl.h
similarity index 100%
rename from stream-servers/gl/ReadbackWorkerGl.h
rename to host/gl/ReadbackWorkerGl.h

host/gl/TextureDraw.cpp

diff --git a/stream-servers/gl/TextureDraw.cpp b/host/gl/TextureDraw.cpp
similarity index 100%
rename from stream-servers/gl/TextureDraw.cpp
rename to host/gl/TextureDraw.cpp

host/gl/TextureDraw.h

diff --git a/stream-servers/gl/TextureDraw.h b/host/gl/TextureDraw.h
similarity index 100%
rename from stream-servers/gl/TextureDraw.h
rename to host/gl/TextureDraw.h

host/gl/TextureResize.cpp

diff --git a/stream-servers/gl/TextureResize.cpp b/host/gl/TextureResize.cpp
similarity index 100%
rename from stream-servers/gl/TextureResize.cpp
rename to host/gl/TextureResize.cpp

host/gl/TextureResize.h

diff --git a/stream-servers/gl/TextureResize.h b/host/gl/TextureResize.h
similarity index 100%
rename from stream-servers/gl/TextureResize.h
rename to host/gl/TextureResize.h

host/gl/YUVConverter.cpp

diff --git a/stream-servers/gl/YUVConverter.cpp b/host/gl/YUVConverter.cpp
similarity index 100%
rename from stream-servers/gl/YUVConverter.cpp
rename to host/gl/YUVConverter.cpp

host/gl/YUVConverter.h

diff --git a/stream-servers/gl/YUVConverter.h b/host/gl/YUVConverter.h
similarity index 100%
rename from stream-servers/gl/YUVConverter.h
rename to host/gl/YUVConverter.h

host/gl/gles1_dec/Android.bp

diff --git a/stream-servers/gl/gles1_dec/Android.bp b/host/gl/gles1_dec/Android.bp
similarity index 100%
rename from stream-servers/gl/gles1_dec/Android.bp
rename to host/gl/gles1_dec/Android.bp

host/gl/gles1_dec/CMakeLists.txt

diff --git a/stream-servers/gl/gles1_dec/CMakeLists.txt b/host/gl/gles1_dec/CMakeLists.txt
similarity index 76%
rename from stream-servers/gl/gles1_dec/CMakeLists.txt
rename to host/gl/gles1_dec/CMakeLists.txt
index 2d618d0..9491643 100644
--- a/stream-servers/gl/gles1_dec/CMakeLists.txt
+++ b/host/gl/gles1_dec/CMakeLists.txt
@@ -15,5 +15,5 @@
     PRIVATE
     ${GFXSTREAM_REPO_ROOT}
     ${GFXSTREAM_REPO_ROOT}/include
-    ${GFXSTREAM_REPO_ROOT}/stream-servers
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common)
+    ${GFXSTREAM_REPO_ROOT}/host
+    ${GFXSTREAM_REPO_ROOT}/host/apigen-codec-common)

host/gl/gles1_dec/GLESv1Decoder.cpp

diff --git a/stream-servers/gl/gles1_dec/GLESv1Decoder.cpp b/host/gl/gles1_dec/GLESv1Decoder.cpp
similarity index 100%
rename from stream-servers/gl/gles1_dec/GLESv1Decoder.cpp
rename to host/gl/gles1_dec/GLESv1Decoder.cpp

host/gl/gles1_dec/GLESv1Decoder.h

diff --git a/stream-servers/gl/gles1_dec/GLESv1Decoder.h b/host/gl/gles1_dec/GLESv1Decoder.h
similarity index 100%
rename from stream-servers/gl/gles1_dec/GLESv1Decoder.h
rename to host/gl/gles1_dec/GLESv1Decoder.h

host/gl/gles1_dec/gles1_dec.cpp

diff --git a/stream-servers/gl/gles1_dec/gles1_dec.cpp b/host/gl/gles1_dec/gles1_dec.cpp
similarity index 100%
rename from stream-servers/gl/gles1_dec/gles1_dec.cpp
rename to host/gl/gles1_dec/gles1_dec.cpp

host/gl/gles1_dec/gles1_dec.h

diff --git a/stream-servers/gl/gles1_dec/gles1_dec.h b/host/gl/gles1_dec/gles1_dec.h
similarity index 100%
rename from stream-servers/gl/gles1_dec/gles1_dec.h
rename to host/gl/gles1_dec/gles1_dec.h

host/gl/gles1_dec/gles1_opcodes.h

diff --git a/stream-servers/gl/gles1_dec/gles1_opcodes.h b/host/gl/gles1_dec/gles1_opcodes.h
similarity index 100%
rename from stream-servers/gl/gles1_dec/gles1_opcodes.h
rename to host/gl/gles1_dec/gles1_opcodes.h

host/gl/gles1_dec/gles1_server_context.cpp

diff --git a/stream-servers/gl/gles1_dec/gles1_server_context.cpp b/host/gl/gles1_dec/gles1_server_context.cpp
similarity index 100%
rename from stream-servers/gl/gles1_dec/gles1_server_context.cpp
rename to host/gl/gles1_dec/gles1_server_context.cpp

host/gl/gles1_dec/gles1_server_context.h

diff --git a/stream-servers/gl/gles1_dec/gles1_server_context.h b/host/gl/gles1_dec/gles1_server_context.h
similarity index 100%
rename from stream-servers/gl/gles1_dec/gles1_server_context.h
rename to host/gl/gles1_dec/gles1_server_context.h

host/gl/gles1_dec/gles1_server_proc.h

diff --git a/stream-servers/gl/gles1_dec/gles1_server_proc.h b/host/gl/gles1_dec/gles1_server_proc.h
similarity index 100%
rename from stream-servers/gl/gles1_dec/gles1_server_proc.h
rename to host/gl/gles1_dec/gles1_server_proc.h

host/gl/gles1_dec/gles1_types.h

diff --git a/stream-servers/gl/gles1_dec/gles1_types.h b/host/gl/gles1_dec/gles1_types.h
similarity index 100%
rename from stream-servers/gl/gles1_dec/gles1_types.h
rename to host/gl/gles1_dec/gles1_types.h

host/gl/gles2_dec/Android.bp

diff --git a/stream-servers/gl/gles2_dec/Android.bp b/host/gl/gles2_dec/Android.bp
similarity index 100%
rename from stream-servers/gl/gles2_dec/Android.bp
rename to host/gl/gles2_dec/Android.bp

host/gl/gles2_dec/CMakeLists.txt

diff --git a/stream-servers/gl/gles2_dec/CMakeLists.txt b/host/gl/gles2_dec/CMakeLists.txt
similarity index 77%
rename from stream-servers/gl/gles2_dec/CMakeLists.txt
rename to host/gl/gles2_dec/CMakeLists.txt
index a2db764..be856f5 100644
--- a/stream-servers/gl/gles2_dec/CMakeLists.txt
+++ b/host/gl/gles2_dec/CMakeLists.txt
@@ -16,5 +16,5 @@
     PRIVATE
     ${GFXSTREAM_REPO_ROOT}
     ${GFXSTREAM_REPO_ROOT}/include
-    ${GFXSTREAM_REPO_ROOT}/stream-servers
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common)
+    ${GFXSTREAM_REPO_ROOT}/host
+    ${GFXSTREAM_REPO_ROOT}/host/apigen-codec-common)

host/gl/gles2_dec/GLESv2Decoder.cpp

diff --git a/stream-servers/gl/gles2_dec/GLESv2Decoder.cpp b/host/gl/gles2_dec/GLESv2Decoder.cpp
similarity index 100%
rename from stream-servers/gl/gles2_dec/GLESv2Decoder.cpp
rename to host/gl/gles2_dec/GLESv2Decoder.cpp

host/gl/gles2_dec/GLESv2Decoder.h

diff --git a/stream-servers/gl/gles2_dec/GLESv2Decoder.h b/host/gl/gles2_dec/GLESv2Decoder.h
similarity index 100%
rename from stream-servers/gl/gles2_dec/GLESv2Decoder.h
rename to host/gl/gles2_dec/GLESv2Decoder.h

host/gl/gles2_dec/gles2_dec.cpp

diff --git a/stream-servers/gl/gles2_dec/gles2_dec.cpp b/host/gl/gles2_dec/gles2_dec.cpp
similarity index 100%
rename from stream-servers/gl/gles2_dec/gles2_dec.cpp
rename to host/gl/gles2_dec/gles2_dec.cpp

host/gl/gles2_dec/gles2_dec.h

diff --git a/stream-servers/gl/gles2_dec/gles2_dec.h b/host/gl/gles2_dec/gles2_dec.h
similarity index 100%
rename from stream-servers/gl/gles2_dec/gles2_dec.h
rename to host/gl/gles2_dec/gles2_dec.h

host/gl/gles2_dec/gles2_opcodes.h

diff --git a/stream-servers/gl/gles2_dec/gles2_opcodes.h b/host/gl/gles2_dec/gles2_opcodes.h
similarity index 100%
rename from stream-servers/gl/gles2_dec/gles2_opcodes.h
rename to host/gl/gles2_dec/gles2_opcodes.h

host/gl/gles2_dec/gles2_server_context.cpp

diff --git a/stream-servers/gl/gles2_dec/gles2_server_context.cpp b/host/gl/gles2_dec/gles2_server_context.cpp
similarity index 100%
rename from stream-servers/gl/gles2_dec/gles2_server_context.cpp
rename to host/gl/gles2_dec/gles2_server_context.cpp

host/gl/gles2_dec/gles2_server_context.h

diff --git a/stream-servers/gl/gles2_dec/gles2_server_context.h b/host/gl/gles2_dec/gles2_server_context.h
similarity index 100%
rename from stream-servers/gl/gles2_dec/gles2_server_context.h
rename to host/gl/gles2_dec/gles2_server_context.h

host/gl/gles2_dec/gles2_server_proc.h

diff --git a/stream-servers/gl/gles2_dec/gles2_server_proc.h b/host/gl/gles2_dec/gles2_server_proc.h
similarity index 100%
rename from stream-servers/gl/gles2_dec/gles2_server_proc.h
rename to host/gl/gles2_dec/gles2_server_proc.h

host/gl/gles2_dec/gles2_types.h

diff --git a/stream-servers/gl/gles2_dec/gles2_types.h b/host/gl/gles2_dec/gles2_types.h
similarity index 100%
rename from stream-servers/gl/gles2_dec/gles2_types.h
rename to host/gl/gles2_dec/gles2_types.h

host/gl/glestranslator/CMakeLists.txt

diff --git a/stream-servers/gl/glestranslator/CMakeLists.txt b/host/gl/glestranslator/CMakeLists.txt
similarity index 100%
rename from stream-servers/gl/glestranslator/CMakeLists.txt
rename to host/gl/glestranslator/CMakeLists.txt

host/gl/glestranslator/EGL/Android.bp

diff --git a/stream-servers/gl/glestranslator/EGL/Android.bp b/host/gl/glestranslator/EGL/Android.bp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/Android.bp
rename to host/gl/glestranslator/EGL/Android.bp

host/gl/glestranslator/EGL/CMakeLists.txt

diff --git a/stream-servers/gl/glestranslator/EGL/CMakeLists.txt b/host/gl/glestranslator/EGL/CMakeLists.txt
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/CMakeLists.txt
rename to host/gl/glestranslator/EGL/CMakeLists.txt

host/gl/glestranslator/EGL/ClientAPIExts.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/ClientAPIExts.cpp b/host/gl/glestranslator/EGL/ClientAPIExts.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/ClientAPIExts.cpp
rename to host/gl/glestranslator/EGL/ClientAPIExts.cpp

host/gl/glestranslator/EGL/ClientAPIExts.h

diff --git a/stream-servers/gl/glestranslator/EGL/ClientAPIExts.h b/host/gl/glestranslator/EGL/ClientAPIExts.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/ClientAPIExts.h
rename to host/gl/glestranslator/EGL/ClientAPIExts.h

host/gl/glestranslator/EGL/ClientAPIExts.in

diff --git a/stream-servers/gl/glestranslator/EGL/ClientAPIExts.in b/host/gl/glestranslator/EGL/ClientAPIExts.in
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/ClientAPIExts.in
rename to host/gl/glestranslator/EGL/ClientAPIExts.in

host/gl/glestranslator/EGL/CoreProfileConfigs.h

diff --git a/stream-servers/gl/glestranslator/EGL/CoreProfileConfigs.h b/host/gl/glestranslator/EGL/CoreProfileConfigs.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/CoreProfileConfigs.h
rename to host/gl/glestranslator/EGL/CoreProfileConfigs.h

host/gl/glestranslator/EGL/CoreProfileConfigs_linux.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/CoreProfileConfigs_linux.cpp b/host/gl/glestranslator/EGL/CoreProfileConfigs_linux.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/CoreProfileConfigs_linux.cpp
rename to host/gl/glestranslator/EGL/CoreProfileConfigs_linux.cpp

host/gl/glestranslator/EGL/CoreProfileConfigs_windows.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/CoreProfileConfigs_windows.cpp b/host/gl/glestranslator/EGL/CoreProfileConfigs_windows.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/CoreProfileConfigs_windows.cpp
rename to host/gl/glestranslator/EGL/CoreProfileConfigs_windows.cpp

host/gl/glestranslator/EGL/EglConfig.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglConfig.cpp b/host/gl/glestranslator/EGL/EglConfig.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglConfig.cpp
rename to host/gl/glestranslator/EGL/EglConfig.cpp

host/gl/glestranslator/EGL/EglConfig.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglConfig.h b/host/gl/glestranslator/EGL/EglConfig.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglConfig.h
rename to host/gl/glestranslator/EGL/EglConfig.h

host/gl/glestranslator/EGL/EglContext.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglContext.cpp b/host/gl/glestranslator/EGL/EglContext.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglContext.cpp
rename to host/gl/glestranslator/EGL/EglContext.cpp

host/gl/glestranslator/EGL/EglContext.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglContext.h b/host/gl/glestranslator/EGL/EglContext.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglContext.h
rename to host/gl/glestranslator/EGL/EglContext.h

host/gl/glestranslator/EGL/EglDisplay.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglDisplay.cpp b/host/gl/glestranslator/EGL/EglDisplay.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglDisplay.cpp
rename to host/gl/glestranslator/EGL/EglDisplay.cpp

host/gl/glestranslator/EGL/EglDisplay.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglDisplay.h b/host/gl/glestranslator/EGL/EglDisplay.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglDisplay.h
rename to host/gl/glestranslator/EGL/EglDisplay.h

host/gl/glestranslator/EGL/EglGlobalInfo.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglGlobalInfo.cpp b/host/gl/glestranslator/EGL/EglGlobalInfo.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglGlobalInfo.cpp
rename to host/gl/glestranslator/EGL/EglGlobalInfo.cpp

host/gl/glestranslator/EGL/EglGlobalInfo.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglGlobalInfo.h b/host/gl/glestranslator/EGL/EglGlobalInfo.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglGlobalInfo.h
rename to host/gl/glestranslator/EGL/EglGlobalInfo.h

host/gl/glestranslator/EGL/EglImp.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglImp.cpp b/host/gl/glestranslator/EGL/EglImp.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglImp.cpp
rename to host/gl/glestranslator/EGL/EglImp.cpp

host/gl/glestranslator/EGL/EglOsApi.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglOsApi.h b/host/gl/glestranslator/EGL/EglOsApi.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglOsApi.h
rename to host/gl/glestranslator/EGL/EglOsApi.h

host/gl/glestranslator/EGL/EglOsApi_darwin.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglOsApi_darwin.cpp b/host/gl/glestranslator/EGL/EglOsApi_darwin.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglOsApi_darwin.cpp
rename to host/gl/glestranslator/EGL/EglOsApi_darwin.cpp

host/gl/glestranslator/EGL/EglOsApi_egl.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglOsApi_egl.cpp b/host/gl/glestranslator/EGL/EglOsApi_egl.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglOsApi_egl.cpp
rename to host/gl/glestranslator/EGL/EglOsApi_egl.cpp

host/gl/glestranslator/EGL/EglOsApi_glx.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglOsApi_glx.cpp b/host/gl/glestranslator/EGL/EglOsApi_glx.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglOsApi_glx.cpp
rename to host/gl/glestranslator/EGL/EglOsApi_glx.cpp

host/gl/glestranslator/EGL/EglOsApi_wgl.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglOsApi_wgl.cpp b/host/gl/glestranslator/EGL/EglOsApi_wgl.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglOsApi_wgl.cpp
rename to host/gl/glestranslator/EGL/EglOsApi_wgl.cpp

host/gl/glestranslator/EGL/EglPbufferSurface.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglPbufferSurface.cpp b/host/gl/glestranslator/EGL/EglPbufferSurface.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglPbufferSurface.cpp
rename to host/gl/glestranslator/EGL/EglPbufferSurface.cpp

host/gl/glestranslator/EGL/EglPbufferSurface.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglPbufferSurface.h b/host/gl/glestranslator/EGL/EglPbufferSurface.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglPbufferSurface.h
rename to host/gl/glestranslator/EGL/EglPbufferSurface.h

host/gl/glestranslator/EGL/EglSurface.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglSurface.cpp b/host/gl/glestranslator/EGL/EglSurface.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglSurface.cpp
rename to host/gl/glestranslator/EGL/EglSurface.cpp

host/gl/glestranslator/EGL/EglSurface.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglSurface.h b/host/gl/glestranslator/EGL/EglSurface.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglSurface.h
rename to host/gl/glestranslator/EGL/EglSurface.h

host/gl/glestranslator/EGL/EglThreadInfo.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglThreadInfo.cpp b/host/gl/glestranslator/EGL/EglThreadInfo.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglThreadInfo.cpp
rename to host/gl/glestranslator/EGL/EglThreadInfo.cpp

host/gl/glestranslator/EGL/EglThreadInfo.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglThreadInfo.h b/host/gl/glestranslator/EGL/EglThreadInfo.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglThreadInfo.h
rename to host/gl/glestranslator/EGL/EglThreadInfo.h

host/gl/glestranslator/EGL/EglValidate.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglValidate.cpp b/host/gl/glestranslator/EGL/EglValidate.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglValidate.cpp
rename to host/gl/glestranslator/EGL/EglValidate.cpp

host/gl/glestranslator/EGL/EglValidate.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglValidate.h b/host/gl/glestranslator/EGL/EglValidate.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglValidate.h
rename to host/gl/glestranslator/EGL/EglValidate.h

host/gl/glestranslator/EGL/EglWindowSurface.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/EglWindowSurface.cpp b/host/gl/glestranslator/EGL/EglWindowSurface.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglWindowSurface.cpp
rename to host/gl/glestranslator/EGL/EglWindowSurface.cpp

host/gl/glestranslator/EGL/EglWindowSurface.h

diff --git a/stream-servers/gl/glestranslator/EGL/EglWindowSurface.h b/host/gl/glestranslator/EGL/EglWindowSurface.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/EglWindowSurface.h
rename to host/gl/glestranslator/EGL/EglWindowSurface.h

host/gl/glestranslator/EGL/MacNative.h

diff --git a/stream-servers/gl/glestranslator/EGL/MacNative.h b/host/gl/glestranslator/EGL/MacNative.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/MacNative.h
rename to host/gl/glestranslator/EGL/MacNative.h

host/gl/glestranslator/EGL/MacNative.m

diff --git a/stream-servers/gl/glestranslator/EGL/MacNative.m b/host/gl/glestranslator/EGL/MacNative.m
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/MacNative.m
rename to host/gl/glestranslator/EGL/MacNative.m

host/gl/glestranslator/EGL/MacPixelFormatsAttribs.h

diff --git a/stream-servers/gl/glestranslator/EGL/MacPixelFormatsAttribs.h b/host/gl/glestranslator/EGL/MacPixelFormatsAttribs.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/MacPixelFormatsAttribs.h
rename to host/gl/glestranslator/EGL/MacPixelFormatsAttribs.h

host/gl/glestranslator/EGL/MacPixelFormatsAttribs.m

diff --git a/stream-servers/gl/glestranslator/EGL/MacPixelFormatsAttribs.m b/host/gl/glestranslator/EGL/MacPixelFormatsAttribs.m
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/MacPixelFormatsAttribs.m
rename to host/gl/glestranslator/EGL/MacPixelFormatsAttribs.m

host/gl/glestranslator/EGL/ShaderCache.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/ShaderCache.cpp b/host/gl/glestranslator/EGL/ShaderCache.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/ShaderCache.cpp
rename to host/gl/glestranslator/EGL/ShaderCache.cpp

host/gl/glestranslator/EGL/ShaderCache.h

diff --git a/stream-servers/gl/glestranslator/EGL/ShaderCache.h b/host/gl/glestranslator/EGL/ShaderCache.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/ShaderCache.h
rename to host/gl/glestranslator/EGL/ShaderCache.h

host/gl/glestranslator/EGL/ThreadInfo.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/ThreadInfo.cpp b/host/gl/glestranslator/EGL/ThreadInfo.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/ThreadInfo.cpp
rename to host/gl/glestranslator/EGL/ThreadInfo.cpp

host/gl/glestranslator/EGL/ThreadInfo.h

diff --git a/stream-servers/gl/glestranslator/EGL/ThreadInfo.h b/host/gl/glestranslator/EGL/ThreadInfo.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/ThreadInfo.h
rename to host/gl/glestranslator/EGL/ThreadInfo.h

host/gl/glestranslator/EGL/X11ErrorHandler.cpp

diff --git a/stream-servers/gl/glestranslator/EGL/X11ErrorHandler.cpp b/host/gl/glestranslator/EGL/X11ErrorHandler.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/X11ErrorHandler.cpp
rename to host/gl/glestranslator/EGL/X11ErrorHandler.cpp

host/gl/glestranslator/EGL/X11ErrorHandler.h

diff --git a/stream-servers/gl/glestranslator/EGL/X11ErrorHandler.h b/host/gl/glestranslator/EGL/X11ErrorHandler.h
similarity index 100%
rename from stream-servers/gl/glestranslator/EGL/X11ErrorHandler.h
rename to host/gl/glestranslator/EGL/X11ErrorHandler.h

host/gl/glestranslator/GLES_CM/Android.bp

diff --git a/stream-servers/gl/glestranslator/GLES_CM/Android.bp b/host/gl/glestranslator/GLES_CM/Android.bp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/Android.bp
rename to host/gl/glestranslator/GLES_CM/Android.bp

host/gl/glestranslator/GLES_CM/CMakeLists.txt

diff --git a/stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt b/host/gl/glestranslator/GLES_CM/CMakeLists.txt
similarity index 86%
rename from stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt
rename to host/gl/glestranslator/GLES_CM/CMakeLists.txt
index 0028b18..2ea0dcd 100644
--- a/stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt
+++ b/host/gl/glestranslator/GLES_CM/CMakeLists.txt
@@ -17,6 +17,6 @@
     GLES_CM_translator_static PRIVATE
     ${GFXSTREAM_REPO_ROOT}
     ${GFXSTREAM_REPO_ROOT}/include
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glestranslator/include
+    ${GFXSTREAM_REPO_ROOT}/host/
+    ${GFXSTREAM_REPO_ROOT}/host/gl/glestranslator/include
     ${GFXSTREAM_REPO_ROOT}/third-party/glm/include)

host/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp b/host/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp
rename to host/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp

host/gl/glestranslator/GLES_CM/CoreProfileEngine.h

diff --git a/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.h b/host/gl/glestranslator/GLES_CM/CoreProfileEngine.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.h
rename to host/gl/glestranslator/GLES_CM/CoreProfileEngine.h

host/gl/glestranslator/GLES_CM/CoreProfileEngineShaders.h

diff --git a/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngineShaders.h b/host/gl/glestranslator/GLES_CM/CoreProfileEngineShaders.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngineShaders.h
rename to host/gl/glestranslator/GLES_CM/CoreProfileEngineShaders.h

host/gl/glestranslator/GLES_CM/GLEScmContext.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.cpp b/host/gl/glestranslator/GLES_CM/GLEScmContext.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.cpp
rename to host/gl/glestranslator/GLES_CM/GLEScmContext.cpp

host/gl/glestranslator/GLES_CM/GLEScmContext.h

diff --git a/stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.h b/host/gl/glestranslator/GLES_CM/GLEScmContext.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.h
rename to host/gl/glestranslator/GLES_CM/GLEScmContext.h

host/gl/glestranslator/GLES_CM/GLEScmImp.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_CM/GLEScmImp.cpp b/host/gl/glestranslator/GLES_CM/GLEScmImp.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/GLEScmImp.cpp
rename to host/gl/glestranslator/GLES_CM/GLEScmImp.cpp

host/gl/glestranslator/GLES_CM/GLEScmUtils.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_CM/GLEScmUtils.cpp b/host/gl/glestranslator/GLES_CM/GLEScmUtils.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/GLEScmUtils.cpp
rename to host/gl/glestranslator/GLES_CM/GLEScmUtils.cpp

host/gl/glestranslator/GLES_CM/GLEScmUtils.h

diff --git a/stream-servers/gl/glestranslator/GLES_CM/GLEScmUtils.h b/host/gl/glestranslator/GLES_CM/GLEScmUtils.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/GLEScmUtils.h
rename to host/gl/glestranslator/GLES_CM/GLEScmUtils.h

host/gl/glestranslator/GLES_CM/GLEScmValidate.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_CM/GLEScmValidate.cpp b/host/gl/glestranslator/GLES_CM/GLEScmValidate.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/GLEScmValidate.cpp
rename to host/gl/glestranslator/GLES_CM/GLEScmValidate.cpp

host/gl/glestranslator/GLES_CM/GLEScmValidate.h

diff --git a/stream-servers/gl/glestranslator/GLES_CM/GLEScmValidate.h b/host/gl/glestranslator/GLES_CM/GLEScmValidate.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_CM/GLEScmValidate.h
rename to host/gl/glestranslator/GLES_CM/GLEScmValidate.h

host/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp b/host/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp
rename to host/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp

host/gl/glestranslator/GLES_V2/ANGLEShaderParser.h

diff --git a/stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.h b/host/gl/glestranslator/GLES_V2/ANGLEShaderParser.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.h
rename to host/gl/glestranslator/GLES_V2/ANGLEShaderParser.h

host/gl/glestranslator/GLES_V2/Android.bp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/Android.bp b/host/gl/glestranslator/GLES_V2/Android.bp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/Android.bp
rename to host/gl/glestranslator/GLES_V2/Android.bp

host/gl/glestranslator/GLES_V2/CMakeLists.txt

diff --git a/stream-servers/gl/glestranslator/GLES_V2/CMakeLists.txt b/host/gl/glestranslator/GLES_V2/CMakeLists.txt
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/CMakeLists.txt
rename to host/gl/glestranslator/GLES_V2/CMakeLists.txt

host/gl/glestranslator/GLES_V2/GLESv2Context.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.cpp b/host/gl/glestranslator/GLES_V2/GLESv2Context.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.cpp
rename to host/gl/glestranslator/GLES_V2/GLESv2Context.cpp

host/gl/glestranslator/GLES_V2/GLESv2Context.h

diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.h b/host/gl/glestranslator/GLES_V2/GLESv2Context.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.h
rename to host/gl/glestranslator/GLES_V2/GLESv2Context.h

host/gl/glestranslator/GLES_V2/GLESv2Imp.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv2Imp.cpp b/host/gl/glestranslator/GLES_V2/GLESv2Imp.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/GLESv2Imp.cpp
rename to host/gl/glestranslator/GLES_V2/GLESv2Imp.cpp

host/gl/glestranslator/GLES_V2/GLESv2Validate.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv2Validate.cpp b/host/gl/glestranslator/GLES_V2/GLESv2Validate.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/GLESv2Validate.cpp
rename to host/gl/glestranslator/GLES_V2/GLESv2Validate.cpp

host/gl/glestranslator/GLES_V2/GLESv2Validate.h

diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv2Validate.h b/host/gl/glestranslator/GLES_V2/GLESv2Validate.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/GLESv2Validate.h
rename to host/gl/glestranslator/GLES_V2/GLESv2Validate.h

host/gl/glestranslator/GLES_V2/GLESv30Imp.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv30Imp.cpp b/host/gl/glestranslator/GLES_V2/GLESv30Imp.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/GLESv30Imp.cpp
rename to host/gl/glestranslator/GLES_V2/GLESv30Imp.cpp

host/gl/glestranslator/GLES_V2/GLESv31Imp.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv31Imp.cpp b/host/gl/glestranslator/GLES_V2/GLESv31Imp.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/GLESv31Imp.cpp
rename to host/gl/glestranslator/GLES_V2/GLESv31Imp.cpp

host/gl/glestranslator/GLES_V2/GLESv32Imp.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv32Imp.cpp b/host/gl/glestranslator/GLES_V2/GLESv32Imp.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/GLESv32Imp.cpp
rename to host/gl/glestranslator/GLES_V2/GLESv32Imp.cpp

host/gl/glestranslator/GLES_V2/ProgramData.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/ProgramData.cpp b/host/gl/glestranslator/GLES_V2/ProgramData.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/ProgramData.cpp
rename to host/gl/glestranslator/GLES_V2/ProgramData.cpp

host/gl/glestranslator/GLES_V2/ProgramData.h

diff --git a/stream-servers/gl/glestranslator/GLES_V2/ProgramData.h b/host/gl/glestranslator/GLES_V2/ProgramData.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/ProgramData.h
rename to host/gl/glestranslator/GLES_V2/ProgramData.h

host/gl/glestranslator/GLES_V2/SamplerData.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/SamplerData.cpp b/host/gl/glestranslator/GLES_V2/SamplerData.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/SamplerData.cpp
rename to host/gl/glestranslator/GLES_V2/SamplerData.cpp

host/gl/glestranslator/GLES_V2/SamplerData.h

diff --git a/stream-servers/gl/glestranslator/GLES_V2/SamplerData.h b/host/gl/glestranslator/GLES_V2/SamplerData.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/SamplerData.h
rename to host/gl/glestranslator/GLES_V2/SamplerData.h

host/gl/glestranslator/GLES_V2/ShaderParser.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/ShaderParser.cpp b/host/gl/glestranslator/GLES_V2/ShaderParser.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/ShaderParser.cpp
rename to host/gl/glestranslator/GLES_V2/ShaderParser.cpp

host/gl/glestranslator/GLES_V2/ShaderParser.h

diff --git a/stream-servers/gl/glestranslator/GLES_V2/ShaderParser.h b/host/gl/glestranslator/GLES_V2/ShaderParser.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/ShaderParser.h
rename to host/gl/glestranslator/GLES_V2/ShaderParser.h

host/gl/glestranslator/GLES_V2/ShaderValidator.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/ShaderValidator.cpp b/host/gl/glestranslator/GLES_V2/ShaderValidator.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/ShaderValidator.cpp
rename to host/gl/glestranslator/GLES_V2/ShaderValidator.cpp

host/gl/glestranslator/GLES_V2/ShaderValidator.h

diff --git a/stream-servers/gl/glestranslator/GLES_V2/ShaderValidator.h b/host/gl/glestranslator/GLES_V2/ShaderValidator.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/ShaderValidator.h
rename to host/gl/glestranslator/GLES_V2/ShaderValidator.h

host/gl/glestranslator/GLES_V2/TransformFeedbackData.cpp

diff --git a/stream-servers/gl/glestranslator/GLES_V2/TransformFeedbackData.cpp b/host/gl/glestranslator/GLES_V2/TransformFeedbackData.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/TransformFeedbackData.cpp
rename to host/gl/glestranslator/GLES_V2/TransformFeedbackData.cpp

host/gl/glestranslator/GLES_V2/TransformFeedbackData.h

diff --git a/stream-servers/gl/glestranslator/GLES_V2/TransformFeedbackData.h b/host/gl/glestranslator/GLES_V2/TransformFeedbackData.h
similarity index 100%
rename from stream-servers/gl/glestranslator/GLES_V2/TransformFeedbackData.h
rename to host/gl/glestranslator/GLES_V2/TransformFeedbackData.h

host/gl/glestranslator/GLcommon/Android.bp

diff --git a/stream-servers/gl/glestranslator/GLcommon/Android.bp b/host/gl/glestranslator/GLcommon/Android.bp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/Android.bp
rename to host/gl/glestranslator/GLcommon/Android.bp

host/gl/glestranslator/GLcommon/CMakeLists.txt

diff --git a/stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt b/host/gl/glestranslator/GLcommon/CMakeLists.txt
similarity index 92%
rename from stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt
rename to host/gl/glestranslator/GLcommon/CMakeLists.txt
index 2874168..a02fc1c 100644
--- a/stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt
+++ b/host/gl/glestranslator/GLcommon/CMakeLists.txt
@@ -24,8 +24,8 @@
     GLcommon PUBLIC
     ${GFXSTREAM_REPO_ROOT}
     ${GFXSTREAM_REPO_ROOT}/include
-    ${GFXSTREAM_REPO_ROOT}/stream-servers
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glestranslator/include)
+    ${GFXSTREAM_REPO_ROOT}/host
+    ${GFXSTREAM_REPO_ROOT}/host/gl/glestranslator/include)
 target_link_libraries(
     GLcommon PUBLIC
     aemu-base.headers

host/gl/glestranslator/GLcommon/Etc2_unittest.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/Etc2_unittest.cpp b/host/gl/glestranslator/GLcommon/Etc2_unittest.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/Etc2_unittest.cpp
rename to host/gl/glestranslator/GLcommon/Etc2_unittest.cpp

host/gl/glestranslator/GLcommon/FramebufferData.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/FramebufferData.cpp b/host/gl/glestranslator/GLcommon/FramebufferData.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/FramebufferData.cpp
rename to host/gl/glestranslator/GLcommon/FramebufferData.cpp

host/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp b/host/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp
rename to host/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp

host/gl/glestranslator/GLcommon/GLDispatch.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp b/host/gl/glestranslator/GLcommon/GLDispatch.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp
rename to host/gl/glestranslator/GLcommon/GLDispatch.cpp

host/gl/glestranslator/GLcommon/GLESbuffer.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/GLESbuffer.cpp b/host/gl/glestranslator/GLcommon/GLESbuffer.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/GLESbuffer.cpp
rename to host/gl/glestranslator/GLcommon/GLESbuffer.cpp

host/gl/glestranslator/GLcommon/GLEScontext.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/GLEScontext.cpp b/host/gl/glestranslator/GLcommon/GLEScontext.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/GLEScontext.cpp
rename to host/gl/glestranslator/GLcommon/GLEScontext.cpp

host/gl/glestranslator/GLcommon/GLESpointer.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/GLESpointer.cpp b/host/gl/glestranslator/GLcommon/GLESpointer.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/GLESpointer.cpp
rename to host/gl/glestranslator/GLcommon/GLESpointer.cpp

host/gl/glestranslator/GLcommon/GLESvalidate.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/GLESvalidate.cpp b/host/gl/glestranslator/GLcommon/GLESvalidate.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/GLESvalidate.cpp
rename to host/gl/glestranslator/GLcommon/GLESvalidate.cpp

host/gl/glestranslator/GLcommon/GLutils.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/GLutils.cpp b/host/gl/glestranslator/GLcommon/GLutils.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/GLutils.cpp
rename to host/gl/glestranslator/GLcommon/GLutils.cpp

host/gl/glestranslator/GLcommon/NamedObject.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/NamedObject.cpp b/host/gl/glestranslator/GLcommon/NamedObject.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/NamedObject.cpp
rename to host/gl/glestranslator/GLcommon/NamedObject.cpp

host/gl/glestranslator/GLcommon/ObjectData.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/ObjectData.cpp b/host/gl/glestranslator/GLcommon/ObjectData.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/ObjectData.cpp
rename to host/gl/glestranslator/GLcommon/ObjectData.cpp

host/gl/glestranslator/GLcommon/ObjectNameSpace.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/ObjectNameSpace.cpp b/host/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
rename to host/gl/glestranslator/GLcommon/ObjectNameSpace.cpp

host/gl/glestranslator/GLcommon/PaletteTexture.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/PaletteTexture.cpp b/host/gl/glestranslator/GLcommon/PaletteTexture.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/PaletteTexture.cpp
rename to host/gl/glestranslator/GLcommon/PaletteTexture.cpp

host/gl/glestranslator/GLcommon/RangeManip.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/RangeManip.cpp b/host/gl/glestranslator/GLcommon/RangeManip.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/RangeManip.cpp
rename to host/gl/glestranslator/GLcommon/RangeManip.cpp

host/gl/glestranslator/GLcommon/SaveableTexture.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/SaveableTexture.cpp b/host/gl/glestranslator/GLcommon/SaveableTexture.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/SaveableTexture.cpp
rename to host/gl/glestranslator/GLcommon/SaveableTexture.cpp

host/gl/glestranslator/GLcommon/ScopedGLState.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/ScopedGLState.cpp b/host/gl/glestranslator/GLcommon/ScopedGLState.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/ScopedGLState.cpp
rename to host/gl/glestranslator/GLcommon/ScopedGLState.cpp

host/gl/glestranslator/GLcommon/ShareGroup.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/ShareGroup.cpp b/host/gl/glestranslator/GLcommon/ShareGroup.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/ShareGroup.cpp
rename to host/gl/glestranslator/GLcommon/ShareGroup.cpp

host/gl/glestranslator/GLcommon/TextureData.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/TextureData.cpp b/host/gl/glestranslator/GLcommon/TextureData.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/TextureData.cpp
rename to host/gl/glestranslator/GLcommon/TextureData.cpp

host/gl/glestranslator/GLcommon/TextureUtils.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/TextureUtils.cpp b/host/gl/glestranslator/GLcommon/TextureUtils.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/TextureUtils.cpp
rename to host/gl/glestranslator/GLcommon/TextureUtils.cpp

host/gl/glestranslator/GLcommon/etc.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/etc.cpp b/host/gl/glestranslator/GLcommon/etc.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/etc.cpp
rename to host/gl/glestranslator/GLcommon/etc.cpp

host/gl/glestranslator/GLcommon/rgtc.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/rgtc.cpp b/host/gl/glestranslator/GLcommon/rgtc.cpp
similarity index 100%
rename from stream-servers/gl/glestranslator/GLcommon/rgtc.cpp
rename to host/gl/glestranslator/GLcommon/rgtc.cpp

host/gl/glestranslator/include/GLcommon/FramebufferData.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/FramebufferData.h b/host/gl/glestranslator/include/GLcommon/FramebufferData.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/FramebufferData.h
rename to host/gl/glestranslator/include/GLcommon/FramebufferData.h

host/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h b/host/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h
rename to host/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h

host/gl/glestranslator/include/GLcommon/GLDispatch.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLDispatch.h b/host/gl/glestranslator/include/GLcommon/GLDispatch.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLDispatch.h
rename to host/gl/glestranslator/include/GLcommon/GLDispatch.h

host/gl/glestranslator/include/GLcommon/GLESbuffer.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLESbuffer.h b/host/gl/glestranslator/include/GLcommon/GLESbuffer.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLESbuffer.h
rename to host/gl/glestranslator/include/GLcommon/GLESbuffer.h

host/gl/glestranslator/include/GLcommon/GLEScontext.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLEScontext.h b/host/gl/glestranslator/include/GLcommon/GLEScontext.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLEScontext.h
rename to host/gl/glestranslator/include/GLcommon/GLEScontext.h

host/gl/glestranslator/include/GLcommon/GLESmacros.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLESmacros.h b/host/gl/glestranslator/include/GLcommon/GLESmacros.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLESmacros.h
rename to host/gl/glestranslator/include/GLcommon/GLESmacros.h

host/gl/glestranslator/include/GLcommon/GLESpointer.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLESpointer.h b/host/gl/glestranslator/include/GLcommon/GLESpointer.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLESpointer.h
rename to host/gl/glestranslator/include/GLcommon/GLESpointer.h

host/gl/glestranslator/include/GLcommon/GLESvalidate.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLESvalidate.h b/host/gl/glestranslator/include/GLcommon/GLESvalidate.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLESvalidate.h
rename to host/gl/glestranslator/include/GLcommon/GLESvalidate.h

host/gl/glestranslator/include/GLcommon/GLLibrary.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLLibrary.h b/host/gl/glestranslator/include/GLcommon/GLLibrary.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLLibrary.h
rename to host/gl/glestranslator/include/GLcommon/GLLibrary.h

host/gl/glestranslator/include/GLcommon/GLSnapshotSerializers.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLSnapshotSerializers.h b/host/gl/glestranslator/include/GLcommon/GLSnapshotSerializers.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLSnapshotSerializers.h
rename to host/gl/glestranslator/include/GLcommon/GLSnapshotSerializers.h

host/gl/glestranslator/include/GLcommon/GLconversion_macros.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLconversion_macros.h b/host/gl/glestranslator/include/GLcommon/GLconversion_macros.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLconversion_macros.h
rename to host/gl/glestranslator/include/GLcommon/GLconversion_macros.h

host/gl/glestranslator/include/GLcommon/GLutils.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLutils.h b/host/gl/glestranslator/include/GLcommon/GLutils.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/GLutils.h
rename to host/gl/glestranslator/include/GLcommon/GLutils.h

host/gl/glestranslator/include/GLcommon/NamedObject.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/NamedObject.h b/host/gl/glestranslator/include/GLcommon/NamedObject.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/NamedObject.h
rename to host/gl/glestranslator/include/GLcommon/NamedObject.h

host/gl/glestranslator/include/GLcommon/ObjectData.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/ObjectData.h b/host/gl/glestranslator/include/GLcommon/ObjectData.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/ObjectData.h
rename to host/gl/glestranslator/include/GLcommon/ObjectData.h

host/gl/glestranslator/include/GLcommon/ObjectNameSpace.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/ObjectNameSpace.h b/host/gl/glestranslator/include/GLcommon/ObjectNameSpace.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/ObjectNameSpace.h
rename to host/gl/glestranslator/include/GLcommon/ObjectNameSpace.h

host/gl/glestranslator/include/GLcommon/PaletteTexture.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/PaletteTexture.h b/host/gl/glestranslator/include/GLcommon/PaletteTexture.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/PaletteTexture.h
rename to host/gl/glestranslator/include/GLcommon/PaletteTexture.h

host/gl/glestranslator/include/GLcommon/RangeManip.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/RangeManip.h b/host/gl/glestranslator/include/GLcommon/RangeManip.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/RangeManip.h
rename to host/gl/glestranslator/include/GLcommon/RangeManip.h

host/gl/glestranslator/include/GLcommon/SaveableTexture.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/SaveableTexture.h b/host/gl/glestranslator/include/GLcommon/SaveableTexture.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/SaveableTexture.h
rename to host/gl/glestranslator/include/GLcommon/SaveableTexture.h

host/gl/glestranslator/include/GLcommon/ScopedGLState.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/ScopedGLState.h b/host/gl/glestranslator/include/GLcommon/ScopedGLState.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/ScopedGLState.h
rename to host/gl/glestranslator/include/GLcommon/ScopedGLState.h

host/gl/glestranslator/include/GLcommon/ShareGroup.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/ShareGroup.h b/host/gl/glestranslator/include/GLcommon/ShareGroup.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/ShareGroup.h
rename to host/gl/glestranslator/include/GLcommon/ShareGroup.h

host/gl/glestranslator/include/GLcommon/TextureData.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/TextureData.h b/host/gl/glestranslator/include/GLcommon/TextureData.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/TextureData.h
rename to host/gl/glestranslator/include/GLcommon/TextureData.h

host/gl/glestranslator/include/GLcommon/TextureUtils.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/TextureUtils.h b/host/gl/glestranslator/include/GLcommon/TextureUtils.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/TextureUtils.h
rename to host/gl/glestranslator/include/GLcommon/TextureUtils.h

host/gl/glestranslator/include/GLcommon/TranslatorIfaces.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/TranslatorIfaces.h b/host/gl/glestranslator/include/GLcommon/TranslatorIfaces.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/TranslatorIfaces.h
rename to host/gl/glestranslator/include/GLcommon/TranslatorIfaces.h

host/gl/glestranslator/include/GLcommon/etc.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/etc.h b/host/gl/glestranslator/include/GLcommon/etc.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/etc.h
rename to host/gl/glestranslator/include/GLcommon/etc.h

host/gl/glestranslator/include/GLcommon/rgtc.h

diff --git a/stream-servers/gl/glestranslator/include/GLcommon/rgtc.h b/host/gl/glestranslator/include/GLcommon/rgtc.h
similarity index 100%
rename from stream-servers/gl/glestranslator/include/GLcommon/rgtc.h
rename to host/gl/glestranslator/include/GLcommon/rgtc.h

host/gl/glsnapshot/Android.bp

diff --git a/stream-servers/gl/glsnapshot/Android.bp b/host/gl/glsnapshot/Android.bp
similarity index 100%
rename from stream-servers/gl/glsnapshot/Android.bp
rename to host/gl/glsnapshot/Android.bp

host/gl/glsnapshot/CMakeLists.txt

diff --git a/host/gl/glsnapshot/CMakeLists.txt b/host/gl/glsnapshot/CMakeLists.txt
new file mode 100644
index 0000000..bc11299
--- /dev/null
+++ b/host/gl/glsnapshot/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library(GLSnapshot GLSnapshot.cpp)
+target_link_libraries(GLSnapshot PUBLIC apigen-codec-common)
+target_include_directories(GLSnapshot PUBLIC
+    ${GFXSTREAM_REPO_ROOT}/host/gl/glsnapshot
+    ${GFXSTREAM_REPO_ROOT}/include
+    ${GFXSTREAM_REPO_ROOT}/host
+    ${GFXSTREAM_REPO_ROOT}/host/gl/OpenGLESDispatch)

host/gl/glsnapshot/GLSnapshot.cpp

diff --git a/stream-servers/gl/glsnapshot/GLSnapshot.cpp b/host/gl/glsnapshot/GLSnapshot.cpp
similarity index 100%
rename from stream-servers/gl/glsnapshot/GLSnapshot.cpp
rename to host/gl/glsnapshot/GLSnapshot.cpp

host/gl/glsnapshot/GLSnapshot.h

diff --git a/stream-servers/gl/glsnapshot/GLSnapshot.h b/host/gl/glsnapshot/GLSnapshot.h
similarity index 100%
rename from stream-servers/gl/glsnapshot/GLSnapshot.h
rename to host/gl/glsnapshot/GLSnapshot.h

host/magma/Android.bp

diff --git a/stream-servers/magma/Android.bp b/host/magma/Android.bp
similarity index 100%
rename from stream-servers/magma/Android.bp
rename to host/magma/Android.bp

host/magma/CMakeLists.txt

diff --git a/stream-servers/magma/CMakeLists.txt b/host/magma/CMakeLists.txt
similarity index 82%
rename from stream-servers/magma/CMakeLists.txt
rename to host/magma/CMakeLists.txt
index 1296543..be4952a 100644
--- a/stream-servers/magma/CMakeLists.txt
+++ b/host/magma/CMakeLists.txt
@@ -30,9 +30,9 @@
     PRIVATE
     ${GFXSTREAM_REPO_ROOT}
     ${GFXSTREAM_REPO_ROOT}/include
-    ${GFXSTREAM_REPO_ROOT}/stream-servers
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/magma
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/magma/magma_dec
+    ${GFXSTREAM_REPO_ROOT}/host
+    ${GFXSTREAM_REPO_ROOT}/host/apigen-codec-common
+    ${GFXSTREAM_REPO_ROOT}/host/magma
+    ${GFXSTREAM_REPO_ROOT}/host/magma/magma_dec
     ${GFXSTREAM_REPO_ROOT}/third-party/fuchsia/magma/include
     ${GFXSTREAM_REPO_ROOT}/third-party/fuchsia/magma/include/lib)

host/magma/Decoder.cpp

diff --git a/stream-servers/magma/Decoder.cpp b/host/magma/Decoder.cpp
similarity index 99%
rename from stream-servers/magma/Decoder.cpp
rename to host/magma/Decoder.cpp
index 7ee04a0..4478468 100644
--- a/stream-servers/magma/Decoder.cpp
+++ b/host/magma/Decoder.cpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "stream-servers/magma/Decoder.h"
+#include "host/magma/Decoder.h"
 
 #include "RenderThreadInfoMagma.h"
 
 #if GFXSTREAM_MAGMA_USE_INTEL_DRM
-#include "stream-servers/magma/IntelDrmDecoder.h"
+#include "host/magma/IntelDrmDecoder.h"
 #endif
 
 namespace gfxstream {

host/magma/Decoder.h

diff --git a/stream-servers/magma/Decoder.h b/host/magma/Decoder.h
similarity index 100%
rename from stream-servers/magma/Decoder.h
rename to host/magma/Decoder.h

host/magma/DrmDevice.cpp

diff --git a/stream-servers/magma/DrmDevice.cpp b/host/magma/DrmDevice.cpp
similarity index 98%
rename from stream-servers/magma/DrmDevice.cpp
rename to host/magma/DrmDevice.cpp
index f625754..a898636 100644
--- a/stream-servers/magma/DrmDevice.cpp
+++ b/host/magma/DrmDevice.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "stream-servers/magma/DrmDevice.h"
+#include "host/magma/DrmDevice.h"
 
 #include <errno.h>
 #include <fcntl.h>

host/magma/DrmDevice.h

diff --git a/stream-servers/magma/DrmDevice.h b/host/magma/DrmDevice.h
similarity index 100%
rename from stream-servers/magma/DrmDevice.h
rename to host/magma/DrmDevice.h

host/magma/IntelDrmDecoder.cpp

diff --git a/stream-servers/magma/IntelDrmDecoder.cpp b/host/magma/IntelDrmDecoder.cpp
similarity index 98%
rename from stream-servers/magma/IntelDrmDecoder.cpp
rename to host/magma/IntelDrmDecoder.cpp
index 414bb71..b98535d 100644
--- a/stream-servers/magma/IntelDrmDecoder.cpp
+++ b/host/magma/IntelDrmDecoder.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "stream-servers/magma/IntelDrmDecoder.h"
+#include "host/magma/IntelDrmDecoder.h"
 
 #include <i915_drm.h>
 #include <magma_intel_gen_defs.h>
@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "RenderThreadInfoMagma.h"
-#include "stream-servers/magma/DrmDevice.h"
+#include "host/magma/DrmDevice.h"
 
 namespace gfxstream {
 namespace magma {

host/magma/IntelDrmDecoder.h

diff --git a/stream-servers/magma/IntelDrmDecoder.h b/host/magma/IntelDrmDecoder.h
similarity index 100%
rename from stream-servers/magma/IntelDrmDecoder.h
rename to host/magma/IntelDrmDecoder.h

host/magma/MonotonicMap.h

diff --git a/stream-servers/magma/MonotonicMap.h b/host/magma/MonotonicMap.h
similarity index 100%
rename from stream-servers/magma/MonotonicMap.h
rename to host/magma/MonotonicMap.h

host/magma/magma_dec/Android.bp

diff --git a/stream-servers/magma/magma_dec/Android.bp b/host/magma/magma_dec/Android.bp
similarity index 100%
rename from stream-servers/magma/magma_dec/Android.bp
rename to host/magma/magma_dec/Android.bp

host/magma/magma_dec/magma_dec.cpp

diff --git a/stream-servers/magma/magma_dec/magma_dec.cpp b/host/magma/magma_dec/magma_dec.cpp
similarity index 100%
rename from stream-servers/magma/magma_dec/magma_dec.cpp
rename to host/magma/magma_dec/magma_dec.cpp

host/magma/magma_dec/magma_dec.h

diff --git a/stream-servers/magma/magma_dec/magma_dec.h b/host/magma/magma_dec/magma_dec.h
similarity index 100%
rename from stream-servers/magma/magma_dec/magma_dec.h
rename to host/magma/magma_dec/magma_dec.h

host/magma/magma_dec/magma_opcodes.h

diff --git a/stream-servers/magma/magma_dec/magma_opcodes.h b/host/magma/magma_dec/magma_opcodes.h
similarity index 100%
rename from stream-servers/magma/magma_dec/magma_opcodes.h
rename to host/magma/magma_dec/magma_opcodes.h

host/magma/magma_dec/magma_server_context.cpp

diff --git a/stream-servers/magma/magma_dec/magma_server_context.cpp b/host/magma/magma_dec/magma_server_context.cpp
similarity index 100%
rename from stream-servers/magma/magma_dec/magma_server_context.cpp
rename to host/magma/magma_dec/magma_server_context.cpp

host/magma/magma_dec/magma_server_context.h

diff --git a/stream-servers/magma/magma_dec/magma_server_context.h b/host/magma/magma_dec/magma_server_context.h
similarity index 100%
rename from stream-servers/magma/magma_dec/magma_server_context.h
rename to host/magma/magma_dec/magma_server_context.h

host/magma/magma_dec/magma_server_proc.h

diff --git a/stream-servers/magma/magma_dec/magma_server_proc.h b/host/magma/magma_dec/magma_server_proc.h
similarity index 100%
rename from stream-servers/magma/magma_dec/magma_server_proc.h
rename to host/magma/magma_dec/magma_server_proc.h

host/magma/magma_dec/magma_types.h

diff --git a/stream-servers/magma/magma_dec/magma_types.h b/host/magma/magma_dec/magma_types.h
similarity index 100%
rename from stream-servers/magma/magma_dec/magma_types.h
rename to host/magma/magma_dec/magma_types.h

host/renderControl_dec/Android.bp

diff --git a/stream-servers/renderControl_dec/Android.bp b/host/renderControl_dec/Android.bp
similarity index 100%
rename from stream-servers/renderControl_dec/Android.bp
rename to host/renderControl_dec/Android.bp

host/renderControl_dec/CMakeLists.txt

diff --git a/stream-servers/renderControl_dec/CMakeLists.txt b/host/renderControl_dec/CMakeLists.txt
similarity index 76%
rename from stream-servers/renderControl_dec/CMakeLists.txt
rename to host/renderControl_dec/CMakeLists.txt
index db8c280..017393f 100644
--- a/stream-servers/renderControl_dec/CMakeLists.txt
+++ b/host/renderControl_dec/CMakeLists.txt
@@ -13,5 +13,5 @@
     PRIVATE
     ${GFXSTREAM_REPO_ROOT}
     ${GFXSTREAM_REPO_ROOT}/include
-    ${GFXSTREAM_REPO_ROOT}/stream-servers
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common)
+    ${GFXSTREAM_REPO_ROOT}/host
+    ${GFXSTREAM_REPO_ROOT}/host/apigen-codec-common)

host/renderControl_dec/renderControl_dec.cpp

diff --git a/stream-servers/renderControl_dec/renderControl_dec.cpp b/host/renderControl_dec/renderControl_dec.cpp
similarity index 100%
rename from stream-servers/renderControl_dec/renderControl_dec.cpp
rename to host/renderControl_dec/renderControl_dec.cpp

host/renderControl_dec/renderControl_dec.h

diff --git a/stream-servers/renderControl_dec/renderControl_dec.h b/host/renderControl_dec/renderControl_dec.h
similarity index 100%
rename from stream-servers/renderControl_dec/renderControl_dec.h
rename to host/renderControl_dec/renderControl_dec.h

host/renderControl_dec/renderControl_opcodes.h

diff --git a/stream-servers/renderControl_dec/renderControl_opcodes.h b/host/renderControl_dec/renderControl_opcodes.h
similarity index 100%
rename from stream-servers/renderControl_dec/renderControl_opcodes.h
rename to host/renderControl_dec/renderControl_opcodes.h

host/renderControl_dec/renderControl_server_context.cpp

diff --git a/stream-servers/renderControl_dec/renderControl_server_context.cpp b/host/renderControl_dec/renderControl_server_context.cpp
similarity index 100%
rename from stream-servers/renderControl_dec/renderControl_server_context.cpp
rename to host/renderControl_dec/renderControl_server_context.cpp

host/renderControl_dec/renderControl_server_context.h

diff --git a/stream-servers/renderControl_dec/renderControl_server_context.h b/host/renderControl_dec/renderControl_server_context.h
similarity index 100%
rename from stream-servers/renderControl_dec/renderControl_server_context.h
rename to host/renderControl_dec/renderControl_server_context.h

host/renderControl_dec/renderControl_server_proc.h

diff --git a/stream-servers/renderControl_dec/renderControl_server_proc.h b/host/renderControl_dec/renderControl_server_proc.h
similarity index 100%
rename from stream-servers/renderControl_dec/renderControl_server_proc.h
rename to host/renderControl_dec/renderControl_server_proc.h

host/renderControl_dec/renderControl_types.h

diff --git a/stream-servers/renderControl_dec/renderControl_types.h b/host/renderControl_dec/renderControl_types.h
similarity index 100%
rename from stream-servers/renderControl_dec/renderControl_types.h
rename to host/renderControl_dec/renderControl_types.h

host/render_api.cpp

diff --git a/stream-servers/render_api.cpp b/host/render_api.cpp
similarity index 100%
rename from stream-servers/render_api.cpp
rename to host/render_api.cpp

host/testlibs/Android.bp

diff --git a/stream-servers/testlibs/Android.bp b/host/testlibs/Android.bp
similarity index 100%
rename from stream-servers/testlibs/Android.bp
rename to host/testlibs/Android.bp

host/testlibs/CMakeLists.txt

diff --git a/stream-servers/testlibs/CMakeLists.txt b/host/testlibs/CMakeLists.txt
similarity index 100%
rename from stream-servers/testlibs/CMakeLists.txt
rename to host/testlibs/CMakeLists.txt

host/testlibs/Event.h

diff --git a/stream-servers/testlibs/Event.h b/host/testlibs/Event.h
similarity index 100%
rename from stream-servers/testlibs/Event.h
rename to host/testlibs/Event.h

host/testlibs/OSWindow.cpp

diff --git a/stream-servers/testlibs/OSWindow.cpp b/host/testlibs/OSWindow.cpp
similarity index 100%
rename from stream-servers/testlibs/OSWindow.cpp
rename to host/testlibs/OSWindow.cpp

host/testlibs/OSWindow.h

diff --git a/stream-servers/testlibs/OSWindow.h b/host/testlibs/OSWindow.h
similarity index 100%
rename from stream-servers/testlibs/OSWindow.h
rename to host/testlibs/OSWindow.h

host/testlibs/Timer.h

diff --git a/stream-servers/testlibs/Timer.h b/host/testlibs/Timer.h
similarity index 100%
rename from stream-servers/testlibs/Timer.h
rename to host/testlibs/Timer.h

host/testlibs/keyboard.h

diff --git a/stream-servers/testlibs/keyboard.h b/host/testlibs/keyboard.h
similarity index 100%
rename from stream-servers/testlibs/keyboard.h
rename to host/testlibs/keyboard.h

host/testlibs/mouse.h

diff --git a/stream-servers/testlibs/mouse.h b/host/testlibs/mouse.h
similarity index 100%
rename from stream-servers/testlibs/mouse.h
rename to host/testlibs/mouse.h

host/testlibs/osx/OSXWindow.h

diff --git a/stream-servers/testlibs/osx/OSXWindow.h b/host/testlibs/osx/OSXWindow.h
similarity index 100%
rename from stream-servers/testlibs/osx/OSXWindow.h
rename to host/testlibs/osx/OSXWindow.h

host/testlibs/osx/OSXWindow.mm

diff --git a/stream-servers/testlibs/osx/OSXWindow.mm b/host/testlibs/osx/OSXWindow.mm
similarity index 100%
rename from stream-servers/testlibs/osx/OSXWindow.mm
rename to host/testlibs/osx/OSXWindow.mm

host/testlibs/stub/StubWindow.cpp

diff --git a/stream-servers/testlibs/stub/StubWindow.cpp b/host/testlibs/stub/StubWindow.cpp
similarity index 100%
rename from stream-servers/testlibs/stub/StubWindow.cpp
rename to host/testlibs/stub/StubWindow.cpp

host/testlibs/windows/WindowsTimer.cpp

diff --git a/stream-servers/testlibs/windows/WindowsTimer.cpp b/host/testlibs/windows/WindowsTimer.cpp
similarity index 100%
rename from stream-servers/testlibs/windows/WindowsTimer.cpp
rename to host/testlibs/windows/WindowsTimer.cpp

host/testlibs/windows/WindowsTimer.h

diff --git a/stream-servers/testlibs/windows/WindowsTimer.h b/host/testlibs/windows/WindowsTimer.h
similarity index 100%
rename from stream-servers/testlibs/windows/WindowsTimer.h
rename to host/testlibs/windows/WindowsTimer.h

host/testlibs/windows/Windows_system_utils.cpp

diff --git a/stream-servers/testlibs/windows/Windows_system_utils.cpp b/host/testlibs/windows/Windows_system_utils.cpp
similarity index 100%
rename from stream-servers/testlibs/windows/Windows_system_utils.cpp
rename to host/testlibs/windows/Windows_system_utils.cpp

host/testlibs/windows/win32/Win32Window.cpp

diff --git a/stream-servers/testlibs/windows/win32/Win32Window.cpp b/host/testlibs/windows/win32/Win32Window.cpp
similarity index 100%
rename from stream-servers/testlibs/windows/win32/Win32Window.cpp
rename to host/testlibs/windows/win32/Win32Window.cpp

host/testlibs/windows/win32/Win32Window.h

diff --git a/stream-servers/testlibs/windows/win32/Win32Window.h b/host/testlibs/windows/win32/Win32Window.h
similarity index 100%
rename from stream-servers/testlibs/windows/win32/Win32Window.h
rename to host/testlibs/windows/win32/Win32Window.h

host/testlibs/x11/X11Window.cpp

diff --git a/stream-servers/testlibs/x11/X11Window.cpp b/host/testlibs/x11/X11Window.cpp
similarity index 100%
rename from stream-servers/testlibs/x11/X11Window.cpp
rename to host/testlibs/x11/X11Window.cpp

host/testlibs/x11/X11Window.h

diff --git a/stream-servers/testlibs/x11/X11Window.h b/host/testlibs/x11/X11Window.h
similarity index 100%
rename from stream-servers/testlibs/x11/X11Window.h
rename to host/testlibs/x11/X11Window.h

host/tests/CompositorVk_unittest.cpp

diff --git a/stream-servers/tests/CompositorVk_unittest.cpp b/host/tests/CompositorVk_unittest.cpp
similarity index 100%
rename from stream-servers/tests/CompositorVk_unittest.cpp
rename to host/tests/CompositorVk_unittest.cpp

host/tests/DefaultFramebufferBlit_unittest.cpp

diff --git a/stream-servers/tests/DefaultFramebufferBlit_unittest.cpp b/host/tests/DefaultFramebufferBlit_unittest.cpp
similarity index 100%
rename from stream-servers/tests/DefaultFramebufferBlit_unittest.cpp
rename to host/tests/DefaultFramebufferBlit_unittest.cpp

host/tests/DisplayVk_unittest.cpp

diff --git a/stream-servers/tests/DisplayVk_unittest.cpp b/host/tests/DisplayVk_unittest.cpp
similarity index 100%
rename from stream-servers/tests/DisplayVk_unittest.cpp
rename to host/tests/DisplayVk_unittest.cpp

host/tests/FrameBuffer_unittest.cpp

diff --git a/stream-servers/tests/FrameBuffer_unittest.cpp b/host/tests/FrameBuffer_unittest.cpp
similarity index 100%
rename from stream-servers/tests/FrameBuffer_unittest.cpp
rename to host/tests/FrameBuffer_unittest.cpp

host/tests/GLES1Dispatch_unittest.cpp

diff --git a/stream-servers/tests/GLES1Dispatch_unittest.cpp b/host/tests/GLES1Dispatch_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLES1Dispatch_unittest.cpp
rename to host/tests/GLES1Dispatch_unittest.cpp

host/tests/GLSnapshotBuffers_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotBuffers_unittest.cpp b/host/tests/GLSnapshotBuffers_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotBuffers_unittest.cpp
rename to host/tests/GLSnapshotBuffers_unittest.cpp

host/tests/GLSnapshotFramebufferControl_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotFramebufferControl_unittest.cpp b/host/tests/GLSnapshotFramebufferControl_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotFramebufferControl_unittest.cpp
rename to host/tests/GLSnapshotFramebufferControl_unittest.cpp

host/tests/GLSnapshotFramebuffers_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotFramebuffers_unittest.cpp b/host/tests/GLSnapshotFramebuffers_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotFramebuffers_unittest.cpp
rename to host/tests/GLSnapshotFramebuffers_unittest.cpp

host/tests/GLSnapshotMultisampling_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotMultisampling_unittest.cpp b/host/tests/GLSnapshotMultisampling_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotMultisampling_unittest.cpp
rename to host/tests/GLSnapshotMultisampling_unittest.cpp

host/tests/GLSnapshotPixelOperations_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotPixelOperations_unittest.cpp b/host/tests/GLSnapshotPixelOperations_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotPixelOperations_unittest.cpp
rename to host/tests/GLSnapshotPixelOperations_unittest.cpp

host/tests/GLSnapshotPixels_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotPixels_unittest.cpp b/host/tests/GLSnapshotPixels_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotPixels_unittest.cpp
rename to host/tests/GLSnapshotPixels_unittest.cpp

host/tests/GLSnapshotPrograms_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotPrograms_unittest.cpp b/host/tests/GLSnapshotPrograms_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotPrograms_unittest.cpp
rename to host/tests/GLSnapshotPrograms_unittest.cpp

host/tests/GLSnapshotRasterization_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotRasterization_unittest.cpp b/host/tests/GLSnapshotRasterization_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotRasterization_unittest.cpp
rename to host/tests/GLSnapshotRasterization_unittest.cpp

host/tests/GLSnapshotRenderbuffers_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotRenderbuffers_unittest.cpp b/host/tests/GLSnapshotRenderbuffers_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotRenderbuffers_unittest.cpp
rename to host/tests/GLSnapshotRenderbuffers_unittest.cpp

host/tests/GLSnapshotRendering_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotRendering_unittest.cpp b/host/tests/GLSnapshotRendering_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotRendering_unittest.cpp
rename to host/tests/GLSnapshotRendering_unittest.cpp

host/tests/GLSnapshotShaders_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotShaders_unittest.cpp b/host/tests/GLSnapshotShaders_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotShaders_unittest.cpp
rename to host/tests/GLSnapshotShaders_unittest.cpp

host/tests/GLSnapshotTestDispatch.cpp

diff --git a/stream-servers/tests/GLSnapshotTestDispatch.cpp b/host/tests/GLSnapshotTestDispatch.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotTestDispatch.cpp
rename to host/tests/GLSnapshotTestDispatch.cpp

host/tests/GLSnapshotTestDispatch.h

diff --git a/stream-servers/tests/GLSnapshotTestDispatch.h b/host/tests/GLSnapshotTestDispatch.h
similarity index 100%
rename from stream-servers/tests/GLSnapshotTestDispatch.h
rename to host/tests/GLSnapshotTestDispatch.h

host/tests/GLSnapshotTestStateUtils.cpp

diff --git a/stream-servers/tests/GLSnapshotTestStateUtils.cpp b/host/tests/GLSnapshotTestStateUtils.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotTestStateUtils.cpp
rename to host/tests/GLSnapshotTestStateUtils.cpp

host/tests/GLSnapshotTestStateUtils.h

diff --git a/stream-servers/tests/GLSnapshotTestStateUtils.h b/host/tests/GLSnapshotTestStateUtils.h
similarity index 100%
rename from stream-servers/tests/GLSnapshotTestStateUtils.h
rename to host/tests/GLSnapshotTestStateUtils.h

host/tests/GLSnapshotTesting.cpp

diff --git a/stream-servers/tests/GLSnapshotTesting.cpp b/host/tests/GLSnapshotTesting.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotTesting.cpp
rename to host/tests/GLSnapshotTesting.cpp

host/tests/GLSnapshotTesting.h

diff --git a/stream-servers/tests/GLSnapshotTesting.h b/host/tests/GLSnapshotTesting.h
similarity index 100%
rename from stream-servers/tests/GLSnapshotTesting.h
rename to host/tests/GLSnapshotTesting.h

host/tests/GLSnapshotTextures_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotTextures_unittest.cpp b/host/tests/GLSnapshotTextures_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotTextures_unittest.cpp
rename to host/tests/GLSnapshotTextures_unittest.cpp

host/tests/GLSnapshotTransformation_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotTransformation_unittest.cpp b/host/tests/GLSnapshotTransformation_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotTransformation_unittest.cpp
rename to host/tests/GLSnapshotTransformation_unittest.cpp

host/tests/GLSnapshotVertexAttributes_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshotVertexAttributes_unittest.cpp b/host/tests/GLSnapshotVertexAttributes_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshotVertexAttributes_unittest.cpp
rename to host/tests/GLSnapshotVertexAttributes_unittest.cpp

host/tests/GLSnapshot_unittest.cpp

diff --git a/stream-servers/tests/GLSnapshot_unittest.cpp b/host/tests/GLSnapshot_unittest.cpp
similarity index 100%
rename from stream-servers/tests/GLSnapshot_unittest.cpp
rename to host/tests/GLSnapshot_unittest.cpp

host/tests/GLTestUtils.cpp

diff --git a/stream-servers/tests/GLTestUtils.cpp b/host/tests/GLTestUtils.cpp
similarity index 100%
rename from stream-servers/tests/GLTestUtils.cpp
rename to host/tests/GLTestUtils.cpp

host/tests/GLTestUtils.h

diff --git a/stream-servers/tests/GLTestUtils.h b/host/tests/GLTestUtils.h
similarity index 100%
rename from stream-servers/tests/GLTestUtils.h
rename to host/tests/GLTestUtils.h

host/tests/HelloTriangle.cpp

diff --git a/stream-servers/tests/HelloTriangle.cpp b/host/tests/HelloTriangle.cpp
similarity index 100%
rename from stream-servers/tests/HelloTriangle.cpp
rename to host/tests/HelloTriangle.cpp

host/tests/HelloTriangle.h

diff --git a/stream-servers/tests/HelloTriangle.h b/host/tests/HelloTriangle.h
similarity index 100%
rename from stream-servers/tests/HelloTriangle.h
rename to host/tests/HelloTriangle.h

host/tests/HelloTriangleImp.cpp

diff --git a/stream-servers/tests/HelloTriangleImp.cpp b/host/tests/HelloTriangleImp.cpp
similarity index 100%
rename from stream-servers/tests/HelloTriangleImp.cpp
rename to host/tests/HelloTriangleImp.cpp

host/tests/ImageUtils.cpp

diff --git a/stream-servers/tests/ImageUtils.cpp b/host/tests/ImageUtils.cpp
similarity index 100%
rename from stream-servers/tests/ImageUtils.cpp
rename to host/tests/ImageUtils.cpp

host/tests/ImageUtils.h

diff --git a/stream-servers/tests/ImageUtils.h b/host/tests/ImageUtils.h
similarity index 100%
rename from stream-servers/tests/ImageUtils.h
rename to host/tests/ImageUtils.h

host/tests/Magma_unittest.cpp

diff --git a/stream-servers/tests/Magma_unittest.cpp b/host/tests/Magma_unittest.cpp
similarity index 100%
rename from stream-servers/tests/Magma_unittest.cpp
rename to host/tests/Magma_unittest.cpp

host/tests/OpenGLTestContext.cpp

diff --git a/stream-servers/tests/OpenGLTestContext.cpp b/host/tests/OpenGLTestContext.cpp
similarity index 100%
rename from stream-servers/tests/OpenGLTestContext.cpp
rename to host/tests/OpenGLTestContext.cpp

host/tests/OpenGLTestContext.h

diff --git a/stream-servers/tests/OpenGLTestContext.h b/host/tests/OpenGLTestContext.h
similarity index 100%
rename from stream-servers/tests/OpenGLTestContext.h
rename to host/tests/OpenGLTestContext.h

host/tests/OpenGL_unittest.cpp

diff --git a/stream-servers/tests/OpenGL_unittest.cpp b/host/tests/OpenGL_unittest.cpp
similarity index 100%
rename from stream-servers/tests/OpenGL_unittest.cpp
rename to host/tests/OpenGL_unittest.cpp

host/tests/SampleApplication.cpp

diff --git a/stream-servers/tests/SampleApplication.cpp b/host/tests/SampleApplication.cpp
similarity index 100%
rename from stream-servers/tests/SampleApplication.cpp
rename to host/tests/SampleApplication.cpp

host/tests/SampleApplication.h

diff --git a/stream-servers/tests/SampleApplication.h b/host/tests/SampleApplication.h
similarity index 100%
rename from stream-servers/tests/SampleApplication.h
rename to host/tests/SampleApplication.h

host/tests/ShaderUtils.cpp

diff --git a/stream-servers/tests/ShaderUtils.cpp b/host/tests/ShaderUtils.cpp
similarity index 100%
rename from stream-servers/tests/ShaderUtils.cpp
rename to host/tests/ShaderUtils.cpp

host/tests/ShaderUtils.h

diff --git a/stream-servers/tests/ShaderUtils.h b/host/tests/ShaderUtils.h
similarity index 100%
rename from stream-servers/tests/ShaderUtils.h
rename to host/tests/ShaderUtils.h

host/tests/StalePtrRegistry_unittest.cpp

diff --git a/stream-servers/tests/StalePtrRegistry_unittest.cpp b/host/tests/StalePtrRegistry_unittest.cpp
similarity index 100%
rename from stream-servers/tests/StalePtrRegistry_unittest.cpp
rename to host/tests/StalePtrRegistry_unittest.cpp

host/tests/Standalone.h

diff --git a/stream-servers/tests/Standalone.h b/host/tests/Standalone.h
similarity index 100%
rename from stream-servers/tests/Standalone.h
rename to host/tests/Standalone.h

host/tests/SwapChainStateVk_unittest.cpp

diff --git a/stream-servers/tests/SwapChainStateVk_unittest.cpp b/host/tests/SwapChainStateVk_unittest.cpp
similarity index 100%
rename from stream-servers/tests/SwapChainStateVk_unittest.cpp
rename to host/tests/SwapChainStateVk_unittest.cpp

host/tests/TextureDraw_unittest.cpp

diff --git a/stream-servers/tests/TextureDraw_unittest.cpp b/host/tests/TextureDraw_unittest.cpp
similarity index 100%
rename from stream-servers/tests/TextureDraw_unittest.cpp
rename to host/tests/TextureDraw_unittest.cpp

host/tests/VirtioGpuTimelines_unittest.cpp

diff --git a/stream-servers/tests/VirtioGpuTimelines_unittest.cpp b/host/tests/VirtioGpuTimelines_unittest.cpp
similarity index 100%
rename from stream-servers/tests/VirtioGpuTimelines_unittest.cpp
rename to host/tests/VirtioGpuTimelines_unittest.cpp

host/tests/VkTestUtils.h

diff --git a/stream-servers/tests/VkTestUtils.h b/host/tests/VkTestUtils.h
similarity index 100%
rename from stream-servers/tests/VkTestUtils.h
rename to host/tests/VkTestUtils.h

host/tests/VsyncThread_unittest.cpp

diff --git a/stream-servers/tests/VsyncThread_unittest.cpp b/host/tests/VsyncThread_unittest.cpp
similarity index 100%
rename from stream-servers/tests/VsyncThread_unittest.cpp
rename to host/tests/VsyncThread_unittest.cpp

host/tests/Vulkan_unittest.cpp

diff --git a/stream-servers/tests/Vulkan_unittest.cpp b/host/tests/Vulkan_unittest.cpp
similarity index 100%
rename from stream-servers/tests/Vulkan_unittest.cpp
rename to host/tests/Vulkan_unittest.cpp

host/tests/X11TestingSupport.cpp

diff --git a/stream-servers/tests/X11TestingSupport.cpp b/host/tests/X11TestingSupport.cpp
similarity index 100%
rename from stream-servers/tests/X11TestingSupport.cpp
rename to host/tests/X11TestingSupport.cpp

host/tests/X11TestingSupport.h

diff --git a/stream-servers/tests/X11TestingSupport.h b/host/tests/X11TestingSupport.h
similarity index 100%
rename from stream-servers/tests/X11TestingSupport.h
rename to host/tests/X11TestingSupport.h

host/tests/testdata/256x256_android.png

diff --git a/stream-servers/tests/testdata/256x256_android.png b/host/tests/testdata/256x256_android.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_android.png
rename to host/tests/testdata/256x256_android.png
Binary files differ

host/tests/testdata/256x256_android_with_transparency.png

diff --git a/stream-servers/tests/testdata/256x256_android_with_transparency.png b/host/tests/testdata/256x256_android_with_transparency.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_android_with_transparency.png
rename to host/tests/testdata/256x256_android_with_transparency.png
Binary files differ

host/tests/testdata/256x256_golden_blend_premultiplied.png

diff --git a/stream-servers/tests/testdata/256x256_golden_blend_premultiplied.png b/host/tests/testdata/256x256_golden_blend_premultiplied.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_blend_premultiplied.png
rename to host/tests/testdata/256x256_golden_blend_premultiplied.png
Binary files differ

host/tests/testdata/256x256_golden_crop.png

diff --git a/stream-servers/tests/testdata/256x256_golden_crop.png b/host/tests/testdata/256x256_golden_crop.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_crop.png
rename to host/tests/testdata/256x256_golden_crop.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_layers.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_layers.png b/host/tests/testdata/256x256_golden_multiple_layers.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_layers.png
rename to host/tests/testdata/256x256_golden_multiple_layers.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_0.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_0.png b/host/tests/testdata/256x256_golden_multiple_targets_0.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_0.png
rename to host/tests/testdata/256x256_golden_multiple_targets_0.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_1.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_1.png b/host/tests/testdata/256x256_golden_multiple_targets_1.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_1.png
rename to host/tests/testdata/256x256_golden_multiple_targets_1.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_2.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_2.png b/host/tests/testdata/256x256_golden_multiple_targets_2.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_2.png
rename to host/tests/testdata/256x256_golden_multiple_targets_2.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_3.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_3.png b/host/tests/testdata/256x256_golden_multiple_targets_3.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_3.png
rename to host/tests/testdata/256x256_golden_multiple_targets_3.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_4.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_4.png b/host/tests/testdata/256x256_golden_multiple_targets_4.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_4.png
rename to host/tests/testdata/256x256_golden_multiple_targets_4.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_5.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_5.png b/host/tests/testdata/256x256_golden_multiple_targets_5.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_5.png
rename to host/tests/testdata/256x256_golden_multiple_targets_5.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_6.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_6.png b/host/tests/testdata/256x256_golden_multiple_targets_6.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_6.png
rename to host/tests/testdata/256x256_golden_multiple_targets_6.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_7.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_7.png b/host/tests/testdata/256x256_golden_multiple_targets_7.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_7.png
rename to host/tests/testdata/256x256_golden_multiple_targets_7.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_8.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_8.png b/host/tests/testdata/256x256_golden_multiple_targets_8.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_8.png
rename to host/tests/testdata/256x256_golden_multiple_targets_8.png
Binary files differ

host/tests/testdata/256x256_golden_multiple_targets_9.png

diff --git a/stream-servers/tests/testdata/256x256_golden_multiple_targets_9.png b/host/tests/testdata/256x256_golden_multiple_targets_9.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_multiple_targets_9.png
rename to host/tests/testdata/256x256_golden_multiple_targets_9.png
Binary files differ

host/tests/testdata/256x256_golden_simple_composition.png

diff --git a/stream-servers/tests/testdata/256x256_golden_simple_composition.png b/host/tests/testdata/256x256_golden_simple_composition.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_simple_composition.png
rename to host/tests/testdata/256x256_golden_simple_composition.png
Binary files differ

host/tests/testdata/256x256_golden_transform_fliph.png

diff --git a/stream-servers/tests/testdata/256x256_golden_transform_fliph.png b/host/tests/testdata/256x256_golden_transform_fliph.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_transform_fliph.png
rename to host/tests/testdata/256x256_golden_transform_fliph.png
Binary files differ

host/tests/testdata/256x256_golden_transform_fliphrot90.png

diff --git a/stream-servers/tests/testdata/256x256_golden_transform_fliphrot90.png b/host/tests/testdata/256x256_golden_transform_fliphrot90.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_transform_fliphrot90.png
rename to host/tests/testdata/256x256_golden_transform_fliphrot90.png
Binary files differ

host/tests/testdata/256x256_golden_transform_flipv.png

diff --git a/stream-servers/tests/testdata/256x256_golden_transform_flipv.png b/host/tests/testdata/256x256_golden_transform_flipv.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_transform_flipv.png
rename to host/tests/testdata/256x256_golden_transform_flipv.png
Binary files differ

host/tests/testdata/256x256_golden_transform_flipvrot90.png

diff --git a/stream-servers/tests/testdata/256x256_golden_transform_flipvrot90.png b/host/tests/testdata/256x256_golden_transform_flipvrot90.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_transform_flipvrot90.png
rename to host/tests/testdata/256x256_golden_transform_flipvrot90.png
Binary files differ

host/tests/testdata/256x256_golden_transform_none.png

diff --git a/stream-servers/tests/testdata/256x256_golden_transform_none.png b/host/tests/testdata/256x256_golden_transform_none.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_transform_none.png
rename to host/tests/testdata/256x256_golden_transform_none.png
Binary files differ

host/tests/testdata/256x256_golden_transform_rot180.png

diff --git a/stream-servers/tests/testdata/256x256_golden_transform_rot180.png b/host/tests/testdata/256x256_golden_transform_rot180.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_transform_rot180.png
rename to host/tests/testdata/256x256_golden_transform_rot180.png
Binary files differ

host/tests/testdata/256x256_golden_transform_rot270.png

diff --git a/stream-servers/tests/testdata/256x256_golden_transform_rot270.png b/host/tests/testdata/256x256_golden_transform_rot270.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_transform_rot270.png
rename to host/tests/testdata/256x256_golden_transform_rot270.png
Binary files differ

host/tests/testdata/256x256_golden_transform_rot90.png

diff --git a/stream-servers/tests/testdata/256x256_golden_transform_rot90.png b/host/tests/testdata/256x256_golden_transform_rot90.png
similarity index 100%
rename from stream-servers/tests/testdata/256x256_golden_transform_rot90.png
rename to host/tests/testdata/256x256_golden_transform_rot90.png
Binary files differ

host/virgl_hw.h

diff --git a/stream-servers/virgl_hw.h b/host/virgl_hw.h
similarity index 100%
rename from stream-servers/virgl_hw.h
rename to host/virgl_hw.h

host/virtgpu_gfxstream_protocol.h

diff --git a/stream-servers/virtgpu_gfxstream_protocol.h b/host/virtgpu_gfxstream_protocol.h
similarity index 100%
rename from stream-servers/virtgpu_gfxstream_protocol.h
rename to host/virtgpu_gfxstream_protocol.h

host/virtio-gpu-gfxstream-renderer-unstable.h

diff --git a/stream-servers/virtio-gpu-gfxstream-renderer-unstable.h b/host/virtio-gpu-gfxstream-renderer-unstable.h
similarity index 100%
rename from stream-servers/virtio-gpu-gfxstream-renderer-unstable.h
rename to host/virtio-gpu-gfxstream-renderer-unstable.h

host/virtio-gpu-gfxstream-renderer.cpp

diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/host/virtio-gpu-gfxstream-renderer.cpp
similarity index 100%
rename from stream-servers/virtio-gpu-gfxstream-renderer.cpp
rename to host/virtio-gpu-gfxstream-renderer.cpp

host/virtio-gpu-gfxstream-renderer.h

diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.h b/host/virtio-gpu-gfxstream-renderer.h
similarity index 100%
rename from stream-servers/virtio-gpu-gfxstream-renderer.h
rename to host/virtio-gpu-gfxstream-renderer.h

host/vulkan/Android.bp

diff --git a/stream-servers/vulkan/Android.bp b/host/vulkan/Android.bp
similarity index 100%
rename from stream-servers/vulkan/Android.bp
rename to host/vulkan/Android.bp

host/vulkan/BorrowedImageVk.cpp

diff --git a/stream-servers/vulkan/BorrowedImageVk.cpp b/host/vulkan/BorrowedImageVk.cpp
similarity index 100%
rename from stream-servers/vulkan/BorrowedImageVk.cpp
rename to host/vulkan/BorrowedImageVk.cpp

host/vulkan/BorrowedImageVk.h

diff --git a/stream-servers/vulkan/BorrowedImageVk.h b/host/vulkan/BorrowedImageVk.h
similarity index 100%
rename from stream-servers/vulkan/BorrowedImageVk.h
rename to host/vulkan/BorrowedImageVk.h

host/vulkan/BufferVk.cpp

diff --git a/stream-servers/vulkan/BufferVk.cpp b/host/vulkan/BufferVk.cpp
similarity index 100%
rename from stream-servers/vulkan/BufferVk.cpp
rename to host/vulkan/BufferVk.cpp

host/vulkan/BufferVk.h

diff --git a/stream-servers/vulkan/BufferVk.h b/host/vulkan/BufferVk.h
similarity index 100%
rename from stream-servers/vulkan/BufferVk.h
rename to host/vulkan/BufferVk.h

host/vulkan/CMakeLists.txt

diff --git a/stream-servers/vulkan/CMakeLists.txt b/host/vulkan/CMakeLists.txt
similarity index 89%
rename from stream-servers/vulkan/CMakeLists.txt
rename to host/vulkan/CMakeLists.txt
index 80018e9..02e2453 100644
--- a/stream-servers/vulkan/CMakeLists.txt
+++ b/host/vulkan/CMakeLists.txt
@@ -55,7 +55,7 @@
                            PRIVATE
                            ${GFXSTREAM_REPO_ROOT}
                            ${GFXSTREAM_REPO_ROOT}/include
-                           ${GFXSTREAM_REPO_ROOT}/stream-servers
-                           ${GFXSTREAM_REPO_ROOT}/stream-servers/vulkan
-                           ${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common
+                           ${GFXSTREAM_REPO_ROOT}/host
+                           ${GFXSTREAM_REPO_ROOT}/host/vulkan
+                           ${GFXSTREAM_REPO_ROOT}/host/apigen-codec-common
                            ${GFXSTREAM_REPO_ROOT}/third-party/glm/include)

host/vulkan/ColorBufferVk.cpp

diff --git a/stream-servers/vulkan/ColorBufferVk.cpp b/host/vulkan/ColorBufferVk.cpp
similarity index 100%
rename from stream-servers/vulkan/ColorBufferVk.cpp
rename to host/vulkan/ColorBufferVk.cpp

host/vulkan/ColorBufferVk.h

diff --git a/stream-servers/vulkan/ColorBufferVk.h b/host/vulkan/ColorBufferVk.h
similarity index 100%
rename from stream-servers/vulkan/ColorBufferVk.h
rename to host/vulkan/ColorBufferVk.h

host/vulkan/Compositor.frag

diff --git a/stream-servers/vulkan/Compositor.frag b/host/vulkan/Compositor.frag
similarity index 100%
rename from stream-servers/vulkan/Compositor.frag
rename to host/vulkan/Compositor.frag

host/vulkan/Compositor.vert

diff --git a/stream-servers/vulkan/Compositor.vert b/host/vulkan/Compositor.vert
similarity index 100%
rename from stream-servers/vulkan/Compositor.vert
rename to host/vulkan/Compositor.vert

host/vulkan/CompositorFragmentShader.h

diff --git a/stream-servers/vulkan/CompositorFragmentShader.h b/host/vulkan/CompositorFragmentShader.h
similarity index 100%
rename from stream-servers/vulkan/CompositorFragmentShader.h
rename to host/vulkan/CompositorFragmentShader.h

host/vulkan/CompositorVertexShader.h

diff --git a/stream-servers/vulkan/CompositorVertexShader.h b/host/vulkan/CompositorVertexShader.h
similarity index 100%
rename from stream-servers/vulkan/CompositorVertexShader.h
rename to host/vulkan/CompositorVertexShader.h

host/vulkan/CompositorVk.cpp

diff --git a/stream-servers/vulkan/CompositorVk.cpp b/host/vulkan/CompositorVk.cpp
similarity index 100%
rename from stream-servers/vulkan/CompositorVk.cpp
rename to host/vulkan/CompositorVk.cpp

host/vulkan/CompositorVk.h

diff --git a/stream-servers/vulkan/CompositorVk.h b/host/vulkan/CompositorVk.h
similarity index 100%
rename from stream-servers/vulkan/CompositorVk.h
rename to host/vulkan/CompositorVk.h

host/vulkan/DebugUtilsHelper.cpp

diff --git a/stream-servers/vulkan/DebugUtilsHelper.cpp b/host/vulkan/DebugUtilsHelper.cpp
similarity index 100%
rename from stream-servers/vulkan/DebugUtilsHelper.cpp
rename to host/vulkan/DebugUtilsHelper.cpp

host/vulkan/DebugUtilsHelper.h

diff --git a/stream-servers/vulkan/DebugUtilsHelper.h b/host/vulkan/DebugUtilsHelper.h
similarity index 100%
rename from stream-servers/vulkan/DebugUtilsHelper.h
rename to host/vulkan/DebugUtilsHelper.h

host/vulkan/DisplaySurfaceVk.cpp

diff --git a/stream-servers/vulkan/DisplaySurfaceVk.cpp b/host/vulkan/DisplaySurfaceVk.cpp
similarity index 100%
rename from stream-servers/vulkan/DisplaySurfaceVk.cpp
rename to host/vulkan/DisplaySurfaceVk.cpp

host/vulkan/DisplaySurfaceVk.h

diff --git a/stream-servers/vulkan/DisplaySurfaceVk.h b/host/vulkan/DisplaySurfaceVk.h
similarity index 100%
rename from stream-servers/vulkan/DisplaySurfaceVk.h
rename to host/vulkan/DisplaySurfaceVk.h

host/vulkan/DisplayVk.cpp

diff --git a/stream-servers/vulkan/DisplayVk.cpp b/host/vulkan/DisplayVk.cpp
similarity index 100%
rename from stream-servers/vulkan/DisplayVk.cpp
rename to host/vulkan/DisplayVk.cpp

host/vulkan/DisplayVk.h

diff --git a/stream-servers/vulkan/DisplayVk.h b/host/vulkan/DisplayVk.h
similarity index 100%
rename from stream-servers/vulkan/DisplayVk.h
rename to host/vulkan/DisplayVk.h

host/vulkan/GrallocDefs.h

diff --git a/stream-servers/vulkan/GrallocDefs.h b/host/vulkan/GrallocDefs.h
similarity index 100%
rename from stream-servers/vulkan/GrallocDefs.h
rename to host/vulkan/GrallocDefs.h

host/vulkan/PostWorkerVk.cpp

diff --git a/stream-servers/vulkan/PostWorkerVk.cpp b/host/vulkan/PostWorkerVk.cpp
similarity index 100%
rename from stream-servers/vulkan/PostWorkerVk.cpp
rename to host/vulkan/PostWorkerVk.cpp

host/vulkan/PostWorkerVk.h

diff --git a/stream-servers/vulkan/PostWorkerVk.h b/host/vulkan/PostWorkerVk.h
similarity index 100%
rename from stream-servers/vulkan/PostWorkerVk.h
rename to host/vulkan/PostWorkerVk.h

host/vulkan/RenderThreadInfoVk.cpp

diff --git a/stream-servers/vulkan/RenderThreadInfoVk.cpp b/host/vulkan/RenderThreadInfoVk.cpp
similarity index 100%
rename from stream-servers/vulkan/RenderThreadInfoVk.cpp
rename to host/vulkan/RenderThreadInfoVk.cpp

host/vulkan/RenderThreadInfoVk.h

diff --git a/stream-servers/vulkan/RenderThreadInfoVk.h b/host/vulkan/RenderThreadInfoVk.h
similarity index 100%
rename from stream-servers/vulkan/RenderThreadInfoVk.h
rename to host/vulkan/RenderThreadInfoVk.h

host/vulkan/SwapChainStateVk.cpp

diff --git a/stream-servers/vulkan/SwapChainStateVk.cpp b/host/vulkan/SwapChainStateVk.cpp
similarity index 100%
rename from stream-servers/vulkan/SwapChainStateVk.cpp
rename to host/vulkan/SwapChainStateVk.cpp

host/vulkan/SwapChainStateVk.h

diff --git a/stream-servers/vulkan/SwapChainStateVk.h b/host/vulkan/SwapChainStateVk.h
similarity index 100%
rename from stream-servers/vulkan/SwapChainStateVk.h
rename to host/vulkan/SwapChainStateVk.h

host/vulkan/VkAndroidNativeBuffer.cpp

diff --git a/stream-servers/vulkan/VkAndroidNativeBuffer.cpp b/host/vulkan/VkAndroidNativeBuffer.cpp
similarity index 99%
rename from stream-servers/vulkan/VkAndroidNativeBuffer.cpp
rename to host/vulkan/VkAndroidNativeBuffer.cpp
index be28d76..50991b5 100644
--- a/stream-servers/vulkan/VkAndroidNativeBuffer.cpp
+++ b/host/vulkan/VkAndroidNativeBuffer.cpp
@@ -24,7 +24,7 @@
 #include "cereal/common/goldfish_vk_extension_structs.h"
 #include "cereal/common/goldfish_vk_private_defs.h"
 #include "host-common/GfxstreamFatalError.h"
-#include "stream-servers/FrameBuffer.h"
+#include "host/FrameBuffer.h"
 #include "vulkan/vk_enum_string_helper.h"
 
 namespace gfxstream {

host/vulkan/VkAndroidNativeBuffer.h

diff --git a/stream-servers/vulkan/VkAndroidNativeBuffer.h b/host/vulkan/VkAndroidNativeBuffer.h
similarity index 100%
rename from stream-servers/vulkan/VkAndroidNativeBuffer.h
rename to host/vulkan/VkAndroidNativeBuffer.h

host/vulkan/VkCommonOperations.cpp

diff --git a/stream-servers/vulkan/VkCommonOperations.cpp b/host/vulkan/VkCommonOperations.cpp
similarity index 100%
rename from stream-servers/vulkan/VkCommonOperations.cpp
rename to host/vulkan/VkCommonOperations.cpp

host/vulkan/VkCommonOperations.h

diff --git a/stream-servers/vulkan/VkCommonOperations.h b/host/vulkan/VkCommonOperations.h
similarity index 100%
rename from stream-servers/vulkan/VkCommonOperations.h
rename to host/vulkan/VkCommonOperations.h

host/vulkan/VkDecoder.cpp

diff --git a/stream-servers/vulkan/VkDecoder.cpp b/host/vulkan/VkDecoder.cpp
similarity index 99%
rename from stream-servers/vulkan/VkDecoder.cpp
rename to host/vulkan/VkDecoder.cpp
index ec89744..b91e021 100644
--- a/stream-servers/vulkan/VkDecoder.cpp
+++ b/host/vulkan/VkDecoder.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module VkDecoder
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
@@ -50,8 +50,8 @@
 #include "host-common/GfxstreamFatalError.h"
 #include "host-common/feature_control.h"
 #include "host-common/logging.h"
+#include "host/FrameBuffer.h"
 #include "render-utils/IOStream.h"
-#include "stream-servers/FrameBuffer.h"
 
 #define MAX_PACKET_LENGTH (400 * 1024 * 1024)  // 400MB
 

host/vulkan/VkDecoder.h

diff --git a/stream-servers/vulkan/VkDecoder.h b/host/vulkan/VkDecoder.h
similarity index 99%
rename from stream-servers/vulkan/VkDecoder.h
rename to host/vulkan/VkDecoder.h
index 963b7dc..e8e3381 100644
--- a/stream-servers/vulkan/VkDecoder.h
+++ b/host/vulkan/VkDecoder.h
@@ -16,7 +16,7 @@
 // Autogenerated module VkDecoder
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/VkDecoderContext.h

diff --git a/stream-servers/vulkan/VkDecoderContext.h b/host/vulkan/VkDecoderContext.h
similarity index 100%
rename from stream-servers/vulkan/VkDecoderContext.h
rename to host/vulkan/VkDecoderContext.h

host/vulkan/VkDecoderGlobalState.cpp

diff --git a/stream-servers/vulkan/VkDecoderGlobalState.cpp b/host/vulkan/VkDecoderGlobalState.cpp
similarity index 100%
rename from stream-servers/vulkan/VkDecoderGlobalState.cpp
rename to host/vulkan/VkDecoderGlobalState.cpp

host/vulkan/VkDecoderGlobalState.h

diff --git a/stream-servers/vulkan/VkDecoderGlobalState.h b/host/vulkan/VkDecoderGlobalState.h
similarity index 100%
rename from stream-servers/vulkan/VkDecoderGlobalState.h
rename to host/vulkan/VkDecoderGlobalState.h

host/vulkan/VkDecoderGlobalState_unittest.cpp

diff --git a/stream-servers/vulkan/VkDecoderGlobalState_unittest.cpp b/host/vulkan/VkDecoderGlobalState_unittest.cpp
similarity index 100%
rename from stream-servers/vulkan/VkDecoderGlobalState_unittest.cpp
rename to host/vulkan/VkDecoderGlobalState_unittest.cpp

host/vulkan/VkDecoderSnapshot.cpp

diff --git a/stream-servers/vulkan/VkDecoderSnapshot.cpp b/host/vulkan/VkDecoderSnapshot.cpp
similarity index 99%
rename from stream-servers/vulkan/VkDecoderSnapshot.cpp
rename to host/vulkan/VkDecoderSnapshot.cpp
index 99034b4..bbc32ca 100644
--- a/stream-servers/vulkan/VkDecoderSnapshot.cpp
+++ b/host/vulkan/VkDecoderSnapshot.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module VkDecoderSnapshot
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/VkDecoderSnapshot.h

diff --git a/stream-servers/vulkan/VkDecoderSnapshot.h b/host/vulkan/VkDecoderSnapshot.h
similarity index 99%
rename from stream-servers/vulkan/VkDecoderSnapshot.h
rename to host/vulkan/VkDecoderSnapshot.h
index 37a62cc..ef1eb06 100644
--- a/stream-servers/vulkan/VkDecoderSnapshot.h
+++ b/host/vulkan/VkDecoderSnapshot.h
@@ -16,7 +16,7 @@
 // Autogenerated module VkDecoderSnapshot
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/VkFormatUtils.cpp

diff --git a/stream-servers/vulkan/VkFormatUtils.cpp b/host/vulkan/VkFormatUtils.cpp
similarity index 100%
rename from stream-servers/vulkan/VkFormatUtils.cpp
rename to host/vulkan/VkFormatUtils.cpp

host/vulkan/VkFormatUtils.h

diff --git a/stream-servers/vulkan/VkFormatUtils.h b/host/vulkan/VkFormatUtils.h
similarity index 100%
rename from stream-servers/vulkan/VkFormatUtils.h
rename to host/vulkan/VkFormatUtils.h

host/vulkan/VkFormatUtils_unittest.cpp

diff --git a/stream-servers/vulkan/VkFormatUtils_unittest.cpp b/host/vulkan/VkFormatUtils_unittest.cpp
similarity index 100%
rename from stream-servers/vulkan/VkFormatUtils_unittest.cpp
rename to host/vulkan/VkFormatUtils_unittest.cpp

host/vulkan/VkQsriTimeline.h

diff --git a/stream-servers/vulkan/VkQsriTimeline.h b/host/vulkan/VkQsriTimeline.h
similarity index 100%
rename from stream-servers/vulkan/VkQsriTimeline.h
rename to host/vulkan/VkQsriTimeline.h

host/vulkan/VkQsriTimeline_unittest.cpp

diff --git a/stream-servers/vulkan/VkQsriTimeline_unittest.cpp b/host/vulkan/VkQsriTimeline_unittest.cpp
similarity index 100%
rename from stream-servers/vulkan/VkQsriTimeline_unittest.cpp
rename to host/vulkan/VkQsriTimeline_unittest.cpp

host/vulkan/VkReconstruction.cpp

diff --git a/stream-servers/vulkan/VkReconstruction.cpp b/host/vulkan/VkReconstruction.cpp
similarity index 100%
rename from stream-servers/vulkan/VkReconstruction.cpp
rename to host/vulkan/VkReconstruction.cpp

host/vulkan/VkReconstruction.h

diff --git a/stream-servers/vulkan/VkReconstruction.h b/host/vulkan/VkReconstruction.h
similarity index 100%
rename from stream-servers/vulkan/VkReconstruction.h
rename to host/vulkan/VkReconstruction.h

host/vulkan/VkSubDecoder.cpp

diff --git a/stream-servers/vulkan/VkSubDecoder.cpp b/host/vulkan/VkSubDecoder.cpp
similarity index 99%
rename from stream-servers/vulkan/VkSubDecoder.cpp
rename to host/vulkan/VkSubDecoder.cpp
index 4c9b311..672ab6d 100644
--- a/stream-servers/vulkan/VkSubDecoder.cpp
+++ b/host/vulkan/VkSubDecoder.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module VkSubDecoder
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/VulkanDispatch.cpp

diff --git a/stream-servers/vulkan/VulkanDispatch.cpp b/host/vulkan/VulkanDispatch.cpp
similarity index 100%
rename from stream-servers/vulkan/VulkanDispatch.cpp
rename to host/vulkan/VulkanDispatch.cpp

host/vulkan/VulkanDispatch.h

diff --git a/stream-servers/vulkan/VulkanDispatch.h b/host/vulkan/VulkanDispatch.h
similarity index 100%
rename from stream-servers/vulkan/VulkanDispatch.h
rename to host/vulkan/VulkanDispatch.h

host/vulkan/VulkanHandleMapping.cpp

diff --git a/stream-servers/vulkan/VulkanHandleMapping.cpp b/host/vulkan/VulkanHandleMapping.cpp
similarity index 100%
rename from stream-servers/vulkan/VulkanHandleMapping.cpp
rename to host/vulkan/VulkanHandleMapping.cpp

host/vulkan/VulkanHandleMapping.h

diff --git a/stream-servers/vulkan/VulkanHandleMapping.h b/host/vulkan/VulkanHandleMapping.h
similarity index 100%
rename from stream-servers/vulkan/VulkanHandleMapping.h
rename to host/vulkan/VulkanHandleMapping.h

host/vulkan/VulkanHandles.h

diff --git a/stream-servers/vulkan/VulkanHandles.h b/host/vulkan/VulkanHandles.h
similarity index 100%
rename from stream-servers/vulkan/VulkanHandles.h
rename to host/vulkan/VulkanHandles.h

host/vulkan/VulkanStream.cpp

diff --git a/stream-servers/vulkan/VulkanStream.cpp b/host/vulkan/VulkanStream.cpp
similarity index 100%
rename from stream-servers/vulkan/VulkanStream.cpp
rename to host/vulkan/VulkanStream.cpp

host/vulkan/VulkanStream.h

diff --git a/stream-servers/vulkan/VulkanStream.h b/host/vulkan/VulkanStream.h
similarity index 100%
rename from stream-servers/vulkan/VulkanStream.h
rename to host/vulkan/VulkanStream.h

host/vulkan/VulkanStream_unittest.cpp

diff --git a/stream-servers/vulkan/VulkanStream_unittest.cpp b/host/vulkan/VulkanStream_unittest.cpp
similarity index 100%
rename from stream-servers/vulkan/VulkanStream_unittest.cpp
rename to host/vulkan/VulkanStream_unittest.cpp

host/vulkan/cereal/Android.bp

diff --git a/stream-servers/vulkan/cereal/Android.bp b/host/vulkan/cereal/Android.bp
similarity index 100%
rename from stream-servers/vulkan/cereal/Android.bp
rename to host/vulkan/cereal/Android.bp

host/vulkan/cereal/CMakeLists.txt

diff --git a/stream-servers/vulkan/cereal/CMakeLists.txt b/host/vulkan/cereal/CMakeLists.txt
similarity index 94%
rename from stream-servers/vulkan/cereal/CMakeLists.txt
rename to host/vulkan/cereal/CMakeLists.txt
index f8c3173..318fac7 100644
--- a/stream-servers/vulkan/cereal/CMakeLists.txt
+++ b/host/vulkan/cereal/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # Autogenerated makefile
-# registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+# registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 # Please do not modify directly;
 # re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
 # or directly from Python by defining:

host/vulkan/cereal/common/goldfish_vk_deepcopy.cpp

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.cpp b/host/vulkan/cereal/common/goldfish_vk_deepcopy.cpp
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.cpp
rename to host/vulkan/cereal/common/goldfish_vk_deepcopy.cpp
index 9b6bab7..a6ea890 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.cpp
+++ b/host/vulkan/cereal/common/goldfish_vk_deepcopy.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_deepcopy
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_deepcopy.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.h b/host/vulkan/cereal/common/goldfish_vk_deepcopy.h
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.h
rename to host/vulkan/cereal/common/goldfish_vk_deepcopy.h
index 0bb7d53..10b1a9d 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_deepcopy.h
+++ b/host/vulkan/cereal/common/goldfish_vk_deepcopy.h
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_deepcopy
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_dispatch.cpp

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.cpp b/host/vulkan/cereal/common/goldfish_vk_dispatch.cpp
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.cpp
rename to host/vulkan/cereal/common/goldfish_vk_dispatch.cpp
index 73244a9..dcb91e2 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.cpp
+++ b/host/vulkan/cereal/common/goldfish_vk_dispatch.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_dispatch
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_dispatch.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.h b/host/vulkan/cereal/common/goldfish_vk_dispatch.h
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.h
rename to host/vulkan/cereal/common/goldfish_vk_dispatch.h
index d80f100..8d5cefd 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.h
+++ b/host/vulkan/cereal/common/goldfish_vk_dispatch.h
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_dispatch
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_extension_structs.cpp

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.cpp b/host/vulkan/cereal/common/goldfish_vk_extension_structs.cpp
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.cpp
rename to host/vulkan/cereal/common/goldfish_vk_extension_structs.cpp
index b789a0d..252dff2 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.cpp
+++ b/host/vulkan/cereal/common/goldfish_vk_extension_structs.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_extension_structs
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_extension_structs.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.h b/host/vulkan/cereal/common/goldfish_vk_extension_structs.h
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.h
rename to host/vulkan/cereal/common/goldfish_vk_extension_structs.h
index 92cfb38..354397e 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_extension_structs.h
+++ b/host/vulkan/cereal/common/goldfish_vk_extension_structs.h
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_extension_structs
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_handlemap.cpp

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.cpp b/host/vulkan/cereal/common/goldfish_vk_handlemap.cpp
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.cpp
rename to host/vulkan/cereal/common/goldfish_vk_handlemap.cpp
index e76c6f6..5dcd8a5 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.cpp
+++ b/host/vulkan/cereal/common/goldfish_vk_handlemap.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_handlemap
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_handlemap.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.h b/host/vulkan/cereal/common/goldfish_vk_handlemap.h
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.h
rename to host/vulkan/cereal/common/goldfish_vk_handlemap.h
index 6be323a..791ade7 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_handlemap.h
+++ b/host/vulkan/cereal/common/goldfish_vk_handlemap.h
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_handlemap
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_marshaling.cpp

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp b/host/vulkan/cereal/common/goldfish_vk_marshaling.cpp
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp
rename to host/vulkan/cereal/common/goldfish_vk_marshaling.cpp
index e2d9ba0..3a89cae 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.cpp
+++ b/host/vulkan/cereal/common/goldfish_vk_marshaling.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_marshaling
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_marshaling.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h b/host/vulkan/cereal/common/goldfish_vk_marshaling.h
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h
rename to host/vulkan/cereal/common/goldfish_vk_marshaling.h
index a9455a8..6573652 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h
+++ b/host/vulkan/cereal/common/goldfish_vk_marshaling.h
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_marshaling
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_private_defs.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_private_defs.h b/host/vulkan/cereal/common/goldfish_vk_private_defs.h
similarity index 100%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_private_defs.h
rename to host/vulkan/cereal/common/goldfish_vk_private_defs.h

host/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp b/host/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
rename to host/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
index c49f478..d6d9816 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
+++ b/host/vulkan/cereal/common/goldfish_vk_reserved_marshaling.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_reserved_marshaling
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h b/host/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
rename to host/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
index 1b9e95e..cd7f4d6 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
+++ b/host/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_reserved_marshaling
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_testing.cpp

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp b/host/vulkan/cereal/common/goldfish_vk_testing.cpp
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp
rename to host/vulkan/cereal/common/goldfish_vk_testing.cpp
index 19450c0..8fd7d62 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.cpp
+++ b/host/vulkan/cereal/common/goldfish_vk_testing.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_testing
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_testing.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.h b/host/vulkan/cereal/common/goldfish_vk_testing.h
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_testing.h
rename to host/vulkan/cereal/common/goldfish_vk_testing.h
index 80c35a7..9003856 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_testing.h
+++ b/host/vulkan/cereal/common/goldfish_vk_testing.h
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_testing
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_transform.cpp

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_transform.cpp b/host/vulkan/cereal/common/goldfish_vk_transform.cpp
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_transform.cpp
rename to host/vulkan/cereal/common/goldfish_vk_transform.cpp
index 894a2ba..ae336de 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_transform.cpp
+++ b/host/vulkan/cereal/common/goldfish_vk_transform.cpp
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_transform
 //
 // (impl) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml cereal
-// -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_transform.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_transform.h b/host/vulkan/cereal/common/goldfish_vk_transform.h
similarity index 99%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_transform.h
rename to host/vulkan/cereal/common/goldfish_vk_transform.h
index 9f46b04..9f0eca7 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_transform.h
+++ b/host/vulkan/cereal/common/goldfish_vk_transform.h
@@ -16,7 +16,7 @@
 // Autogenerated module goldfish_vk_transform
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/cereal/common/goldfish_vk_unbox.cpp

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_unbox.cpp b/host/vulkan/cereal/common/goldfish_vk_unbox.cpp
similarity index 100%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_unbox.cpp
rename to host/vulkan/cereal/common/goldfish_vk_unbox.cpp

host/vulkan/cereal/common/goldfish_vk_unbox.h

diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_unbox.h b/host/vulkan/cereal/common/goldfish_vk_unbox.h
similarity index 100%
rename from stream-servers/vulkan/cereal/common/goldfish_vk_unbox.h
rename to host/vulkan/cereal/common/goldfish_vk_unbox.h

host/vulkan/cereal/common/vk_struct_id.h

diff --git a/stream-servers/vulkan/cereal/common/vk_struct_id.h b/host/vulkan/cereal/common/vk_struct_id.h
similarity index 100%
rename from stream-servers/vulkan/cereal/common/vk_struct_id.h
rename to host/vulkan/cereal/common/vk_struct_id.h

host/vulkan/cereal/proto/CMakeLists.txt

diff --git a/stream-servers/vulkan/cereal/proto/CMakeLists.txt b/host/vulkan/cereal/proto/CMakeLists.txt
similarity index 90%
rename from stream-servers/vulkan/cereal/proto/CMakeLists.txt
rename to host/vulkan/cereal/proto/CMakeLists.txt
index 7bb4e39..09124fe 100644
--- a/stream-servers/vulkan/cereal/proto/CMakeLists.txt
+++ b/host/vulkan/cereal/proto/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # Autogenerated makefile
-# ../protocols/vk-gen/xml/genvk.py -registry ../protocols/vk-gen/xml/vk.xml cereal -o ../stream-servers/vulkan/cereal
+# ../protocols/vk-gen/xml/genvk.py -registry ../protocols/vk-gen/xml/vk.xml cereal -o ../host/vulkan/cereal
 # Please do not modify directly;
 # re-run generate-vulkan-sources.sh,
 # or directly from Python by defining:

host/vulkan/cereal/proto/goldfish_vk_baseprotodefs.proto

diff --git a/stream-servers/vulkan/cereal/proto/goldfish_vk_baseprotodefs.proto b/host/vulkan/cereal/proto/goldfish_vk_baseprotodefs.proto
similarity index 100%
rename from stream-servers/vulkan/cereal/proto/goldfish_vk_baseprotodefs.proto
rename to host/vulkan/cereal/proto/goldfish_vk_baseprotodefs.proto

host/vulkan/emulated_textures/Android.bp

diff --git a/stream-servers/vulkan/emulated_textures/Android.bp b/host/vulkan/emulated_textures/Android.bp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/Android.bp
rename to host/vulkan/emulated_textures/Android.bp

host/vulkan/emulated_textures/AstcTexture.cpp

diff --git a/stream-servers/vulkan/emulated_textures/AstcTexture.cpp b/host/vulkan/emulated_textures/AstcTexture.cpp
similarity index 99%
rename from stream-servers/vulkan/emulated_textures/AstcTexture.cpp
rename to host/vulkan/emulated_textures/AstcTexture.cpp
index 5057ad7..eb830da 100644
--- a/stream-servers/vulkan/emulated_textures/AstcTexture.cpp
+++ b/host/vulkan/emulated_textures/AstcTexture.cpp
@@ -22,7 +22,7 @@
 
 #include "aemu/base/HealthMonitor.h"
 #include "host-common/logging.h"
-#include "stream-servers/vulkan/vk_util.h"
+#include "host/vulkan/vk_util.h"
 
 namespace gfxstream {
 namespace vk {

host/vulkan/emulated_textures/AstcTexture.h

diff --git a/stream-servers/vulkan/emulated_textures/AstcTexture.h b/host/vulkan/emulated_textures/AstcTexture.h
similarity index 97%
rename from stream-servers/vulkan/emulated_textures/AstcTexture.h
rename to host/vulkan/emulated_textures/AstcTexture.h
index 6b491a7..5aa688d 100644
--- a/stream-servers/vulkan/emulated_textures/AstcTexture.h
+++ b/host/vulkan/emulated_textures/AstcTexture.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "compressedTextureFormats/AstcCpuDecompressor.h"
-#include "stream-servers/vulkan/VkDecoderContext.h"
+#include "host/vulkan/VkDecoderContext.h"
 #include "vulkan/cereal/common/goldfish_vk_dispatch.h"
 #include "vulkan/vulkan.h"
 

host/vulkan/emulated_textures/CMakeLists.txt

diff --git a/stream-servers/vulkan/emulated_textures/CMakeLists.txt b/host/vulkan/emulated_textures/CMakeLists.txt
similarity index 80%
rename from stream-servers/vulkan/emulated_textures/CMakeLists.txt
rename to host/vulkan/emulated_textures/CMakeLists.txt
index 7fb21b0..994c087 100644
--- a/stream-servers/vulkan/emulated_textures/CMakeLists.txt
+++ b/host/vulkan/emulated_textures/CMakeLists.txt
@@ -14,5 +14,5 @@
         PRIVATE
         ${GFXSTREAM_REPO_ROOT}
         ${GFXSTREAM_REPO_ROOT}/include
-        ${GFXSTREAM_REPO_ROOT}/stream-servers
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/vulkan)
+        ${GFXSTREAM_REPO_ROOT}/host
+        ${GFXSTREAM_REPO_ROOT}/host/vulkan)

host/vulkan/emulated_textures/CompressedImageInfo.cpp

diff --git a/stream-servers/vulkan/emulated_textures/CompressedImageInfo.cpp b/host/vulkan/emulated_textures/CompressedImageInfo.cpp
similarity index 99%
rename from stream-servers/vulkan/emulated_textures/CompressedImageInfo.cpp
rename to host/vulkan/emulated_textures/CompressedImageInfo.cpp
index 0110103..b9221e3 100644
--- a/stream-servers/vulkan/emulated_textures/CompressedImageInfo.cpp
+++ b/host/vulkan/emulated_textures/CompressedImageInfo.cpp
@@ -15,8 +15,8 @@
 #include "CompressedImageInfo.h"
 
 #include "aemu/base/ArraySize.h"
-#include "stream-servers/vulkan/VkFormatUtils.h"
-#include "stream-servers/vulkan/emulated_textures/shaders/DecompressionShaders.h"
+#include "host/vulkan/VkFormatUtils.h"
+#include "host/vulkan/emulated_textures/shaders/DecompressionShaders.h"
 
 namespace gfxstream {
 namespace vk {

host/vulkan/emulated_textures/CompressedImageInfo.h

diff --git a/stream-servers/vulkan/emulated_textures/CompressedImageInfo.h b/host/vulkan/emulated_textures/CompressedImageInfo.h
similarity index 98%
rename from stream-servers/vulkan/emulated_textures/CompressedImageInfo.h
rename to host/vulkan/emulated_textures/CompressedImageInfo.h
index 88e3c7b..f60b9d6 100644
--- a/stream-servers/vulkan/emulated_textures/CompressedImageInfo.h
+++ b/host/vulkan/emulated_textures/CompressedImageInfo.h
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "stream-servers/vulkan/emulated_textures/AstcTexture.h"
+#include "host/vulkan/emulated_textures/AstcTexture.h"
 #include "vulkan/cereal/common/goldfish_vk_dispatch.h"
 #include "vulkan/vulkan.h"
 

host/vulkan/emulated_textures/README.md

diff --git a/stream-servers/vulkan/emulated_textures/README.md b/host/vulkan/emulated_textures/README.md
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/README.md
rename to host/vulkan/emulated_textures/README.md

host/vulkan/emulated_textures/shaders/Astc.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/Astc.comp b/host/vulkan/emulated_textures/shaders/Astc.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/Astc.comp
rename to host/vulkan/emulated_textures/shaders/Astc.comp

host/vulkan/emulated_textures/shaders/AstcUnquantMap.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/AstcUnquantMap.comp b/host/vulkan/emulated_textures/shaders/AstcUnquantMap.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/AstcUnquantMap.comp
rename to host/vulkan/emulated_textures/shaders/AstcUnquantMap.comp

host/vulkan/emulated_textures/shaders/Common.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/Common.comp b/host/vulkan/emulated_textures/shaders/Common.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/Common.comp
rename to host/vulkan/emulated_textures/shaders/Common.comp

host/vulkan/emulated_textures/shaders/DecompressionShaders.h

diff --git a/stream-servers/vulkan/emulated_textures/shaders/DecompressionShaders.h b/host/vulkan/emulated_textures/shaders/DecompressionShaders.h
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/DecompressionShaders.h
rename to host/vulkan/emulated_textures/shaders/DecompressionShaders.h

host/vulkan/emulated_textures/shaders/EacR11Snorm.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/EacR11Snorm.comp b/host/vulkan/emulated_textures/shaders/EacR11Snorm.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/EacR11Snorm.comp
rename to host/vulkan/emulated_textures/shaders/EacR11Snorm.comp

host/vulkan/emulated_textures/shaders/EacR11Unorm.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/EacR11Unorm.comp b/host/vulkan/emulated_textures/shaders/EacR11Unorm.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/EacR11Unorm.comp
rename to host/vulkan/emulated_textures/shaders/EacR11Unorm.comp

host/vulkan/emulated_textures/shaders/EacRG11Snorm.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/EacRG11Snorm.comp b/host/vulkan/emulated_textures/shaders/EacRG11Snorm.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/EacRG11Snorm.comp
rename to host/vulkan/emulated_textures/shaders/EacRG11Snorm.comp

host/vulkan/emulated_textures/shaders/EacRG11Unorm.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/EacRG11Unorm.comp b/host/vulkan/emulated_textures/shaders/EacRG11Unorm.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/EacRG11Unorm.comp
rename to host/vulkan/emulated_textures/shaders/EacRG11Unorm.comp

host/vulkan/emulated_textures/shaders/Etc2RGB8.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/Etc2RGB8.comp b/host/vulkan/emulated_textures/shaders/Etc2RGB8.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/Etc2RGB8.comp
rename to host/vulkan/emulated_textures/shaders/Etc2RGB8.comp

host/vulkan/emulated_textures/shaders/Etc2RGBA8.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/Etc2RGBA8.comp b/host/vulkan/emulated_textures/shaders/Etc2RGBA8.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/Etc2RGBA8.comp
rename to host/vulkan/emulated_textures/shaders/Etc2RGBA8.comp

host/vulkan/emulated_textures/shaders/Etc2ShaderLib.comp

diff --git a/stream-servers/vulkan/emulated_textures/shaders/Etc2ShaderLib.comp b/host/vulkan/emulated_textures/shaders/Etc2ShaderLib.comp
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/Etc2ShaderLib.comp
rename to host/vulkan/emulated_textures/shaders/Etc2ShaderLib.comp

host/vulkan/emulated_textures/shaders/build_shaders.py

diff --git a/stream-servers/vulkan/emulated_textures/shaders/build_shaders.py b/host/vulkan/emulated_textures/shaders/build_shaders.py
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/build_shaders.py
rename to host/vulkan/emulated_textures/shaders/build_shaders.py

host/vulkan/emulated_textures/shaders/compiled/Astc_1D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/Astc_1D.inl b/host/vulkan/emulated_textures/shaders/compiled/Astc_1D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/Astc_1D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/Astc_1D.inl

host/vulkan/emulated_textures/shaders/compiled/Astc_2D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/Astc_2D.inl b/host/vulkan/emulated_textures/shaders/compiled/Astc_2D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/Astc_2D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/Astc_2D.inl

host/vulkan/emulated_textures/shaders/compiled/Astc_3D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/Astc_3D.inl b/host/vulkan/emulated_textures/shaders/compiled/Astc_3D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/Astc_3D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/Astc_3D.inl

host/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_1D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_1D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_1D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_1D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_1D.inl

host/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_2D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_2D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_2D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_2D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_2D.inl

host/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_3D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_3D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_3D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_3D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacR11Snorm_3D.inl

host/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_1D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_1D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_1D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_1D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_1D.inl

host/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_2D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_2D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_2D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_2D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_2D.inl

host/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_3D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_3D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_3D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_3D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacR11Unorm_3D.inl

host/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_1D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_1D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_1D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_1D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_1D.inl

host/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_2D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_2D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_2D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_2D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_2D.inl

host/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_3D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_3D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_3D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_3D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacRG11Snorm_3D.inl

host/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_1D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_1D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_1D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_1D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_1D.inl

host/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_2D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_2D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_2D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_2D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_2D.inl

host/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_3D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_3D.inl b/host/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_3D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_3D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/EacRG11Unorm_3D.inl

host/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_1D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_1D.inl b/host/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_1D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_1D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_1D.inl

host/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_2D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_2D.inl b/host/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_2D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_2D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_2D.inl

host/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_3D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_3D.inl b/host/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_3D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_3D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/Etc2RGB8_3D.inl

host/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_1D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_1D.inl b/host/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_1D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_1D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_1D.inl

host/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_2D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_2D.inl b/host/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_2D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_2D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_2D.inl

host/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_3D.inl

diff --git a/stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_3D.inl b/host/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_3D.inl
similarity index 100%
rename from stream-servers/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_3D.inl
rename to host/vulkan/emulated_textures/shaders/compiled/Etc2RGBA8_3D.inl

host/vulkan/testing/VkDecoderTestDispatch.h

diff --git a/stream-servers/vulkan/testing/VkDecoderTestDispatch.h b/host/vulkan/testing/VkDecoderTestDispatch.h
similarity index 98%
rename from stream-servers/vulkan/testing/VkDecoderTestDispatch.h
rename to host/vulkan/testing/VkDecoderTestDispatch.h
index 667690f..f96ffdd 100644
--- a/stream-servers/vulkan/testing/VkDecoderTestDispatch.h
+++ b/host/vulkan/testing/VkDecoderTestDispatch.h
@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "stream-servers/vulkan/VkDecoderGlobalState.h"
-#include "stream-servers/vulkan/cereal/common/goldfish_vk_dispatch.h"
+#include "host/vulkan/VkDecoderGlobalState.h"
+#include "host/vulkan/cereal/common/goldfish_vk_dispatch.h"
 #include "vulkan/vulkan.h"
 
 namespace gfxstream {

host/vulkan/testing/VulkanTestHelper.cpp

diff --git a/stream-servers/vulkan/testing/VulkanTestHelper.cpp b/host/vulkan/testing/VulkanTestHelper.cpp
similarity index 100%
rename from stream-servers/vulkan/testing/VulkanTestHelper.cpp
rename to host/vulkan/testing/VulkanTestHelper.cpp

host/vulkan/testing/VulkanTestHelper.h

diff --git a/stream-servers/vulkan/testing/VulkanTestHelper.h b/host/vulkan/testing/VulkanTestHelper.h
similarity index 95%
rename from stream-servers/vulkan/testing/VulkanTestHelper.h
rename to host/vulkan/testing/VulkanTestHelper.h
index d3c3edc..1c96c68 100644
--- a/stream-servers/vulkan/testing/VulkanTestHelper.h
+++ b/host/vulkan/testing/VulkanTestHelper.h
@@ -19,9 +19,9 @@
 #include "aemu/base/BumpPool.h"
 #include "base/include/aemu/base/HealthMonitor.h"
 #include "base/include/aemu/base/Metrics.h"
-#include "stream-servers/vulkan/VkCommonOperations.h"
-#include "stream-servers/vulkan/VkDecoderContext.h"
-#include "stream-servers/vulkan/testing/VkDecoderTestDispatch.h"
+#include "host/vulkan/VkCommonOperations.h"
+#include "host/vulkan/VkDecoderContext.h"
+#include "host/vulkan/testing/VkDecoderTestDispatch.h"
 #include "utils/include/utils/GfxApiLogger.h"
 
 namespace gfxstream {

host/vulkan/vk_android_native_buffer.h

diff --git a/stream-servers/vulkan/vk_android_native_buffer.h b/host/vulkan/vk_android_native_buffer.h
similarity index 100%
rename from stream-servers/vulkan/vk_android_native_buffer.h
rename to host/vulkan/vk_android_native_buffer.h

host/vulkan/vk_android_native_buffer_structure_type.h

diff --git a/stream-servers/vulkan/vk_android_native_buffer_structure_type.h b/host/vulkan/vk_android_native_buffer_structure_type.h
similarity index 94%
rename from stream-servers/vulkan/vk_android_native_buffer_structure_type.h
rename to host/vulkan/vk_android_native_buffer_structure_type.h
index 983f85b..6a46ad3 100644
--- a/stream-servers/vulkan/vk_android_native_buffer_structure_type.h
+++ b/host/vulkan/vk_android_native_buffer_structure_type.h
@@ -16,7 +16,7 @@
 // Autogenerated module vk_android_native_buffer_structure_type
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

host/vulkan/vk_fn_info.h

diff --git a/stream-servers/vulkan/vk_fn_info.h b/host/vulkan/vk_fn_info.h
similarity index 100%
rename from stream-servers/vulkan/vk_fn_info.h
rename to host/vulkan/vk_fn_info.h

host/vulkan/vk_format_info.h

diff --git a/stream-servers/vulkan/vk_format_info.h b/host/vulkan/vk_format_info.h
similarity index 100%
rename from stream-servers/vulkan/vk_format_info.h
rename to host/vulkan/vk_format_info.h

host/vulkan/vk_util.cpp

diff --git a/stream-servers/vulkan/vk_util.cpp b/host/vulkan/vk_util.cpp
similarity index 100%
rename from stream-servers/vulkan/vk_util.cpp
rename to host/vulkan/vk_util.cpp

host/vulkan/vk_util.h

diff --git a/stream-servers/vulkan/vk_util.h b/host/vulkan/vk_util.h
similarity index 100%
rename from stream-servers/vulkan/vk_util.h
rename to host/vulkan/vk_util.h

host/vulkan/vk_util_unittest.cpp

diff --git a/stream-servers/vulkan/vk_util_unittest.cpp b/host/vulkan/vk_util_unittest.cpp
similarity index 100%
rename from stream-servers/vulkan/vk_util_unittest.cpp
rename to host/vulkan/vk_util_unittest.cpp

host/vulkan/vulkan_gfxstream.h

diff --git a/stream-servers/vulkan/vulkan_gfxstream.h b/host/vulkan/vulkan_gfxstream.h
similarity index 100%
rename from stream-servers/vulkan/vulkan_gfxstream.h
rename to host/vulkan/vulkan_gfxstream.h

host/vulkan/vulkan_gfxstream_structure_type.h

diff --git a/stream-servers/vulkan/vulkan_gfxstream_structure_type.h b/host/vulkan/vulkan_gfxstream_structure_type.h
similarity index 95%
rename from stream-servers/vulkan/vulkan_gfxstream_structure_type.h
rename to host/vulkan/vulkan_gfxstream_structure_type.h
index 23ebb82..e8958aa 100644
--- a/stream-servers/vulkan/vulkan_gfxstream_structure_type.h
+++ b/host/vulkan/vulkan_gfxstream_structure_type.h
@@ -16,7 +16,7 @@
 // Autogenerated module vulkan_gfxstream_structure_type
 //
 // (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
-// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+// cereal -o ../../device/generic/vulkan-cereal/host/vulkan/cereal
 //
 // Please do not modify directly;
 // re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,

include/vulkan/vk_android_native_buffer.h

diff --git a/include/vulkan/vk_android_native_buffer.h b/include/vulkan/vk_android_native_buffer.h
index dc8584b..6a4b02c 100644
--- a/include/vulkan/vk_android_native_buffer.h
+++ b/include/vulkan/vk_android_native_buffer.h
@@ -22,7 +22,7 @@
 
 #include <vulkan/vulkan.h>
 
-#include "stream-servers/vulkan/vk_android_native_buffer.h"
+#include "host/vulkan/vk_android_native_buffer.h"
 
 #ifdef __cplusplus
 extern "C" {

stream-servers/gl/glsnapshot/CMakeLists.txt

diff --git a/stream-servers/gl/glsnapshot/CMakeLists.txt b/stream-servers/gl/glsnapshot/CMakeLists.txt
deleted file mode 100644
index c97df00..0000000
--- a/stream-servers/gl/glsnapshot/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_library(GLSnapshot GLSnapshot.cpp)
-target_link_libraries(GLSnapshot PUBLIC apigen-codec-common)
-target_include_directories(GLSnapshot PUBLIC
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glsnapshot
-    ${GFXSTREAM_REPO_ROOT}/include
-    ${GFXSTREAM_REPO_ROOT}/stream-servers
-    ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/OpenGLESDispatch)