diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63d0241..4f26f1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,7 +147,7 @@
 
 # Protocols and associated code generators######################################
 
-add_subdirectory(protocols)
+add_subdirectory(codegen)
 
 # Fake Android guest#########################3##################################
 
diff --git a/protocols/CMakeLists.txt b/codegen/CMakeLists.txt
similarity index 100%
rename from protocols/CMakeLists.txt
rename to codegen/CMakeLists.txt
diff --git a/protocols/generic-apigen/ApiGen.cpp b/codegen/generic-apigen/ApiGen.cpp
similarity index 100%
rename from protocols/generic-apigen/ApiGen.cpp
rename to codegen/generic-apigen/ApiGen.cpp
diff --git a/protocols/generic-apigen/ApiGen.h b/codegen/generic-apigen/ApiGen.h
similarity index 100%
rename from protocols/generic-apigen/ApiGen.h
rename to codegen/generic-apigen/ApiGen.h
diff --git a/protocols/generic-apigen/CMakeLists.txt b/codegen/generic-apigen/CMakeLists.txt
similarity index 100%
rename from protocols/generic-apigen/CMakeLists.txt
rename to codegen/generic-apigen/CMakeLists.txt
diff --git a/protocols/generic-apigen/EntryPoint.cpp b/codegen/generic-apigen/EntryPoint.cpp
similarity index 100%
rename from protocols/generic-apigen/EntryPoint.cpp
rename to codegen/generic-apigen/EntryPoint.cpp
diff --git a/protocols/generic-apigen/EntryPoint.h b/codegen/generic-apigen/EntryPoint.h
similarity index 100%
rename from protocols/generic-apigen/EntryPoint.h
rename to codegen/generic-apigen/EntryPoint.h
diff --git a/protocols/generic-apigen/Parser.cpp b/codegen/generic-apigen/Parser.cpp
similarity index 100%
rename from protocols/generic-apigen/Parser.cpp
rename to codegen/generic-apigen/Parser.cpp
diff --git a/protocols/generic-apigen/Parser.h b/codegen/generic-apigen/Parser.h
similarity index 100%
rename from protocols/generic-apigen/Parser.h
rename to codegen/generic-apigen/Parser.h
diff --git a/protocols/generic-apigen/Parser_unittest.cpp b/codegen/generic-apigen/Parser_unittest.cpp
similarity index 100%
rename from protocols/generic-apigen/Parser_unittest.cpp
rename to codegen/generic-apigen/Parser_unittest.cpp
diff --git a/protocols/generic-apigen/README b/codegen/generic-apigen/README
similarity index 100%
rename from protocols/generic-apigen/README
rename to codegen/generic-apigen/README
diff --git a/protocols/generic-apigen/TypeFactory.cpp b/codegen/generic-apigen/TypeFactory.cpp
similarity index 100%
rename from protocols/generic-apigen/TypeFactory.cpp
rename to codegen/generic-apigen/TypeFactory.cpp
diff --git a/protocols/generic-apigen/TypeFactory.h b/codegen/generic-apigen/TypeFactory.h
similarity index 100%
rename from protocols/generic-apigen/TypeFactory.h
rename to codegen/generic-apigen/TypeFactory.h
diff --git a/protocols/generic-apigen/Var.h b/codegen/generic-apigen/Var.h
similarity index 100%
rename from protocols/generic-apigen/Var.h
rename to codegen/generic-apigen/Var.h
diff --git a/protocols/generic-apigen/VarType.h b/codegen/generic-apigen/VarType.h
similarity index 100%
rename from protocols/generic-apigen/VarType.h
rename to codegen/generic-apigen/VarType.h
diff --git a/protocols/generic-apigen/errors.h b/codegen/generic-apigen/errors.h
similarity index 100%
rename from protocols/generic-apigen/errors.h
rename to codegen/generic-apigen/errors.h
diff --git a/protocols/generic-apigen/getopt.c b/codegen/generic-apigen/getopt.c
similarity index 100%
rename from protocols/generic-apigen/getopt.c
rename to codegen/generic-apigen/getopt.c
diff --git a/protocols/generic-apigen/getopt.h b/codegen/generic-apigen/getopt.h
similarity index 100%
rename from protocols/generic-apigen/getopt.h
rename to codegen/generic-apigen/getopt.h
diff --git a/protocols/generic-apigen/main.cpp b/codegen/generic-apigen/main.cpp
similarity index 100%
rename from protocols/generic-apigen/main.cpp
rename to codegen/generic-apigen/main.cpp
diff --git a/protocols/generic-apigen/strUtils.cpp b/codegen/generic-apigen/strUtils.cpp
similarity index 100%
rename from protocols/generic-apigen/strUtils.cpp
rename to codegen/generic-apigen/strUtils.cpp
diff --git a/protocols/generic-apigen/strUtils.h b/codegen/generic-apigen/strUtils.h
similarity index 100%
rename from protocols/generic-apigen/strUtils.h
rename to codegen/generic-apigen/strUtils.h
diff --git a/protocols/gles1/gles1.addon b/codegen/gles1/gles1.addon
similarity index 100%
rename from protocols/gles1/gles1.addon
rename to codegen/gles1/gles1.addon
diff --git a/protocols/gles1/gles1.attrib b/codegen/gles1/gles1.attrib
similarity index 100%
rename from protocols/gles1/gles1.attrib
rename to codegen/gles1/gles1.attrib
diff --git a/protocols/gles1/gles1.in b/codegen/gles1/gles1.in
similarity index 100%
rename from protocols/gles1/gles1.in
rename to codegen/gles1/gles1.in
diff --git a/protocols/gles1/gles1.types b/codegen/gles1/gles1.types
similarity index 100%
rename from protocols/gles1/gles1.types
rename to codegen/gles1/gles1.types
diff --git a/protocols/gles2/gles2.attrib b/codegen/gles2/gles2.attrib
similarity index 100%
rename from protocols/gles2/gles2.attrib
rename to codegen/gles2/gles2.attrib
diff --git a/protocols/gles2/gles2.in b/codegen/gles2/gles2.in
similarity index 100%
rename from protocols/gles2/gles2.in
rename to codegen/gles2/gles2.in
diff --git a/protocols/gles2/gles2.types b/codegen/gles2/gles2.types
similarity index 100%
rename from protocols/gles2/gles2.types
rename to codegen/gles2/gles2.types
diff --git a/protocols/magma/README.md b/codegen/magma/README.md
similarity index 100%
rename from protocols/magma/README.md
rename to codegen/magma/README.md
diff --git a/protocols/magma/magma.attrib b/codegen/magma/magma.attrib
similarity index 100%
rename from protocols/magma/magma.attrib
rename to codegen/magma/magma.attrib
diff --git a/protocols/magma/magma.in b/codegen/magma/magma.in
similarity index 100%
rename from protocols/magma/magma.in
rename to codegen/magma/magma.in
diff --git a/protocols/magma/magma.types b/codegen/magma/magma.types
similarity index 100%
rename from protocols/magma/magma.types
rename to codegen/magma/magma.types
diff --git a/protocols/renderControl/renderControl.attrib b/codegen/renderControl/renderControl.attrib
similarity index 100%
rename from protocols/renderControl/renderControl.attrib
rename to codegen/renderControl/renderControl.attrib
diff --git a/protocols/renderControl/renderControl.in b/codegen/renderControl/renderControl.in
similarity index 100%
rename from protocols/renderControl/renderControl.in
rename to codegen/renderControl/renderControl.in
diff --git a/protocols/renderControl/renderControl.types b/codegen/renderControl/renderControl.types
similarity index 100%
rename from protocols/renderControl/renderControl.types
rename to codegen/renderControl/renderControl.types
diff --git a/scripts/generate-apigen-sources.sh b/scripts/generate-apigen-sources.sh
index 45b69b3..d5b2499 100755
--- a/scripts/generate-apigen-sources.sh
+++ b/scripts/generate-apigen-sources.sh
@@ -1,23 +1,25 @@
+set -x
+
 # The encoders use the prefix GL while the decoders use the prefix GLES
