diff --git a/26-advanced-data-glsl/.gitignore b/26-geometry-shaders/.gitignore
similarity index 100%
rename from 26-advanced-data-glsl/.gitignore
rename to 26-geometry-shaders/.gitignore
diff --git a/26-advanced-data-glsl/.vimrc_proj b/26-geometry-shaders/.vimrc_proj
similarity index 100%
rename from 26-advanced-data-glsl/.vimrc_proj
rename to 26-geometry-shaders/.vimrc_proj
diff --git a/26-advanced-data-glsl/LICENSE b/26-geometry-shaders/LICENSE
similarity index 100%
rename from 26-advanced-data-glsl/LICENSE
rename to 26-geometry-shaders/LICENSE
diff --git a/26-advanced-data-glsl/Makefile b/26-geometry-shaders/Makefile
similarity index 100%
rename from 26-advanced-data-glsl/Makefile
rename to 26-geometry-shaders/Makefile
diff --git a/26-advanced-data-glsl/assets/blending_transparent_window.png b/26-geometry-shaders/assets/blending_transparent_window.png
similarity index 100%
rename from 26-advanced-data-glsl/assets/blending_transparent_window.png
rename to 26-geometry-shaders/assets/blending_transparent_window.png
diff --git a/26-advanced-data-glsl/assets/container2.png b/26-geometry-shaders/assets/container2.png
similarity index 100%
rename from 26-advanced-data-glsl/assets/container2.png
rename to 26-geometry-shaders/assets/container2.png
diff --git a/26-advanced-data-glsl/assets/crate.bbmodel b/26-geometry-shaders/assets/crate.bbmodel
similarity index 100%
rename from 26-advanced-data-glsl/assets/crate.bbmodel
rename to 26-geometry-shaders/assets/crate.bbmodel
diff --git a/26-advanced-data-glsl/assets/crate.glb b/26-geometry-shaders/assets/crate.glb
similarity index 100%
rename from 26-advanced-data-glsl/assets/crate.glb
rename to 26-geometry-shaders/assets/crate.glb
diff --git a/26-advanced-data-glsl/assets/crate.mtl b/26-geometry-shaders/assets/crate.mtl
similarity index 100%
rename from 26-advanced-data-glsl/assets/crate.mtl
rename to 26-geometry-shaders/assets/crate.mtl
diff --git a/26-advanced-data-glsl/assets/crate.obj b/26-geometry-shaders/assets/crate.obj
similarity index 100%
rename from 26-advanced-data-glsl/assets/crate.obj
rename to 26-geometry-shaders/assets/crate.obj
diff --git a/26-advanced-data-glsl/assets/grass.bbmodel b/26-geometry-shaders/assets/grass.bbmodel
similarity index 100%
rename from 26-advanced-data-glsl/assets/grass.bbmodel
rename to 26-geometry-shaders/assets/grass.bbmodel
diff --git a/26-advanced-data-glsl/assets/grass.glb b/26-geometry-shaders/assets/grass.glb
similarity index 100%
rename from 26-advanced-data-glsl/assets/grass.glb
rename to 26-geometry-shaders/assets/grass.glb
diff --git a/26-advanced-data-glsl/assets/grass.png b/26-geometry-shaders/assets/grass.png
similarity index 100%
rename from 26-advanced-data-glsl/assets/grass.png
rename to 26-geometry-shaders/assets/grass.png
diff --git a/26-advanced-data-glsl/assets/grass_bb.glb b/26-geometry-shaders/assets/grass_bb.glb
similarity index 100%
rename from 26-advanced-data-glsl/assets/grass_bb.glb
rename to 26-geometry-shaders/assets/grass_bb.glb
diff --git a/26-advanced-data-glsl/assets/marble.png b/26-geometry-shaders/assets/marble.png
similarity index 100%
rename from 26-advanced-data-glsl/assets/marble.png
rename to 26-geometry-shaders/assets/marble.png
diff --git a/26-advanced-data-glsl/assets/marble_cube.bbmodel b/26-geometry-shaders/assets/marble_cube.bbmodel
similarity index 100%
rename from 26-advanced-data-glsl/assets/marble_cube.bbmodel
rename to 26-geometry-shaders/assets/marble_cube.bbmodel
diff --git a/26-advanced-data-glsl/assets/marble_cube.glb b/26-geometry-shaders/assets/marble_cube.glb
similarity index 100%
rename from 26-advanced-data-glsl/assets/marble_cube.glb
rename to 26-geometry-shaders/assets/marble_cube.glb
diff --git a/26-advanced-data-glsl/assets/metal.png b/26-geometry-shaders/assets/metal.png
similarity index 100%
rename from 26-advanced-data-glsl/assets/metal.png
rename to 26-geometry-shaders/assets/metal.png
diff --git a/26-advanced-data-glsl/assets/metal_floor.bbmodel b/26-geometry-shaders/assets/metal_floor.bbmodel
similarity index 100%
rename from 26-advanced-data-glsl/assets/metal_floor.bbmodel
rename to 26-geometry-shaders/assets/metal_floor.bbmodel
diff --git a/26-advanced-data-glsl/assets/metal_floor.glb b/26-geometry-shaders/assets/metal_floor.glb
similarity index 100%
rename from 26-advanced-data-glsl/assets/metal_floor.glb
rename to 26-geometry-shaders/assets/metal_floor.glb
diff --git a/26-advanced-data-glsl/assets/popcorn_model_a.glb b/26-geometry-shaders/assets/popcorn_model_a.glb
similarity index 100%
rename from 26-advanced-data-glsl/assets/popcorn_model_a.glb
rename to 26-geometry-shaders/assets/popcorn_model_a.glb
diff --git a/26-advanced-data-glsl/assets/window.bbmodel b/26-geometry-shaders/assets/window.bbmodel
similarity index 100%
rename from 26-advanced-data-glsl/assets/window.bbmodel
rename to 26-geometry-shaders/assets/window.bbmodel
diff --git a/26-advanced-data-glsl/assets/window.glb b/26-geometry-shaders/assets/window.glb
similarity index 100%
rename from 26-advanced-data-glsl/assets/window.glb
rename to 26-geometry-shaders/assets/window.glb
diff --git a/26-advanced-data-glsl/backpack.zip b/26-geometry-shaders/backpack.zip
similarity index 100%
rename from 26-advanced-data-glsl/backpack.zip
rename to 26-geometry-shaders/backpack.zip
diff --git a/26-advanced-data-glsl/config.json b/26-geometry-shaders/config.json
similarity index 100%
rename from 26-advanced-data-glsl/config.json
rename to 26-geometry-shaders/config.json
diff --git a/26-advanced-data-glsl/meson.build b/26-geometry-shaders/meson.build
similarity index 100%
rename from 26-advanced-data-glsl/meson.build
rename to 26-geometry-shaders/meson.build
diff --git a/26-advanced-data-glsl/resources/textures/awesomeface.png b/26-geometry-shaders/resources/textures/awesomeface.png
similarity index 100%
rename from 26-advanced-data-glsl/resources/textures/awesomeface.png
rename to 26-geometry-shaders/resources/textures/awesomeface.png
diff --git a/26-advanced-data-glsl/resources/textures/container.jpg b/26-geometry-shaders/resources/textures/container.jpg
similarity index 100%
rename from 26-advanced-data-glsl/resources/textures/container.jpg
rename to 26-geometry-shaders/resources/textures/container.jpg
diff --git a/26-advanced-data-glsl/resources/textures/container2.png b/26-geometry-shaders/resources/textures/container2.png
similarity index 100%
rename from 26-advanced-data-glsl/resources/textures/container2.png
rename to 26-geometry-shaders/resources/textures/container2.png
diff --git a/26-advanced-data-glsl/resources/textures/container2_specular.png b/26-geometry-shaders/resources/textures/container2_specular.png
similarity index 100%
rename from 26-advanced-data-glsl/resources/textures/container2_specular.png
rename to 26-geometry-shaders/resources/textures/container2_specular.png
diff --git a/26-advanced-data-glsl/resources/textures/popcorn.jpg b/26-geometry-shaders/resources/textures/popcorn.jpg
similarity index 100%
rename from 26-advanced-data-glsl/resources/textures/popcorn.jpg
rename to 26-geometry-shaders/resources/textures/popcorn.jpg
diff --git a/26-advanced-data-glsl/scripts/reset_build.ps1 b/26-geometry-shaders/scripts/reset_build.ps1
similarity index 100%
rename from 26-advanced-data-glsl/scripts/reset_build.ps1
rename to 26-geometry-shaders/scripts/reset_build.ps1
diff --git a/26-advanced-data-glsl/scripts/reset_build.sh b/26-geometry-shaders/scripts/reset_build.sh
similarity index 100%
rename from 26-advanced-data-glsl/scripts/reset_build.sh
rename to 26-geometry-shaders/scripts/reset_build.sh
diff --git a/26-advanced-data-glsl/scripts/setup.ps1 b/26-geometry-shaders/scripts/setup.ps1
similarity index 100%
rename from 26-advanced-data-glsl/scripts/setup.ps1
rename to 26-geometry-shaders/scripts/setup.ps1
diff --git a/26-advanced-data-glsl/scripts/setup.sh b/26-geometry-shaders/scripts/setup.sh
similarity index 100%
rename from 26-advanced-data-glsl/scripts/setup.sh
rename to 26-geometry-shaders/scripts/setup.sh
diff --git a/26-advanced-data-glsl/scripts/watch_build.sh b/26-geometry-shaders/scripts/watch_build.sh
similarity index 100%
rename from 26-advanced-data-glsl/scripts/watch_build.sh
rename to 26-geometry-shaders/scripts/watch_build.sh
diff --git a/26-advanced-data-glsl/scripts/windows_setup.ps1 b/26-geometry-shaders/scripts/windows_setup.ps1
similarity index 100%
rename from 26-advanced-data-glsl/scripts/windows_setup.ps1
rename to 26-geometry-shaders/scripts/windows_setup.ps1
diff --git a/26-advanced-data-glsl/shaders/08-frag.glsl b/26-geometry-shaders/shaders/08-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/08-frag.glsl
rename to 26-geometry-shaders/shaders/08-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/08-lightsource.frag.glsl b/26-geometry-shaders/shaders/08-lightsource.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/08-lightsource.frag.glsl
rename to 26-geometry-shaders/shaders/08-lightsource.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/08-vert.glsl b/26-geometry-shaders/shaders/08-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/08-vert.glsl
rename to 26-geometry-shaders/shaders/08-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/11-frag.glsl b/26-geometry-shaders/shaders/11-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/11-frag.glsl
rename to 26-geometry-shaders/shaders/11-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/11-lightsource.frag.glsl b/26-geometry-shaders/shaders/11-lightsource.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/11-lightsource.frag.glsl
rename to 26-geometry-shaders/shaders/11-lightsource.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/11-vert.glsl b/26-geometry-shaders/shaders/11-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/11-vert.glsl
rename to 26-geometry-shaders/shaders/11-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/12-frag.glsl b/26-geometry-shaders/shaders/12-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/12-frag.glsl
rename to 26-geometry-shaders/shaders/12-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/12-lightsource.frag.glsl b/26-geometry-shaders/shaders/12-lightsource.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/12-lightsource.frag.glsl
rename to 26-geometry-shaders/shaders/12-lightsource.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/12-vert.glsl b/26-geometry-shaders/shaders/12-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/12-vert.glsl
rename to 26-geometry-shaders/shaders/12-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/13-frag.glsl b/26-geometry-shaders/shaders/13-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/13-frag.glsl
rename to 26-geometry-shaders/shaders/13-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/13-lightsource.frag.glsl b/26-geometry-shaders/shaders/13-lightsource.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/13-lightsource.frag.glsl
rename to 26-geometry-shaders/shaders/13-lightsource.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/13-vert.glsl b/26-geometry-shaders/shaders/13-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/13-vert.glsl
rename to 26-geometry-shaders/shaders/13-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/14-frag.glsl b/26-geometry-shaders/shaders/14-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/14-frag.glsl
rename to 26-geometry-shaders/shaders/14-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/14-lightsource.frag.glsl b/26-geometry-shaders/shaders/14-lightsource.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/14-lightsource.frag.glsl
rename to 26-geometry-shaders/shaders/14-lightsource.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/14-vert.glsl b/26-geometry-shaders/shaders/14-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/14-vert.glsl
rename to 26-geometry-shaders/shaders/14-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/16-frag.glsl b/26-geometry-shaders/shaders/16-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/16-frag.glsl
rename to 26-geometry-shaders/shaders/16-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/16-lightsource.frag.glsl b/26-geometry-shaders/shaders/16-lightsource.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/16-lightsource.frag.glsl
rename to 26-geometry-shaders/shaders/16-lightsource.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/16-vert.glsl b/26-geometry-shaders/shaders/16-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/16-vert.glsl
rename to 26-geometry-shaders/shaders/16-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/17-frag.glsl b/26-geometry-shaders/shaders/17-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/17-frag.glsl
rename to 26-geometry-shaders/shaders/17-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/17-lightsource.frag.glsl b/26-geometry-shaders/shaders/17-lightsource.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/17-lightsource.frag.glsl
rename to 26-geometry-shaders/shaders/17-lightsource.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/17-vert.glsl b/26-geometry-shaders/shaders/17-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/17-vert.glsl
rename to 26-geometry-shaders/shaders/17-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/18-frag.glsl b/26-geometry-shaders/shaders/18-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/18-frag.glsl
rename to 26-geometry-shaders/shaders/18-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/18-lightsource.frag.glsl b/26-geometry-shaders/shaders/18-lightsource.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/18-lightsource.frag.glsl
rename to 26-geometry-shaders/shaders/18-lightsource.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/18-outline.glsl b/26-geometry-shaders/shaders/18-outline.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/18-outline.glsl
rename to 26-geometry-shaders/shaders/18-outline.glsl
diff --git a/26-advanced-data-glsl/shaders/18-vert.glsl b/26-geometry-shaders/shaders/18-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/18-vert.glsl
rename to 26-geometry-shaders/shaders/18-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/19-frag.glsl b/26-geometry-shaders/shaders/19-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/19-frag.glsl
rename to 26-geometry-shaders/shaders/19-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/19-lightsource.frag.glsl b/26-geometry-shaders/shaders/19-lightsource.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/19-lightsource.frag.glsl
rename to 26-geometry-shaders/shaders/19-lightsource.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/19-vert.glsl b/26-geometry-shaders/shaders/19-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/19-vert.glsl
rename to 26-geometry-shaders/shaders/19-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/21-framebuffers.frag.glsl b/26-geometry-shaders/shaders/21-framebuffers.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/21-framebuffers.frag.glsl
rename to 26-geometry-shaders/shaders/21-framebuffers.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/21-framebuffers.vert.glsl b/26-geometry-shaders/shaders/21-framebuffers.vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/21-framebuffers.vert.glsl
rename to 26-geometry-shaders/shaders/21-framebuffers.vert.glsl
diff --git a/26-advanced-data-glsl/shaders/21-screen-kernel.frag.glsl b/26-geometry-shaders/shaders/21-screen-kernel.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/21-screen-kernel.frag.glsl
rename to 26-geometry-shaders/shaders/21-screen-kernel.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/21-screen.frag.glsl b/26-geometry-shaders/shaders/21-screen.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/21-screen.frag.glsl
rename to 26-geometry-shaders/shaders/21-screen.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/21-screen.vert.glsl b/26-geometry-shaders/shaders/21-screen.vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/21-screen.vert.glsl
rename to 26-geometry-shaders/shaders/21-screen.vert.glsl
diff --git a/26-advanced-data-glsl/shaders/24-frag.glsl b/26-geometry-shaders/shaders/24-frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/24-frag.glsl
rename to 26-geometry-shaders/shaders/24-frag.glsl
diff --git a/26-advanced-data-glsl/shaders/24-skybox.frag.glsl b/26-geometry-shaders/shaders/24-skybox.frag.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/24-skybox.frag.glsl
rename to 26-geometry-shaders/shaders/24-skybox.frag.glsl
diff --git a/26-advanced-data-glsl/shaders/24-skybox.vert.glsl b/26-geometry-shaders/shaders/24-skybox.vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/24-skybox.vert.glsl
rename to 26-geometry-shaders/shaders/24-skybox.vert.glsl
diff --git a/26-advanced-data-glsl/shaders/24-vert.glsl b/26-geometry-shaders/shaders/24-vert.glsl
similarity index 100%
rename from 26-advanced-data-glsl/shaders/24-vert.glsl
rename to 26-geometry-shaders/shaders/24-vert.glsl
diff --git a/26-advanced-data-glsl/shaders/3.3.shader.fs b/26-geometry-shaders/shaders/3.3.shader.fs
similarity index 100%
rename from 26-advanced-data-glsl/shaders/3.3.shader.fs
rename to 26-geometry-shaders/shaders/3.3.shader.fs
diff --git a/26-advanced-data-glsl/shaders/3.3.shader.vs b/26-geometry-shaders/shaders/3.3.shader.vs
similarity index 100%
rename from 26-advanced-data-glsl/shaders/3.3.shader.vs
rename to 26-geometry-shaders/shaders/3.3.shader.vs
diff --git a/26-advanced-data-glsl/shaders/4.2.texture.fs b/26-geometry-shaders/shaders/4.2.texture.fs
similarity index 100%
rename from 26-advanced-data-glsl/shaders/4.2.texture.fs
rename to 26-geometry-shaders/shaders/4.2.texture.fs
diff --git a/26-advanced-data-glsl/shaders/4.2.texture.vs b/26-geometry-shaders/shaders/4.2.texture.vs
similarity index 100%
rename from 26-advanced-data-glsl/shaders/4.2.texture.vs
rename to 26-geometry-shaders/shaders/4.2.texture.vs
diff --git a/26-advanced-data-glsl/src/KHR/khrplatform.h b/26-geometry-shaders/src/KHR/khrplatform.h
similarity index 100%
rename from 26-advanced-data-glsl/src/KHR/khrplatform.h
rename to 26-geometry-shaders/src/KHR/khrplatform.h
diff --git a/26-advanced-data-glsl/src/camera.cpp b/26-geometry-shaders/src/camera.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/camera.cpp
rename to 26-geometry-shaders/src/camera.cpp
diff --git a/26-advanced-data-glsl/src/camera.hpp b/26-geometry-shaders/src/camera.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/camera.hpp
rename to 26-geometry-shaders/src/camera.hpp
diff --git a/26-advanced-data-glsl/src/components.hpp b/26-geometry-shaders/src/components.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/components.hpp
rename to 26-geometry-shaders/src/components.hpp
diff --git a/26-advanced-data-glsl/src/dbc.cpp b/26-geometry-shaders/src/dbc.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/dbc.cpp
rename to 26-geometry-shaders/src/dbc.cpp
diff --git a/26-advanced-data-glsl/src/dbc.hpp b/26-geometry-shaders/src/dbc.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/dbc.hpp
rename to 26-geometry-shaders/src/dbc.hpp
diff --git a/26-advanced-data-glsl/src/framebuffer.cpp b/26-geometry-shaders/src/framebuffer.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/framebuffer.cpp
rename to 26-geometry-shaders/src/framebuffer.cpp
diff --git a/26-advanced-data-glsl/src/framebuffer.hpp b/26-geometry-shaders/src/framebuffer.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/framebuffer.hpp
rename to 26-geometry-shaders/src/framebuffer.hpp
diff --git a/26-advanced-data-glsl/src/glad/glad.cpp b/26-geometry-shaders/src/glad/glad.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/glad/glad.cpp
rename to 26-geometry-shaders/src/glad/glad.cpp
diff --git a/26-advanced-data-glsl/src/glad/glad.h b/26-geometry-shaders/src/glad/glad.h
similarity index 100%
rename from 26-advanced-data-glsl/src/glad/glad.h
rename to 26-geometry-shaders/src/glad/glad.h
diff --git a/26-advanced-data-glsl/src/json.hpp b/26-geometry-shaders/src/json.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/json.hpp
rename to 26-geometry-shaders/src/json.hpp
diff --git a/26-advanced-data-glsl/src/main.cpp b/26-geometry-shaders/src/main.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/main.cpp
rename to 26-geometry-shaders/src/main.cpp
diff --git a/26-advanced-data-glsl/src/mesh.cpp b/26-geometry-shaders/src/mesh.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/mesh.cpp
rename to 26-geometry-shaders/src/mesh.cpp
diff --git a/26-advanced-data-glsl/src/mesh.hpp b/26-geometry-shaders/src/mesh.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/mesh.hpp
rename to 26-geometry-shaders/src/mesh.hpp
diff --git a/26-advanced-data-glsl/src/model.cpp b/26-geometry-shaders/src/model.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/model.cpp
rename to 26-geometry-shaders/src/model.cpp
diff --git a/26-advanced-data-glsl/src/model.hpp b/26-geometry-shaders/src/model.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/model.hpp
rename to 26-geometry-shaders/src/model.hpp
diff --git a/26-advanced-data-glsl/src/scene.cpp b/26-geometry-shaders/src/scene.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/scene.cpp
rename to 26-geometry-shaders/src/scene.cpp
diff --git a/26-advanced-data-glsl/src/scene.hpp b/26-geometry-shaders/src/scene.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/scene.hpp
rename to 26-geometry-shaders/src/scene.hpp
diff --git a/26-advanced-data-glsl/src/screen.cpp b/26-geometry-shaders/src/screen.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/screen.cpp
rename to 26-geometry-shaders/src/screen.cpp
diff --git a/26-advanced-data-glsl/src/screen.hpp b/26-geometry-shaders/src/screen.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/screen.hpp
rename to 26-geometry-shaders/src/screen.hpp
diff --git a/26-advanced-data-glsl/src/shader.cpp b/26-geometry-shaders/src/shader.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/shader.cpp
rename to 26-geometry-shaders/src/shader.cpp
diff --git a/26-advanced-data-glsl/src/shader.hpp b/26-geometry-shaders/src/shader.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/shader.hpp
rename to 26-geometry-shaders/src/shader.hpp
diff --git a/26-advanced-data-glsl/src/skybox.hpp b/26-geometry-shaders/src/skybox.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/skybox.hpp
rename to 26-geometry-shaders/src/skybox.hpp
diff --git a/26-advanced-data-glsl/src/stb_image.cpp b/26-geometry-shaders/src/stb_image.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/stb_image.cpp
rename to 26-geometry-shaders/src/stb_image.cpp
diff --git a/26-advanced-data-glsl/src/stb_image.h b/26-geometry-shaders/src/stb_image.h
similarity index 100%
rename from 26-advanced-data-glsl/src/stb_image.h
rename to 26-geometry-shaders/src/stb_image.h
diff --git a/26-advanced-data-glsl/src/utils.cpp b/26-geometry-shaders/src/utils.cpp
similarity index 100%
rename from 26-advanced-data-glsl/src/utils.cpp
rename to 26-geometry-shaders/src/utils.cpp
diff --git a/26-advanced-data-glsl/src/utils.hpp b/26-geometry-shaders/src/utils.hpp
similarity index 100%
rename from 26-advanced-data-glsl/src/utils.hpp
rename to 26-geometry-shaders/src/utils.hpp
diff --git a/26-advanced-data-glsl/tests/bad_shader.vs b/26-geometry-shaders/tests/bad_shader.vs
similarity index 100%
rename from 26-advanced-data-glsl/tests/bad_shader.vs
rename to 26-geometry-shaders/tests/bad_shader.vs
diff --git a/26-advanced-data-glsl/tests/config.json b/26-geometry-shaders/tests/config.json
similarity index 100%
rename from 26-advanced-data-glsl/tests/config.json
rename to 26-geometry-shaders/tests/config.json
diff --git a/26-advanced-data-glsl/tests/config_tests.cpp b/26-geometry-shaders/tests/config_tests.cpp
similarity index 100%
rename from 26-advanced-data-glsl/tests/config_tests.cpp
rename to 26-geometry-shaders/tests/config_tests.cpp
diff --git a/26-advanced-data-glsl/tests/main.cpp b/26-geometry-shaders/tests/main.cpp
similarity index 100%
rename from 26-advanced-data-glsl/tests/main.cpp
rename to 26-geometry-shaders/tests/main.cpp
diff --git a/26-advanced-data-glsl/tests/meson.build b/26-geometry-shaders/tests/meson.build
similarity index 100%
rename from 26-advanced-data-glsl/tests/meson.build
rename to 26-geometry-shaders/tests/meson.build
diff --git a/26-advanced-data-glsl/tests/model_tests.cpp b/26-geometry-shaders/tests/model_tests.cpp
similarity index 100%
rename from 26-advanced-data-glsl/tests/model_tests.cpp
rename to 26-geometry-shaders/tests/model_tests.cpp
diff --git a/26-advanced-data-glsl/tests/shader_tests.cpp b/26-geometry-shaders/tests/shader_tests.cpp
similarity index 100%
rename from 26-advanced-data-glsl/tests/shader_tests.cpp
rename to 26-geometry-shaders/tests/shader_tests.cpp
diff --git a/26-advanced-data-glsl/wraps/assimp.wrap b/26-geometry-shaders/wraps/assimp.wrap
similarity index 100%
rename from 26-advanced-data-glsl/wraps/assimp.wrap
rename to 26-geometry-shaders/wraps/assimp.wrap
diff --git a/26-advanced-data-glsl/wraps/box2d.wrap b/26-geometry-shaders/wraps/box2d.wrap
similarity index 100%
rename from 26-advanced-data-glsl/wraps/box2d.wrap
rename to 26-geometry-shaders/wraps/box2d.wrap
diff --git a/26-advanced-data-glsl/wraps/fmt.wrap b/26-geometry-shaders/wraps/fmt.wrap
similarity index 100%
rename from 26-advanced-data-glsl/wraps/fmt.wrap
rename to 26-geometry-shaders/wraps/fmt.wrap
diff --git a/26-advanced-data-glsl/wraps/fuc2.wrap b/26-geometry-shaders/wraps/fuc2.wrap
similarity index 100%
rename from 26-advanced-data-glsl/wraps/fuc2.wrap
rename to 26-geometry-shaders/wraps/fuc2.wrap
diff --git a/26-advanced-data-glsl/wraps/glfw.wrap b/26-geometry-shaders/wraps/glfw.wrap
similarity index 100%
rename from 26-advanced-data-glsl/wraps/glfw.wrap
rename to 26-geometry-shaders/wraps/glfw.wrap
diff --git a/26-advanced-data-glsl/wraps/glm.wrap b/26-geometry-shaders/wraps/glm.wrap
similarity index 100%
rename from 26-advanced-data-glsl/wraps/glm.wrap
rename to 26-geometry-shaders/wraps/glm.wrap
diff --git a/26-advanced-data-glsl/wraps/nlohmann_json.wrap b/26-geometry-shaders/wraps/nlohmann_json.wrap
similarity index 100%
rename from 26-advanced-data-glsl/wraps/nlohmann_json.wrap
rename to 26-geometry-shaders/wraps/nlohmann_json.wrap