diff --git a/glfw/build.zig b/build.zig
similarity index 100%
rename from glfw/build.zig
rename to build.zig
diff --git a/glfw/src/Cursor.zig b/src/Cursor.zig
similarity index 100%
rename from glfw/src/Cursor.zig
rename to src/Cursor.zig
diff --git a/glfw/src/GammaRamp.zig b/src/GammaRamp.zig
similarity index 100%
rename from glfw/src/GammaRamp.zig
rename to src/GammaRamp.zig
diff --git a/glfw/src/Image.zig b/src/Image.zig
similarity index 100%
rename from glfw/src/Image.zig
rename to src/Image.zig
diff --git a/glfw/src/Joystick.zig b/src/Joystick.zig
similarity index 100%
rename from glfw/src/Joystick.zig
rename to src/Joystick.zig
diff --git a/glfw/src/Monitor.zig b/src/Monitor.zig
similarity index 100%
rename from glfw/src/Monitor.zig
rename to src/Monitor.zig
diff --git a/glfw/src/VideoMode.zig b/src/VideoMode.zig
similarity index 100%
rename from glfw/src/VideoMode.zig
rename to src/VideoMode.zig
diff --git a/glfw/src/Window.zig b/src/Window.zig
similarity index 100%
rename from glfw/src/Window.zig
rename to src/Window.zig
diff --git a/glfw/src/action.zig b/src/action.zig
similarity index 100%
rename from glfw/src/action.zig
rename to src/action.zig
diff --git a/glfw/src/c.zig b/src/c.zig
similarity index 100%
rename from glfw/src/c.zig
rename to src/c.zig
diff --git a/glfw/src/clipboard.zig b/src/clipboard.zig
similarity index 100%
rename from glfw/src/clipboard.zig
rename to src/clipboard.zig
diff --git a/glfw/src/consts.zig b/src/consts.zig
similarity index 100%
rename from glfw/src/consts.zig
rename to src/consts.zig
diff --git a/glfw/src/errors.zig b/src/errors.zig
similarity index 100%
rename from glfw/src/errors.zig
rename to src/errors.zig
diff --git a/glfw/src/gamepad_axis.zig b/src/gamepad_axis.zig
similarity index 100%
rename from glfw/src/gamepad_axis.zig
rename to src/gamepad_axis.zig
diff --git a/glfw/src/gamepad_button.zig b/src/gamepad_button.zig
similarity index 100%
rename from glfw/src/gamepad_button.zig
rename to src/gamepad_button.zig
diff --git a/glfw/src/hat.zig b/src/hat.zig
similarity index 100%
rename from glfw/src/hat.zig
rename to src/hat.zig
diff --git a/glfw/src/key.zig b/src/key.zig
similarity index 100%
rename from glfw/src/key.zig
rename to src/key.zig
diff --git a/glfw/src/main.zig b/src/main.zig
similarity index 100%
rename from glfw/src/main.zig
rename to src/main.zig
diff --git a/glfw/src/mod.zig b/src/mod.zig
similarity index 100%
rename from glfw/src/mod.zig
rename to src/mod.zig
diff --git a/glfw/src/mouse_button.zig b/src/mouse_button.zig
similarity index 100%
rename from glfw/src/mouse_button.zig
rename to src/mouse_button.zig
diff --git a/glfw/src/opengl.zig b/src/opengl.zig
similarity index 100%
rename from glfw/src/opengl.zig
rename to src/opengl.zig
diff --git a/glfw/src/time.zig b/src/time.zig
similarity index 100%
rename from glfw/src/time.zig
rename to src/time.zig
diff --git a/glfw/src/version.zig b/src/version.zig
similarity index 100%
rename from glfw/src/version.zig
rename to src/version.zig
diff --git a/glfw/src/vulkan.zig b/src/vulkan.zig
similarity index 100%
rename from glfw/src/vulkan.zig
rename to src/vulkan.zig
diff --git a/glfw/update-upstream.sh b/update-upstream.sh
similarity index 100%
rename from glfw/update-upstream.sh
rename to update-upstream.sh
diff --git a/glfw/upstream/glfw/LICENSE.md b/upstream/glfw/LICENSE.md
similarity index 100%
rename from glfw/upstream/glfw/LICENSE.md
rename to upstream/glfw/LICENSE.md
diff --git a/glfw/upstream/glfw/include/GLFW/glfw3.h b/upstream/glfw/include/GLFW/glfw3.h
similarity index 100%
rename from glfw/upstream/glfw/include/GLFW/glfw3.h
rename to upstream/glfw/include/GLFW/glfw3.h
diff --git a/glfw/upstream/glfw/include/GLFW/glfw3native.h b/upstream/glfw/include/GLFW/glfw3native.h
similarity index 100%
rename from glfw/upstream/glfw/include/GLFW/glfw3native.h
rename to upstream/glfw/include/GLFW/glfw3native.h
diff --git a/glfw/upstream/glfw/src/cocoa_init.m b/upstream/glfw/src/cocoa_init.m
similarity index 100%
rename from glfw/upstream/glfw/src/cocoa_init.m
rename to upstream/glfw/src/cocoa_init.m
diff --git a/glfw/upstream/glfw/src/cocoa_joystick.h b/upstream/glfw/src/cocoa_joystick.h
similarity index 100%
rename from glfw/upstream/glfw/src/cocoa_joystick.h
rename to upstream/glfw/src/cocoa_joystick.h
diff --git a/glfw/upstream/glfw/src/cocoa_joystick.m b/upstream/glfw/src/cocoa_joystick.m
similarity index 100%
rename from glfw/upstream/glfw/src/cocoa_joystick.m
rename to upstream/glfw/src/cocoa_joystick.m
diff --git a/glfw/upstream/glfw/src/cocoa_monitor.m b/upstream/glfw/src/cocoa_monitor.m
similarity index 100%
rename from glfw/upstream/glfw/src/cocoa_monitor.m
rename to upstream/glfw/src/cocoa_monitor.m
diff --git a/glfw/upstream/glfw/src/cocoa_platform.h b/upstream/glfw/src/cocoa_platform.h
similarity index 100%
rename from glfw/upstream/glfw/src/cocoa_platform.h
rename to upstream/glfw/src/cocoa_platform.h
diff --git a/glfw/upstream/glfw/src/cocoa_time.c b/upstream/glfw/src/cocoa_time.c
similarity index 100%
rename from glfw/upstream/glfw/src/cocoa_time.c
rename to upstream/glfw/src/cocoa_time.c
diff --git a/glfw/upstream/glfw/src/cocoa_window.m b/upstream/glfw/src/cocoa_window.m
similarity index 100%
rename from glfw/upstream/glfw/src/cocoa_window.m
rename to upstream/glfw/src/cocoa_window.m
diff --git a/glfw/upstream/glfw/src/context.c b/upstream/glfw/src/context.c
similarity index 100%
rename from glfw/upstream/glfw/src/context.c
rename to upstream/glfw/src/context.c
diff --git a/glfw/upstream/glfw/src/egl_context.c b/upstream/glfw/src/egl_context.c
similarity index 100%
rename from glfw/upstream/glfw/src/egl_context.c
rename to upstream/glfw/src/egl_context.c
diff --git a/glfw/upstream/glfw/src/egl_context.h b/upstream/glfw/src/egl_context.h
similarity index 100%
rename from glfw/upstream/glfw/src/egl_context.h
rename to upstream/glfw/src/egl_context.h
diff --git a/glfw/upstream/glfw/src/glx_context.c b/upstream/glfw/src/glx_context.c
similarity index 100%
rename from glfw/upstream/glfw/src/glx_context.c
rename to upstream/glfw/src/glx_context.c
diff --git a/glfw/upstream/glfw/src/glx_context.h b/upstream/glfw/src/glx_context.h
similarity index 100%
rename from glfw/upstream/glfw/src/glx_context.h
rename to upstream/glfw/src/glx_context.h
diff --git a/glfw/upstream/glfw/src/init.c b/upstream/glfw/src/init.c
similarity index 100%
rename from glfw/upstream/glfw/src/init.c
rename to upstream/glfw/src/init.c
diff --git a/glfw/upstream/glfw/src/input.c b/upstream/glfw/src/input.c
similarity index 100%
rename from glfw/upstream/glfw/src/input.c
rename to upstream/glfw/src/input.c
diff --git a/glfw/upstream/glfw/src/internal.h b/upstream/glfw/src/internal.h
similarity index 100%
rename from glfw/upstream/glfw/src/internal.h
rename to upstream/glfw/src/internal.h
diff --git a/glfw/upstream/glfw/src/linux_joystick.c b/upstream/glfw/src/linux_joystick.c
similarity index 100%
rename from glfw/upstream/glfw/src/linux_joystick.c
rename to upstream/glfw/src/linux_joystick.c
diff --git a/glfw/upstream/glfw/src/linux_joystick.h b/upstream/glfw/src/linux_joystick.h
similarity index 100%
rename from glfw/upstream/glfw/src/linux_joystick.h
rename to upstream/glfw/src/linux_joystick.h
diff --git a/glfw/upstream/glfw/src/mappings.h b/upstream/glfw/src/mappings.h
similarity index 100%
rename from glfw/upstream/glfw/src/mappings.h
rename to upstream/glfw/src/mappings.h
diff --git a/glfw/upstream/glfw/src/monitor.c b/upstream/glfw/src/monitor.c
similarity index 100%
rename from glfw/upstream/glfw/src/monitor.c
rename to upstream/glfw/src/monitor.c
diff --git a/glfw/upstream/glfw/src/nsgl_context.h b/upstream/glfw/src/nsgl_context.h
similarity index 100%
rename from glfw/upstream/glfw/src/nsgl_context.h
rename to upstream/glfw/src/nsgl_context.h
diff --git a/glfw/upstream/glfw/src/nsgl_context.m b/upstream/glfw/src/nsgl_context.m
similarity index 100%
rename from glfw/upstream/glfw/src/nsgl_context.m
rename to upstream/glfw/src/nsgl_context.m
diff --git a/glfw/upstream/glfw/src/null_init.c b/upstream/glfw/src/null_init.c
similarity index 100%
rename from glfw/upstream/glfw/src/null_init.c
rename to upstream/glfw/src/null_init.c
diff --git a/glfw/upstream/glfw/src/null_joystick.c b/upstream/glfw/src/null_joystick.c
similarity index 100%
rename from glfw/upstream/glfw/src/null_joystick.c
rename to upstream/glfw/src/null_joystick.c
diff --git a/glfw/upstream/glfw/src/null_joystick.h b/upstream/glfw/src/null_joystick.h
similarity index 100%
rename from glfw/upstream/glfw/src/null_joystick.h
rename to upstream/glfw/src/null_joystick.h
diff --git a/glfw/upstream/glfw/src/null_monitor.c b/upstream/glfw/src/null_monitor.c
similarity index 100%
rename from glfw/upstream/glfw/src/null_monitor.c
rename to upstream/glfw/src/null_monitor.c
diff --git a/glfw/upstream/glfw/src/null_platform.h b/upstream/glfw/src/null_platform.h
similarity index 100%
rename from glfw/upstream/glfw/src/null_platform.h
rename to upstream/glfw/src/null_platform.h
diff --git a/glfw/upstream/glfw/src/null_window.c b/upstream/glfw/src/null_window.c
similarity index 100%
rename from glfw/upstream/glfw/src/null_window.c
rename to upstream/glfw/src/null_window.c
diff --git a/glfw/upstream/glfw/src/osmesa_context.c b/upstream/glfw/src/osmesa_context.c
similarity index 100%
rename from glfw/upstream/glfw/src/osmesa_context.c
rename to upstream/glfw/src/osmesa_context.c
diff --git a/glfw/upstream/glfw/src/osmesa_context.h b/upstream/glfw/src/osmesa_context.h
similarity index 100%
rename from glfw/upstream/glfw/src/osmesa_context.h
rename to upstream/glfw/src/osmesa_context.h
diff --git a/glfw/upstream/glfw/src/posix_thread.c b/upstream/glfw/src/posix_thread.c
similarity index 100%
rename from glfw/upstream/glfw/src/posix_thread.c
rename to upstream/glfw/src/posix_thread.c
diff --git a/glfw/upstream/glfw/src/posix_thread.h b/upstream/glfw/src/posix_thread.h
similarity index 100%
rename from glfw/upstream/glfw/src/posix_thread.h
rename to upstream/glfw/src/posix_thread.h
diff --git a/glfw/upstream/glfw/src/posix_time.c b/upstream/glfw/src/posix_time.c
similarity index 100%
rename from glfw/upstream/glfw/src/posix_time.c
rename to upstream/glfw/src/posix_time.c
diff --git a/glfw/upstream/glfw/src/posix_time.h b/upstream/glfw/src/posix_time.h
similarity index 100%
rename from glfw/upstream/glfw/src/posix_time.h
rename to upstream/glfw/src/posix_time.h
diff --git a/glfw/upstream/glfw/src/vulkan.c b/upstream/glfw/src/vulkan.c
similarity index 100%
rename from glfw/upstream/glfw/src/vulkan.c
rename to upstream/glfw/src/vulkan.c
diff --git a/glfw/upstream/glfw/src/wgl_context.c b/upstream/glfw/src/wgl_context.c
similarity index 100%
rename from glfw/upstream/glfw/src/wgl_context.c
rename to upstream/glfw/src/wgl_context.c
diff --git a/glfw/upstream/glfw/src/wgl_context.h b/upstream/glfw/src/wgl_context.h
similarity index 100%
rename from glfw/upstream/glfw/src/wgl_context.h
rename to upstream/glfw/src/wgl_context.h
diff --git a/glfw/upstream/glfw/src/win32_init.c b/upstream/glfw/src/win32_init.c
similarity index 100%
rename from glfw/upstream/glfw/src/win32_init.c
rename to upstream/glfw/src/win32_init.c
diff --git a/glfw/upstream/glfw/src/win32_joystick.c b/upstream/glfw/src/win32_joystick.c
similarity index 100%
rename from glfw/upstream/glfw/src/win32_joystick.c
rename to upstream/glfw/src/win32_joystick.c
diff --git a/glfw/upstream/glfw/src/win32_joystick.h b/upstream/glfw/src/win32_joystick.h
similarity index 100%
rename from glfw/upstream/glfw/src/win32_joystick.h
rename to upstream/glfw/src/win32_joystick.h
diff --git a/glfw/upstream/glfw/src/win32_monitor.c b/upstream/glfw/src/win32_monitor.c
similarity index 100%
rename from glfw/upstream/glfw/src/win32_monitor.c
rename to upstream/glfw/src/win32_monitor.c
diff --git a/glfw/upstream/glfw/src/win32_platform.h b/upstream/glfw/src/win32_platform.h
similarity index 100%
rename from glfw/upstream/glfw/src/win32_platform.h
rename to upstream/glfw/src/win32_platform.h
diff --git a/glfw/upstream/glfw/src/win32_thread.c b/upstream/glfw/src/win32_thread.c
similarity index 100%
rename from glfw/upstream/glfw/src/win32_thread.c
rename to upstream/glfw/src/win32_thread.c
diff --git a/glfw/upstream/glfw/src/win32_time.c b/upstream/glfw/src/win32_time.c
similarity index 100%
rename from glfw/upstream/glfw/src/win32_time.c
rename to upstream/glfw/src/win32_time.c
diff --git a/glfw/upstream/glfw/src/win32_window.c b/upstream/glfw/src/win32_window.c
similarity index 100%
rename from glfw/upstream/glfw/src/win32_window.c
rename to upstream/glfw/src/win32_window.c
diff --git a/glfw/upstream/glfw/src/window.c b/upstream/glfw/src/window.c
similarity index 100%
rename from glfw/upstream/glfw/src/window.c
rename to upstream/glfw/src/window.c
diff --git a/glfw/upstream/glfw/src/wl_init.c b/upstream/glfw/src/wl_init.c
similarity index 100%
rename from glfw/upstream/glfw/src/wl_init.c
rename to upstream/glfw/src/wl_init.c
diff --git a/glfw/upstream/glfw/src/wl_monitor.c b/upstream/glfw/src/wl_monitor.c
similarity index 100%
rename from glfw/upstream/glfw/src/wl_monitor.c
rename to upstream/glfw/src/wl_monitor.c
diff --git a/glfw/upstream/glfw/src/wl_platform.h b/upstream/glfw/src/wl_platform.h
similarity index 100%
rename from glfw/upstream/glfw/src/wl_platform.h
rename to upstream/glfw/src/wl_platform.h
diff --git a/glfw/upstream/glfw/src/wl_window.c b/upstream/glfw/src/wl_window.c
similarity index 100%
rename from glfw/upstream/glfw/src/wl_window.c
rename to upstream/glfw/src/wl_window.c
diff --git a/glfw/upstream/glfw/src/x11_init.c b/upstream/glfw/src/x11_init.c
similarity index 100%
rename from glfw/upstream/glfw/src/x11_init.c
rename to upstream/glfw/src/x11_init.c
diff --git a/glfw/upstream/glfw/src/x11_monitor.c b/upstream/glfw/src/x11_monitor.c
similarity index 100%
rename from glfw/upstream/glfw/src/x11_monitor.c
rename to upstream/glfw/src/x11_monitor.c
diff --git a/glfw/upstream/glfw/src/x11_platform.h b/upstream/glfw/src/x11_platform.h
similarity index 100%
rename from glfw/upstream/glfw/src/x11_platform.h
rename to upstream/glfw/src/x11_platform.h
diff --git a/glfw/upstream/glfw/src/x11_window.c b/upstream/glfw/src/x11_window.c
similarity index 100%
rename from glfw/upstream/glfw/src/x11_window.c
rename to upstream/glfw/src/x11_window.c
diff --git a/glfw/upstream/glfw/src/xkb_unicode.c b/upstream/glfw/src/xkb_unicode.c
similarity index 100%
rename from glfw/upstream/glfw/src/xkb_unicode.c
rename to upstream/glfw/src/xkb_unicode.c
diff --git a/glfw/upstream/glfw/src/xkb_unicode.h b/upstream/glfw/src/xkb_unicode.h
similarity index 100%
rename from glfw/upstream/glfw/src/xkb_unicode.h
rename to upstream/glfw/src/xkb_unicode.h
diff --git a/glfw/upstream/vulkan_headers/.cmake-format.py b/upstream/vulkan_headers/.cmake-format.py
similarity index 100%
rename from glfw/upstream/vulkan_headers/.cmake-format.py
rename to upstream/vulkan_headers/.cmake-format.py
diff --git a/glfw/upstream/vulkan_headers/.gitattributes b/upstream/vulkan_headers/.gitattributes
similarity index 100%
rename from glfw/upstream/vulkan_headers/.gitattributes
rename to upstream/vulkan_headers/.gitattributes
diff --git a/glfw/upstream/vulkan_headers/.gitignore b/upstream/vulkan_headers/.gitignore
similarity index 100%
rename from glfw/upstream/vulkan_headers/.gitignore
rename to upstream/vulkan_headers/.gitignore
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vk_icd.h b/upstream/vulkan_headers/include/vulkan/vk_icd.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vk_icd.h
rename to upstream/vulkan_headers/include/vulkan/vk_icd.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vk_layer.h b/upstream/vulkan_headers/include/vulkan/vk_layer.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vk_layer.h
rename to upstream/vulkan_headers/include/vulkan/vk_layer.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vk_platform.h b/upstream/vulkan_headers/include/vulkan/vk_platform.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vk_platform.h
rename to upstream/vulkan_headers/include/vulkan/vk_platform.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vk_sdk_platform.h b/upstream/vulkan_headers/include/vulkan/vk_sdk_platform.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vk_sdk_platform.h
rename to upstream/vulkan_headers/include/vulkan/vk_sdk_platform.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan.h b/upstream/vulkan_headers/include/vulkan/vulkan.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan.h
rename to upstream/vulkan_headers/include/vulkan/vulkan.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan.hpp b/upstream/vulkan_headers/include/vulkan/vulkan.hpp
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan.hpp
rename to upstream/vulkan_headers/include/vulkan/vulkan.hpp
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_android.h b/upstream/vulkan_headers/include/vulkan/vulkan_android.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_android.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_android.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_beta.h b/upstream/vulkan_headers/include/vulkan/vulkan_beta.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_beta.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_beta.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_core.h b/upstream/vulkan_headers/include/vulkan/vulkan_core.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_core.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_core.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_directfb.h b/upstream/vulkan_headers/include/vulkan/vulkan_directfb.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_directfb.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_directfb.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_enums.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_enums.hpp
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_enums.hpp
rename to upstream/vulkan_headers/include/vulkan/vulkan_enums.hpp
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_fuchsia.h b/upstream/vulkan_headers/include/vulkan/vulkan_fuchsia.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_fuchsia.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_fuchsia.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_funcs.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_funcs.hpp
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_funcs.hpp
rename to upstream/vulkan_headers/include/vulkan/vulkan_funcs.hpp
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_ggp.h b/upstream/vulkan_headers/include/vulkan/vulkan_ggp.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_ggp.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_ggp.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_handles.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_handles.hpp
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_handles.hpp
rename to upstream/vulkan_headers/include/vulkan/vulkan_handles.hpp
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_ios.h b/upstream/vulkan_headers/include/vulkan/vulkan_ios.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_ios.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_ios.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_macos.h b/upstream/vulkan_headers/include/vulkan/vulkan_macos.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_macos.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_macos.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_metal.h b/upstream/vulkan_headers/include/vulkan/vulkan_metal.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_metal.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_metal.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_raii.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_raii.hpp
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_raii.hpp
rename to upstream/vulkan_headers/include/vulkan/vulkan_raii.hpp
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_screen.h b/upstream/vulkan_headers/include/vulkan/vulkan_screen.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_screen.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_screen.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_structs.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_structs.hpp
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_structs.hpp
rename to upstream/vulkan_headers/include/vulkan/vulkan_structs.hpp
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_vi.h b/upstream/vulkan_headers/include/vulkan/vulkan_vi.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_vi.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_vi.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_wayland.h b/upstream/vulkan_headers/include/vulkan/vulkan_wayland.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_wayland.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_wayland.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_win32.h b/upstream/vulkan_headers/include/vulkan/vulkan_win32.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_win32.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_win32.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_xcb.h b/upstream/vulkan_headers/include/vulkan/vulkan_xcb.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_xcb.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_xcb.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_xlib.h b/upstream/vulkan_headers/include/vulkan/vulkan_xlib.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_xlib.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_xlib.h
diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h b/upstream/vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h
similarity index 100%
rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h
rename to upstream/vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h