-cp -f protocols/gles1/gles1.attrib  protocols/gles1/gl.attrib
-cp -f protocols/gles1/gles1.in      protocols/gles1/gl.in
-cp -f protocols/gles1/gles1.types   protocols/gles1/gl.types
-./build/gfxstream-generic-apigen -i ./protocols/gles1 -D ./stream-servers/gl/gles1_dec gles1
-./build/gfxstream-generic-apigen -i ./protocols/gles1 -E ../goldfish-opengl/system/GLESv1_enc gl
-rm protocols/gles1/gl.attrib
-rm protocols/gles1/gl.in
-rm protocols/gles1/gl.types
+cp -f codegen/gles1/gles1.attrib  codegen/gles1/gl.attrib
+cp -f codegen/gles1/gles1.in      codegen/gles1/gl.in
+cp -f codegen/gles1/gles1.types   codegen/gles1/gl.types
+./build/gfxstream-generic-apigen -i ./codegen/gles1 -D ./host/gl/gles1_dec gles1
+./build/gfxstream-generic-apigen -i ./codegen/gles1 -E ../../../device/generic/goldfish-opengl/system/GLESv1_enc gl
+rm codegen/gles1/gl.attrib
+rm codegen/gles1/gl.in
+rm codegen/gles1/gl.types
 
-cp -f protocols/gles2/gles2.attrib  protocols/gles2/gl2.attrib
-cp -f protocols/gles2/gles2.in      protocols/gles2/gl2.in
-cp -f protocols/gles2/gles2.types   protocols/gles2/gl2.types
-./build/gfxstream-generic-apigen -i ./protocols/gles2 -D ./stream-servers/gl/gles2_dec gles2
-./build/gfxstream-generic-apigen -i ./protocols/gles2 -E ../goldfish-opengl/system/GLESv2_enc gl2
-rm protocols/gles2/gl2.attrib
-rm protocols/gles2/gl2.in
-rm protocols/gles2/gl2.types
+cp -f codegen/gles2/gles2.attrib  codegen/gles2/gl2.attrib
+cp -f codegen/gles2/gles2.in      codegen/gles2/gl2.in
+cp -f codegen/gles2/gles2.types   codegen/gles2/gl2.types
+./build/gfxstream-generic-apigen -i ./codegen/gles2 -D ./host/gl/gles2_dec gles2
+./build/gfxstream-generic-apigen -i ./codegen/gles2 -E ../../../device/generic/goldfish-opengl/system/GLESv2_enc gl2
+rm codegen/gles2/gl2.attrib
+rm codegen/gles2/gl2.in
+rm codegen/gles2/gl2.types
 
-./build/gfxstream-generic-apigen -i ./protocols/renderControl -D ./stream-servers/renderControl_dec renderControl
-./build/gfxstream-generic-apigen -i ./protocols/renderControl -E ../goldfish-opengl/system/renderControl_enc renderControl
+./build/gfxstream-generic-apigen -i ./codegen/renderControl -D ./host/renderControl_dec renderControl
+./build/gfxstream-generic-apigen -i ./codegen/renderControl -E ../../../device/generic/goldfish-opengl/system/renderControl_enc renderControl
 
-./build/gfxstream-generic-apigen -i ./protocols/magma -D ./stream-servers/magma/magma_dec magma
\ No newline at end of file
+./build/gfxstream-generic-apigen -i ./codegen/magma -D ./host/magma/magma_dec magma
\ No newline at end of file