diff --git a/src/mesa/pipe/Makefile b/src/gallium/Makefile
similarity index 100%
rename from src/mesa/pipe/Makefile
rename to src/gallium/Makefile
diff --git a/src/mesa/pipe/Makefile.template b/src/gallium/Makefile.template
similarity index 100%
rename from src/mesa/pipe/Makefile.template
rename to src/gallium/Makefile.template
diff --git a/src/mesa/pipe/README.portability b/src/gallium/README.portability
similarity index 100%
rename from src/mesa/pipe/README.portability
rename to src/gallium/README.portability
diff --git a/src/mesa/pipe/SConscript b/src/gallium/SConscript
similarity index 100%
rename from src/mesa/pipe/SConscript
rename to src/gallium/SConscript
diff --git a/src/mesa/pipe/cso_cache/cso_cache.c b/src/gallium/aux/cso_cache/cso_cache.c
similarity index 100%
rename from src/mesa/pipe/cso_cache/cso_cache.c
rename to src/gallium/aux/cso_cache/cso_cache.c
diff --git a/src/mesa/pipe/cso_cache/cso_cache.h b/src/gallium/aux/cso_cache/cso_cache.h
similarity index 100%
rename from src/mesa/pipe/cso_cache/cso_cache.h
rename to src/gallium/aux/cso_cache/cso_cache.h
diff --git a/src/mesa/pipe/cso_cache/cso_hash.c b/src/gallium/aux/cso_cache/cso_hash.c
similarity index 100%
rename from src/mesa/pipe/cso_cache/cso_hash.c
rename to src/gallium/aux/cso_cache/cso_hash.c
diff --git a/src/mesa/pipe/cso_cache/cso_hash.h b/src/gallium/aux/cso_cache/cso_hash.h
similarity index 100%
rename from src/mesa/pipe/cso_cache/cso_hash.h
rename to src/gallium/aux/cso_cache/cso_hash.h
diff --git a/src/mesa/pipe/draw/Makefile b/src/gallium/aux/draw/Makefile
similarity index 100%
rename from src/mesa/pipe/draw/Makefile
rename to src/gallium/aux/draw/Makefile
diff --git a/src/mesa/pipe/draw/draw_clip.c b/src/gallium/aux/draw/draw_clip.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_clip.c
rename to src/gallium/aux/draw/draw_clip.c
diff --git a/src/mesa/pipe/draw/draw_context.c b/src/gallium/aux/draw/draw_context.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_context.c
rename to src/gallium/aux/draw/draw_context.c
diff --git a/src/mesa/pipe/draw/draw_context.h b/src/gallium/aux/draw/draw_context.h
similarity index 100%
rename from src/mesa/pipe/draw/draw_context.h
rename to src/gallium/aux/draw/draw_context.h
diff --git a/src/mesa/pipe/draw/draw_cull.c b/src/gallium/aux/draw/draw_cull.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_cull.c
rename to src/gallium/aux/draw/draw_cull.c
diff --git a/src/mesa/pipe/draw/draw_debug.c b/src/gallium/aux/draw/draw_debug.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_debug.c
rename to src/gallium/aux/draw/draw_debug.c
diff --git a/src/mesa/pipe/draw/draw_flatshade.c b/src/gallium/aux/draw/draw_flatshade.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_flatshade.c
rename to src/gallium/aux/draw/draw_flatshade.c
diff --git a/src/mesa/pipe/draw/draw_offset.c b/src/gallium/aux/draw/draw_offset.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_offset.c
rename to src/gallium/aux/draw/draw_offset.c
diff --git a/src/mesa/pipe/draw/draw_prim.c b/src/gallium/aux/draw/draw_prim.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_prim.c
rename to src/gallium/aux/draw/draw_prim.c
diff --git a/src/mesa/pipe/draw/draw_private.h b/src/gallium/aux/draw/draw_private.h
similarity index 100%
rename from src/mesa/pipe/draw/draw_private.h
rename to src/gallium/aux/draw/draw_private.h
diff --git a/src/mesa/pipe/draw/draw_stipple.c b/src/gallium/aux/draw/draw_stipple.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_stipple.c
rename to src/gallium/aux/draw/draw_stipple.c
diff --git a/src/mesa/pipe/draw/draw_twoside.c b/src/gallium/aux/draw/draw_twoside.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_twoside.c
rename to src/gallium/aux/draw/draw_twoside.c
diff --git a/src/mesa/pipe/draw/draw_unfilled.c b/src/gallium/aux/draw/draw_unfilled.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_unfilled.c
rename to src/gallium/aux/draw/draw_unfilled.c
diff --git a/src/mesa/pipe/draw/draw_validate.c b/src/gallium/aux/draw/draw_validate.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_validate.c
rename to src/gallium/aux/draw/draw_validate.c
diff --git a/src/mesa/pipe/draw/draw_vbuf.c b/src/gallium/aux/draw/draw_vbuf.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_vbuf.c
rename to src/gallium/aux/draw/draw_vbuf.c
diff --git a/src/mesa/pipe/draw/draw_vbuf.h b/src/gallium/aux/draw/draw_vbuf.h
similarity index 100%
rename from src/mesa/pipe/draw/draw_vbuf.h
rename to src/gallium/aux/draw/draw_vbuf.h
diff --git a/src/mesa/pipe/draw/draw_vertex.c b/src/gallium/aux/draw/draw_vertex.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_vertex.c
rename to src/gallium/aux/draw/draw_vertex.c
diff --git a/src/mesa/pipe/draw/draw_vertex.h b/src/gallium/aux/draw/draw_vertex.h
similarity index 100%
rename from src/mesa/pipe/draw/draw_vertex.h
rename to src/gallium/aux/draw/draw_vertex.h
diff --git a/src/mesa/pipe/draw/draw_vertex_cache.c b/src/gallium/aux/draw/draw_vertex_cache.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_vertex_cache.c
rename to src/gallium/aux/draw/draw_vertex_cache.c
diff --git a/src/mesa/pipe/draw/draw_vertex_fetch.c b/src/gallium/aux/draw/draw_vertex_fetch.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_vertex_fetch.c
rename to src/gallium/aux/draw/draw_vertex_fetch.c
diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/gallium/aux/draw/draw_vertex_shader.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_vertex_shader.c
rename to src/gallium/aux/draw/draw_vertex_shader.c
diff --git a/src/mesa/pipe/draw/draw_vf.c b/src/gallium/aux/draw/draw_vf.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_vf.c
rename to src/gallium/aux/draw/draw_vf.c
diff --git a/src/mesa/pipe/draw/draw_vf.h b/src/gallium/aux/draw/draw_vf.h
similarity index 100%
rename from src/mesa/pipe/draw/draw_vf.h
rename to src/gallium/aux/draw/draw_vf.h
diff --git a/src/mesa/pipe/draw/draw_vf_generic.c b/src/gallium/aux/draw/draw_vf_generic.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_vf_generic.c
rename to src/gallium/aux/draw/draw_vf_generic.c
diff --git a/src/mesa/pipe/draw/draw_vf_sse.c b/src/gallium/aux/draw/draw_vf_sse.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_vf_sse.c
rename to src/gallium/aux/draw/draw_vf_sse.c
diff --git a/src/mesa/pipe/draw/draw_wide_prims.c b/src/gallium/aux/draw/draw_wide_prims.c
similarity index 100%
rename from src/mesa/pipe/draw/draw_wide_prims.c
rename to src/gallium/aux/draw/draw_wide_prims.c
diff --git a/src/mesa/pipe/llvm/Makefile b/src/gallium/aux/llvm/Makefile
similarity index 100%
rename from src/mesa/pipe/llvm/Makefile
rename to src/gallium/aux/llvm/Makefile
diff --git a/src/mesa/pipe/llvm/gallivm.cpp b/src/gallium/aux/llvm/gallivm.cpp
similarity index 100%
rename from src/mesa/pipe/llvm/gallivm.cpp
rename to src/gallium/aux/llvm/gallivm.cpp
diff --git a/src/mesa/pipe/llvm/gallivm.h b/src/gallium/aux/llvm/gallivm.h
similarity index 100%
rename from src/mesa/pipe/llvm/gallivm.h
rename to src/gallium/aux/llvm/gallivm.h
diff --git a/src/mesa/pipe/llvm/gallivm_builtins.cpp b/src/gallium/aux/llvm/gallivm_builtins.cpp
similarity index 100%
rename from src/mesa/pipe/llvm/gallivm_builtins.cpp
rename to src/gallium/aux/llvm/gallivm_builtins.cpp
diff --git a/src/mesa/pipe/llvm/gallivm_cpu.cpp b/src/gallium/aux/llvm/gallivm_cpu.cpp
similarity index 100%
rename from src/mesa/pipe/llvm/gallivm_cpu.cpp
rename to src/gallium/aux/llvm/gallivm_cpu.cpp
diff --git a/src/mesa/pipe/llvm/gallivm_p.h b/src/gallium/aux/llvm/gallivm_p.h
similarity index 100%
rename from src/mesa/pipe/llvm/gallivm_p.h
rename to src/gallium/aux/llvm/gallivm_p.h
diff --git a/src/mesa/pipe/llvm/instructions.cpp b/src/gallium/aux/llvm/instructions.cpp
similarity index 100%
rename from src/mesa/pipe/llvm/instructions.cpp
rename to src/gallium/aux/llvm/instructions.cpp
diff --git a/src/mesa/pipe/llvm/instructions.h b/src/gallium/aux/llvm/instructions.h
similarity index 100%
rename from src/mesa/pipe/llvm/instructions.h
rename to src/gallium/aux/llvm/instructions.h
diff --git a/src/mesa/pipe/llvm/instructionssoa.cpp b/src/gallium/aux/llvm/instructionssoa.cpp
similarity index 100%
rename from src/mesa/pipe/llvm/instructionssoa.cpp
rename to src/gallium/aux/llvm/instructionssoa.cpp
diff --git a/src/mesa/pipe/llvm/instructionssoa.h b/src/gallium/aux/llvm/instructionssoa.h
similarity index 100%
rename from src/mesa/pipe/llvm/instructionssoa.h
rename to src/gallium/aux/llvm/instructionssoa.h
diff --git a/src/mesa/pipe/llvm/llvm_builtins.c b/src/gallium/aux/llvm/llvm_builtins.c
similarity index 100%
rename from src/mesa/pipe/llvm/llvm_builtins.c
rename to src/gallium/aux/llvm/llvm_builtins.c
diff --git a/src/mesa/pipe/llvm/loweringpass.cpp b/src/gallium/aux/llvm/loweringpass.cpp
similarity index 100%
rename from src/mesa/pipe/llvm/loweringpass.cpp
rename to src/gallium/aux/llvm/loweringpass.cpp
diff --git a/src/mesa/pipe/llvm/loweringpass.h b/src/gallium/aux/llvm/loweringpass.h
similarity index 100%
rename from src/mesa/pipe/llvm/loweringpass.h
rename to src/gallium/aux/llvm/loweringpass.h
diff --git a/src/mesa/pipe/llvm/storage.cpp b/src/gallium/aux/llvm/storage.cpp
similarity index 100%
rename from src/mesa/pipe/llvm/storage.cpp
rename to src/gallium/aux/llvm/storage.cpp
diff --git a/src/mesa/pipe/llvm/storage.h b/src/gallium/aux/llvm/storage.h
similarity index 100%
rename from src/mesa/pipe/llvm/storage.h
rename to src/gallium/aux/llvm/storage.h
diff --git a/src/mesa/pipe/llvm/storagesoa.cpp b/src/gallium/aux/llvm/storagesoa.cpp
similarity index 100%
rename from src/mesa/pipe/llvm/storagesoa.cpp
rename to src/gallium/aux/llvm/storagesoa.cpp
diff --git a/src/mesa/pipe/llvm/storagesoa.h b/src/gallium/aux/llvm/storagesoa.h
similarity index 100%
rename from src/mesa/pipe/llvm/storagesoa.h
rename to src/gallium/aux/llvm/storagesoa.h
diff --git a/src/mesa/pipe/llvm/tgsitollvm.cpp b/src/gallium/aux/llvm/tgsitollvm.cpp
similarity index 100%
rename from src/mesa/pipe/llvm/tgsitollvm.cpp
rename to src/gallium/aux/llvm/tgsitollvm.cpp
diff --git a/src/mesa/pipe/llvm/tgsitollvm.h b/src/gallium/aux/llvm/tgsitollvm.h
similarity index 100%
rename from src/mesa/pipe/llvm/tgsitollvm.h
rename to src/gallium/aux/llvm/tgsitollvm.h
diff --git a/src/mesa/pipe/pipebuffer/Makefile b/src/gallium/aux/pipebuffer/Makefile
similarity index 100%
rename from src/mesa/pipe/pipebuffer/Makefile
rename to src/gallium/aux/pipebuffer/Makefile
diff --git a/src/mesa/pipe/pipebuffer/linked_list.h b/src/gallium/aux/pipebuffer/linked_list.h
similarity index 100%
rename from src/mesa/pipe/pipebuffer/linked_list.h
rename to src/gallium/aux/pipebuffer/linked_list.h
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer.h b/src/gallium/aux/pipebuffer/pb_buffer.h
similarity index 100%
rename from src/mesa/pipe/pipebuffer/pb_buffer.h
rename to src/gallium/aux/pipebuffer/pb_buffer.h
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer_fenced.c b/src/gallium/aux/pipebuffer/pb_buffer_fenced.c
similarity index 100%
rename from src/mesa/pipe/pipebuffer/pb_buffer_fenced.c
rename to src/gallium/aux/pipebuffer/pb_buffer_fenced.c
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer_fenced.h b/src/gallium/aux/pipebuffer/pb_buffer_fenced.h
similarity index 100%
rename from src/mesa/pipe/pipebuffer/pb_buffer_fenced.h
rename to src/gallium/aux/pipebuffer/pb_buffer_fenced.h
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer_malloc.c b/src/gallium/aux/pipebuffer/pb_buffer_malloc.c
similarity index 100%
rename from src/mesa/pipe/pipebuffer/pb_buffer_malloc.c
rename to src/gallium/aux/pipebuffer/pb_buffer_malloc.c
diff --git a/src/mesa/pipe/pipebuffer/pb_bufmgr.h b/src/gallium/aux/pipebuffer/pb_bufmgr.h
similarity index 100%
rename from src/mesa/pipe/pipebuffer/pb_bufmgr.h
rename to src/gallium/aux/pipebuffer/pb_bufmgr.h
diff --git a/src/mesa/pipe/pipebuffer/pb_bufmgr_fenced.c b/src/gallium/aux/pipebuffer/pb_bufmgr_fenced.c
similarity index 100%
rename from src/mesa/pipe/pipebuffer/pb_bufmgr_fenced.c
rename to src/gallium/aux/pipebuffer/pb_bufmgr_fenced.c
diff --git a/src/mesa/pipe/pipebuffer/pb_bufmgr_mm.c b/src/gallium/aux/pipebuffer/pb_bufmgr_mm.c
similarity index 100%
rename from src/mesa/pipe/pipebuffer/pb_bufmgr_mm.c
rename to src/gallium/aux/pipebuffer/pb_bufmgr_mm.c
diff --git a/src/mesa/pipe/pipebuffer/pb_bufmgr_pool.c b/src/gallium/aux/pipebuffer/pb_bufmgr_pool.c
similarity index 100%
rename from src/mesa/pipe/pipebuffer/pb_bufmgr_pool.c
rename to src/gallium/aux/pipebuffer/pb_bufmgr_pool.c
diff --git a/src/mesa/pipe/pipebuffer/pb_winsys.c b/src/gallium/aux/pipebuffer/pb_winsys.c
similarity index 100%
rename from src/mesa/pipe/pipebuffer/pb_winsys.c
rename to src/gallium/aux/pipebuffer/pb_winsys.c
diff --git a/src/mesa/pipe/tgsi/Makefile b/src/gallium/aux/tgsi/Makefile
similarity index 100%
rename from src/mesa/pipe/tgsi/Makefile
rename to src/gallium/aux/tgsi/Makefile
diff --git a/src/mesa/pipe/tgsi/exec/Makefile b/src/gallium/aux/tgsi/exec/Makefile
similarity index 100%
rename from src/mesa/pipe/tgsi/exec/Makefile
rename to src/gallium/aux/tgsi/exec/Makefile
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.c b/src/gallium/aux/tgsi/exec/tgsi_exec.c
similarity index 100%
rename from src/mesa/pipe/tgsi/exec/tgsi_exec.c
rename to src/gallium/aux/tgsi/exec/tgsi_exec.c
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.h b/src/gallium/aux/tgsi/exec/tgsi_exec.h
similarity index 100%
rename from src/mesa/pipe/tgsi/exec/tgsi_exec.h
rename to src/gallium/aux/tgsi/exec/tgsi_exec.h
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_sse2.c b/src/gallium/aux/tgsi/exec/tgsi_sse2.c
similarity index 100%
rename from src/mesa/pipe/tgsi/exec/tgsi_sse2.c
rename to src/gallium/aux/tgsi/exec/tgsi_sse2.c
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_sse2.h b/src/gallium/aux/tgsi/exec/tgsi_sse2.h
similarity index 100%
rename from src/mesa/pipe/tgsi/exec/tgsi_sse2.h
rename to src/gallium/aux/tgsi/exec/tgsi_sse2.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_build.c b/src/gallium/aux/tgsi/util/tgsi_build.c
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_build.c
rename to src/gallium/aux/tgsi/util/tgsi_build.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_build.h b/src/gallium/aux/tgsi/util/tgsi_build.h
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_build.h
rename to src/gallium/aux/tgsi/util/tgsi_build.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_dump.c b/src/gallium/aux/tgsi/util/tgsi_dump.c
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_dump.c
rename to src/gallium/aux/tgsi/util/tgsi_dump.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_dump.h b/src/gallium/aux/tgsi/util/tgsi_dump.h
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_dump.h
rename to src/gallium/aux/tgsi/util/tgsi_dump.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_parse.c b/src/gallium/aux/tgsi/util/tgsi_parse.c
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_parse.c
rename to src/gallium/aux/tgsi/util/tgsi_parse.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_parse.h b/src/gallium/aux/tgsi/util/tgsi_parse.h
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_parse.h
rename to src/gallium/aux/tgsi/util/tgsi_parse.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_transform.c b/src/gallium/aux/tgsi/util/tgsi_transform.c
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_transform.c
rename to src/gallium/aux/tgsi/util/tgsi_transform.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_transform.h b/src/gallium/aux/tgsi/util/tgsi_transform.h
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_transform.h
rename to src/gallium/aux/tgsi/util/tgsi_transform.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_util.c b/src/gallium/aux/tgsi/util/tgsi_util.c
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_util.c
rename to src/gallium/aux/tgsi/util/tgsi_util.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_util.h b/src/gallium/aux/tgsi/util/tgsi_util.h
similarity index 100%
rename from src/mesa/pipe/tgsi/util/tgsi_util.h
rename to src/gallium/aux/tgsi/util/tgsi_util.h
diff --git a/src/mesa/pipe/util/p_debug.c b/src/gallium/aux/util/p_debug.c
similarity index 100%
rename from src/mesa/pipe/util/p_debug.c
rename to src/gallium/aux/util/p_debug.c
diff --git a/src/mesa/pipe/util/p_tile.c b/src/gallium/aux/util/p_tile.c
similarity index 100%
rename from src/mesa/pipe/util/p_tile.c
rename to src/gallium/aux/util/p_tile.c
diff --git a/src/mesa/pipe/util/p_tile.h b/src/gallium/aux/util/p_tile.h
similarity index 100%
rename from src/mesa/pipe/util/p_tile.h
rename to src/gallium/aux/util/p_tile.h
diff --git a/src/mesa/pipe/util/p_util.c b/src/gallium/aux/util/p_util.c
similarity index 100%
rename from src/mesa/pipe/util/p_util.c
rename to src/gallium/aux/util/p_util.c
diff --git a/src/mesa/pipe/cell/Makefile b/src/gallium/drivers/cell/Makefile
similarity index 100%
rename from src/mesa/pipe/cell/Makefile
rename to src/gallium/drivers/cell/Makefile
diff --git a/src/mesa/pipe/cell/common.h b/src/gallium/drivers/cell/common.h
similarity index 100%
rename from src/mesa/pipe/cell/common.h
rename to src/gallium/drivers/cell/common.h
diff --git a/src/mesa/pipe/cell/ppu/Makefile b/src/gallium/drivers/cell/ppu/Makefile
similarity index 100%
rename from src/mesa/pipe/cell/ppu/Makefile
rename to src/gallium/drivers/cell/ppu/Makefile
diff --git a/src/mesa/pipe/cell/ppu/cell_batch.c b/src/gallium/drivers/cell/ppu/cell_batch.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_batch.c
rename to src/gallium/drivers/cell/ppu/cell_batch.c
diff --git a/src/mesa/pipe/cell/ppu/cell_batch.h b/src/gallium/drivers/cell/ppu/cell_batch.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_batch.h
rename to src/gallium/drivers/cell/ppu/cell_batch.h
diff --git a/src/mesa/pipe/cell/ppu/cell_clear.c b/src/gallium/drivers/cell/ppu/cell_clear.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_clear.c
rename to src/gallium/drivers/cell/ppu/cell_clear.c
diff --git a/src/mesa/pipe/cell/ppu/cell_clear.h b/src/gallium/drivers/cell/ppu/cell_clear.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_clear.h
rename to src/gallium/drivers/cell/ppu/cell_clear.h
diff --git a/src/mesa/pipe/cell/ppu/cell_context.c b/src/gallium/drivers/cell/ppu/cell_context.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_context.c
rename to src/gallium/drivers/cell/ppu/cell_context.c
diff --git a/src/mesa/pipe/cell/ppu/cell_context.h b/src/gallium/drivers/cell/ppu/cell_context.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_context.h
rename to src/gallium/drivers/cell/ppu/cell_context.h
diff --git a/src/mesa/pipe/cell/ppu/cell_draw_arrays.c b/src/gallium/drivers/cell/ppu/cell_draw_arrays.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_draw_arrays.c
rename to src/gallium/drivers/cell/ppu/cell_draw_arrays.c
diff --git a/src/mesa/pipe/cell/ppu/cell_draw_arrays.h b/src/gallium/drivers/cell/ppu/cell_draw_arrays.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_draw_arrays.h
rename to src/gallium/drivers/cell/ppu/cell_draw_arrays.h
diff --git a/src/mesa/pipe/cell/ppu/cell_flush.c b/src/gallium/drivers/cell/ppu/cell_flush.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_flush.c
rename to src/gallium/drivers/cell/ppu/cell_flush.c
diff --git a/src/mesa/pipe/cell/ppu/cell_flush.h b/src/gallium/drivers/cell/ppu/cell_flush.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_flush.h
rename to src/gallium/drivers/cell/ppu/cell_flush.h
diff --git a/src/mesa/pipe/cell/ppu/cell_render.c b/src/gallium/drivers/cell/ppu/cell_render.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_render.c
rename to src/gallium/drivers/cell/ppu/cell_render.c
diff --git a/src/mesa/pipe/cell/ppu/cell_render.h b/src/gallium/drivers/cell/ppu/cell_render.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_render.h
rename to src/gallium/drivers/cell/ppu/cell_render.h
diff --git a/src/mesa/pipe/cell/ppu/cell_spu.c b/src/gallium/drivers/cell/ppu/cell_spu.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_spu.c
rename to src/gallium/drivers/cell/ppu/cell_spu.c
diff --git a/src/mesa/pipe/cell/ppu/cell_spu.h b/src/gallium/drivers/cell/ppu/cell_spu.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_spu.h
rename to src/gallium/drivers/cell/ppu/cell_spu.h
diff --git a/src/mesa/pipe/cell/ppu/cell_state.h b/src/gallium/drivers/cell/ppu/cell_state.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state.h
rename to src/gallium/drivers/cell/ppu/cell_state.h
diff --git a/src/mesa/pipe/cell/ppu/cell_state_blend.c b/src/gallium/drivers/cell/ppu/cell_state_blend.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_blend.c
rename to src/gallium/drivers/cell/ppu/cell_state_blend.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_clip.c b/src/gallium/drivers/cell/ppu/cell_state_clip.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_clip.c
rename to src/gallium/drivers/cell/ppu/cell_state_clip.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_derived.c b/src/gallium/drivers/cell/ppu/cell_state_derived.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_derived.c
rename to src/gallium/drivers/cell/ppu/cell_state_derived.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_emit.c b/src/gallium/drivers/cell/ppu/cell_state_emit.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_emit.c
rename to src/gallium/drivers/cell/ppu/cell_state_emit.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_emit.h b/src/gallium/drivers/cell/ppu/cell_state_emit.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_emit.h
rename to src/gallium/drivers/cell/ppu/cell_state_emit.h
diff --git a/src/mesa/pipe/cell/ppu/cell_state_fs.c b/src/gallium/drivers/cell/ppu/cell_state_fs.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_fs.c
rename to src/gallium/drivers/cell/ppu/cell_state_fs.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_rasterizer.c b/src/gallium/drivers/cell/ppu/cell_state_rasterizer.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_rasterizer.c
rename to src/gallium/drivers/cell/ppu/cell_state_rasterizer.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_sampler.c b/src/gallium/drivers/cell/ppu/cell_state_sampler.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_sampler.c
rename to src/gallium/drivers/cell/ppu/cell_state_sampler.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_surface.c b/src/gallium/drivers/cell/ppu/cell_state_surface.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_surface.c
rename to src/gallium/drivers/cell/ppu/cell_state_surface.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_vertex.c b/src/gallium/drivers/cell/ppu/cell_state_vertex.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_state_vertex.c
rename to src/gallium/drivers/cell/ppu/cell_state_vertex.c
diff --git a/src/mesa/pipe/cell/ppu/cell_surface.c b/src/gallium/drivers/cell/ppu/cell_surface.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_surface.c
rename to src/gallium/drivers/cell/ppu/cell_surface.c
diff --git a/src/mesa/pipe/cell/ppu/cell_surface.h b/src/gallium/drivers/cell/ppu/cell_surface.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_surface.h
rename to src/gallium/drivers/cell/ppu/cell_surface.h
diff --git a/src/mesa/pipe/cell/ppu/cell_texture.c b/src/gallium/drivers/cell/ppu/cell_texture.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_texture.c
rename to src/gallium/drivers/cell/ppu/cell_texture.c
diff --git a/src/mesa/pipe/cell/ppu/cell_texture.h b/src/gallium/drivers/cell/ppu/cell_texture.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_texture.h
rename to src/gallium/drivers/cell/ppu/cell_texture.h
diff --git a/src/mesa/pipe/cell/ppu/cell_vbuf.c b/src/gallium/drivers/cell/ppu/cell_vbuf.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_vbuf.c
rename to src/gallium/drivers/cell/ppu/cell_vbuf.c
diff --git a/src/mesa/pipe/cell/ppu/cell_vbuf.h b/src/gallium/drivers/cell/ppu/cell_vbuf.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_vbuf.h
rename to src/gallium/drivers/cell/ppu/cell_vbuf.h
diff --git a/src/mesa/pipe/cell/ppu/cell_vertex_shader.c b/src/gallium/drivers/cell/ppu/cell_vertex_shader.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_vertex_shader.c
rename to src/gallium/drivers/cell/ppu/cell_vertex_shader.c
diff --git a/src/mesa/pipe/cell/ppu/cell_winsys.c b/src/gallium/drivers/cell/ppu/cell_winsys.c
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_winsys.c
rename to src/gallium/drivers/cell/ppu/cell_winsys.c
diff --git a/src/mesa/pipe/cell/ppu/cell_winsys.h b/src/gallium/drivers/cell/ppu/cell_winsys.h
similarity index 100%
rename from src/mesa/pipe/cell/ppu/cell_winsys.h
rename to src/gallium/drivers/cell/ppu/cell_winsys.h
diff --git a/src/mesa/pipe/cell/spu/Makefile b/src/gallium/drivers/cell/spu/Makefile
similarity index 100%
rename from src/mesa/pipe/cell/spu/Makefile
rename to src/gallium/drivers/cell/spu/Makefile
diff --git a/src/mesa/pipe/cell/spu/spu_blend.c b/src/gallium/drivers/cell/spu/spu_blend.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_blend.c
rename to src/gallium/drivers/cell/spu/spu_blend.c
diff --git a/src/mesa/pipe/cell/spu/spu_blend.h b/src/gallium/drivers/cell/spu/spu_blend.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_blend.h
rename to src/gallium/drivers/cell/spu/spu_blend.h
diff --git a/src/mesa/pipe/cell/spu/spu_colorpack.h b/src/gallium/drivers/cell/spu/spu_colorpack.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_colorpack.h
rename to src/gallium/drivers/cell/spu/spu_colorpack.h
diff --git a/src/mesa/pipe/cell/spu/spu_exec.c b/src/gallium/drivers/cell/spu/spu_exec.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_exec.c
rename to src/gallium/drivers/cell/spu/spu_exec.c
diff --git a/src/mesa/pipe/cell/spu/spu_exec.h b/src/gallium/drivers/cell/spu/spu_exec.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_exec.h
rename to src/gallium/drivers/cell/spu/spu_exec.h
diff --git a/src/mesa/pipe/cell/spu/spu_main.c b/src/gallium/drivers/cell/spu/spu_main.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_main.c
rename to src/gallium/drivers/cell/spu/spu_main.c
diff --git a/src/mesa/pipe/cell/spu/spu_main.h b/src/gallium/drivers/cell/spu/spu_main.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_main.h
rename to src/gallium/drivers/cell/spu/spu_main.h
diff --git a/src/mesa/pipe/cell/spu/spu_render.c b/src/gallium/drivers/cell/spu/spu_render.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_render.c
rename to src/gallium/drivers/cell/spu/spu_render.c
diff --git a/src/mesa/pipe/cell/spu/spu_render.h b/src/gallium/drivers/cell/spu/spu_render.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_render.h
rename to src/gallium/drivers/cell/spu/spu_render.h
diff --git a/src/mesa/pipe/cell/spu/spu_texture.c b/src/gallium/drivers/cell/spu/spu_texture.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_texture.c
rename to src/gallium/drivers/cell/spu/spu_texture.c
diff --git a/src/mesa/pipe/cell/spu/spu_texture.h b/src/gallium/drivers/cell/spu/spu_texture.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_texture.h
rename to src/gallium/drivers/cell/spu/spu_texture.h
diff --git a/src/mesa/pipe/cell/spu/spu_tile.c b/src/gallium/drivers/cell/spu/spu_tile.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_tile.c
rename to src/gallium/drivers/cell/spu/spu_tile.c
diff --git a/src/mesa/pipe/cell/spu/spu_tile.h b/src/gallium/drivers/cell/spu/spu_tile.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_tile.h
rename to src/gallium/drivers/cell/spu/spu_tile.h
diff --git a/src/mesa/pipe/cell/spu/spu_tri.c b/src/gallium/drivers/cell/spu/spu_tri.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_tri.c
rename to src/gallium/drivers/cell/spu/spu_tri.c
diff --git a/src/mesa/pipe/cell/spu/spu_tri.h b/src/gallium/drivers/cell/spu/spu_tri.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_tri.h
rename to src/gallium/drivers/cell/spu/spu_tri.h
diff --git a/src/mesa/pipe/cell/spu/spu_util.c b/src/gallium/drivers/cell/spu/spu_util.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_util.c
rename to src/gallium/drivers/cell/spu/spu_util.c
diff --git a/src/mesa/pipe/cell/spu/spu_vertex_fetch.c b/src/gallium/drivers/cell/spu/spu_vertex_fetch.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_vertex_fetch.c
rename to src/gallium/drivers/cell/spu/spu_vertex_fetch.c
diff --git a/src/mesa/pipe/cell/spu/spu_vertex_shader.c b/src/gallium/drivers/cell/spu/spu_vertex_shader.c
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_vertex_shader.c
rename to src/gallium/drivers/cell/spu/spu_vertex_shader.c
diff --git a/src/mesa/pipe/cell/spu/spu_vertex_shader.h b/src/gallium/drivers/cell/spu/spu_vertex_shader.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_vertex_shader.h
rename to src/gallium/drivers/cell/spu/spu_vertex_shader.h
diff --git a/src/mesa/pipe/cell/spu/spu_ztest.h b/src/gallium/drivers/cell/spu/spu_ztest.h
similarity index 100%
rename from src/mesa/pipe/cell/spu/spu_ztest.h
rename to src/gallium/drivers/cell/spu/spu_ztest.h
diff --git a/src/mesa/pipe/failover/Makefile b/src/gallium/drivers/failover/Makefile
similarity index 100%
rename from src/mesa/pipe/failover/Makefile
rename to src/gallium/drivers/failover/Makefile
diff --git a/src/mesa/pipe/failover/fo_context.c b/src/gallium/drivers/failover/fo_context.c
similarity index 100%
rename from src/mesa/pipe/failover/fo_context.c
rename to src/gallium/drivers/failover/fo_context.c
diff --git a/src/mesa/pipe/failover/fo_context.h b/src/gallium/drivers/failover/fo_context.h
similarity index 100%
rename from src/mesa/pipe/failover/fo_context.h
rename to src/gallium/drivers/failover/fo_context.h
diff --git a/src/mesa/pipe/failover/fo_state.c b/src/gallium/drivers/failover/fo_state.c
similarity index 100%
rename from src/mesa/pipe/failover/fo_state.c
rename to src/gallium/drivers/failover/fo_state.c
diff --git a/src/mesa/pipe/failover/fo_state_emit.c b/src/gallium/drivers/failover/fo_state_emit.c
similarity index 100%
rename from src/mesa/pipe/failover/fo_state_emit.c
rename to src/gallium/drivers/failover/fo_state_emit.c
diff --git a/src/mesa/pipe/failover/fo_winsys.h b/src/gallium/drivers/failover/fo_winsys.h
similarity index 100%
rename from src/mesa/pipe/failover/fo_winsys.h
rename to src/gallium/drivers/failover/fo_winsys.h
diff --git a/src/mesa/pipe/i915simple/Makefile b/src/gallium/drivers/i915simple/Makefile
similarity index 100%
rename from src/mesa/pipe/i915simple/Makefile
rename to src/gallium/drivers/i915simple/Makefile
diff --git a/src/mesa/pipe/i915simple/SConscript b/src/gallium/drivers/i915simple/SConscript
similarity index 100%
rename from src/mesa/pipe/i915simple/SConscript
rename to src/gallium/drivers/i915simple/SConscript
diff --git a/src/mesa/pipe/i915simple/i915_batch.h b/src/gallium/drivers/i915simple/i915_batch.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_batch.h
rename to src/gallium/drivers/i915simple/i915_batch.h
diff --git a/src/mesa/pipe/i915simple/i915_blit.c b/src/gallium/drivers/i915simple/i915_blit.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_blit.c
rename to src/gallium/drivers/i915simple/i915_blit.c
diff --git a/src/mesa/pipe/i915simple/i915_blit.h b/src/gallium/drivers/i915simple/i915_blit.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_blit.h
rename to src/gallium/drivers/i915simple/i915_blit.h
diff --git a/src/mesa/pipe/i915simple/i915_clear.c b/src/gallium/drivers/i915simple/i915_clear.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_clear.c
rename to src/gallium/drivers/i915simple/i915_clear.c
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/gallium/drivers/i915simple/i915_context.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_context.c
rename to src/gallium/drivers/i915simple/i915_context.c
diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/gallium/drivers/i915simple/i915_context.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_context.h
rename to src/gallium/drivers/i915simple/i915_context.h
diff --git a/src/mesa/pipe/i915simple/i915_debug.c b/src/gallium/drivers/i915simple/i915_debug.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_debug.c
rename to src/gallium/drivers/i915simple/i915_debug.c
diff --git a/src/mesa/pipe/i915simple/i915_debug.h b/src/gallium/drivers/i915simple/i915_debug.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_debug.h
rename to src/gallium/drivers/i915simple/i915_debug.h
diff --git a/src/mesa/pipe/i915simple/i915_debug_fp.c b/src/gallium/drivers/i915simple/i915_debug_fp.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_debug_fp.c
rename to src/gallium/drivers/i915simple/i915_debug_fp.c
diff --git a/src/mesa/pipe/i915simple/i915_flush.c b/src/gallium/drivers/i915simple/i915_flush.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_flush.c
rename to src/gallium/drivers/i915simple/i915_flush.c
diff --git a/src/mesa/pipe/i915simple/i915_fpc.h b/src/gallium/drivers/i915simple/i915_fpc.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_fpc.h
rename to src/gallium/drivers/i915simple/i915_fpc.h
diff --git a/src/mesa/pipe/i915simple/i915_fpc_emit.c b/src/gallium/drivers/i915simple/i915_fpc_emit.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_fpc_emit.c
rename to src/gallium/drivers/i915simple/i915_fpc_emit.c
diff --git a/src/mesa/pipe/i915simple/i915_fpc_translate.c b/src/gallium/drivers/i915simple/i915_fpc_translate.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_fpc_translate.c
rename to src/gallium/drivers/i915simple/i915_fpc_translate.c
diff --git a/src/mesa/pipe/i915simple/i915_prim_emit.c b/src/gallium/drivers/i915simple/i915_prim_emit.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_prim_emit.c
rename to src/gallium/drivers/i915simple/i915_prim_emit.c
diff --git a/src/mesa/pipe/i915simple/i915_prim_vbuf.c b/src/gallium/drivers/i915simple/i915_prim_vbuf.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_prim_vbuf.c
rename to src/gallium/drivers/i915simple/i915_prim_vbuf.c
diff --git a/src/mesa/pipe/i915simple/i915_reg.h b/src/gallium/drivers/i915simple/i915_reg.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_reg.h
rename to src/gallium/drivers/i915simple/i915_reg.h
diff --git a/src/mesa/pipe/i915simple/i915_state.c b/src/gallium/drivers/i915simple/i915_state.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_state.c
rename to src/gallium/drivers/i915simple/i915_state.c
diff --git a/src/mesa/pipe/i915simple/i915_state.h b/src/gallium/drivers/i915simple/i915_state.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_state.h
rename to src/gallium/drivers/i915simple/i915_state.h
diff --git a/src/mesa/pipe/i915simple/i915_state_derived.c b/src/gallium/drivers/i915simple/i915_state_derived.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_state_derived.c
rename to src/gallium/drivers/i915simple/i915_state_derived.c
diff --git a/src/mesa/pipe/i915simple/i915_state_dynamic.c b/src/gallium/drivers/i915simple/i915_state_dynamic.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_state_dynamic.c
rename to src/gallium/drivers/i915simple/i915_state_dynamic.c
diff --git a/src/mesa/pipe/i915simple/i915_state_emit.c b/src/gallium/drivers/i915simple/i915_state_emit.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_state_emit.c
rename to src/gallium/drivers/i915simple/i915_state_emit.c
diff --git a/src/mesa/pipe/i915simple/i915_state_immediate.c b/src/gallium/drivers/i915simple/i915_state_immediate.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_state_immediate.c
rename to src/gallium/drivers/i915simple/i915_state_immediate.c
diff --git a/src/mesa/pipe/i915simple/i915_state_inlines.h b/src/gallium/drivers/i915simple/i915_state_inlines.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_state_inlines.h
rename to src/gallium/drivers/i915simple/i915_state_inlines.h
diff --git a/src/mesa/pipe/i915simple/i915_state_sampler.c b/src/gallium/drivers/i915simple/i915_state_sampler.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_state_sampler.c
rename to src/gallium/drivers/i915simple/i915_state_sampler.c
diff --git a/src/mesa/pipe/i915simple/i915_strings.c b/src/gallium/drivers/i915simple/i915_strings.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_strings.c
rename to src/gallium/drivers/i915simple/i915_strings.c
diff --git a/src/mesa/pipe/i915simple/i915_surface.c b/src/gallium/drivers/i915simple/i915_surface.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_surface.c
rename to src/gallium/drivers/i915simple/i915_surface.c
diff --git a/src/mesa/pipe/i915simple/i915_texture.c b/src/gallium/drivers/i915simple/i915_texture.c
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_texture.c
rename to src/gallium/drivers/i915simple/i915_texture.c
diff --git a/src/mesa/pipe/i915simple/i915_texture.h b/src/gallium/drivers/i915simple/i915_texture.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_texture.h
rename to src/gallium/drivers/i915simple/i915_texture.h
diff --git a/src/mesa/pipe/i915simple/i915_winsys.h b/src/gallium/drivers/i915simple/i915_winsys.h
similarity index 100%
rename from src/mesa/pipe/i915simple/i915_winsys.h
rename to src/gallium/drivers/i915simple/i915_winsys.h
diff --git a/src/mesa/pipe/i965simple/Makefile b/src/gallium/drivers/i965simple/Makefile
similarity index 100%
rename from src/mesa/pipe/i965simple/Makefile
rename to src/gallium/drivers/i965simple/Makefile
diff --git a/src/mesa/pipe/i965simple/SConscript b/src/gallium/drivers/i965simple/SConscript
similarity index 100%
rename from src/mesa/pipe/i965simple/SConscript
rename to src/gallium/drivers/i965simple/SConscript
diff --git a/src/mesa/pipe/i965simple/brw_batch.h b/src/gallium/drivers/i965simple/brw_batch.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_batch.h
rename to src/gallium/drivers/i965simple/brw_batch.h
diff --git a/src/mesa/pipe/i965simple/brw_blit.c b/src/gallium/drivers/i965simple/brw_blit.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_blit.c
rename to src/gallium/drivers/i965simple/brw_blit.c
diff --git a/src/mesa/pipe/i965simple/brw_blit.h b/src/gallium/drivers/i965simple/brw_blit.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_blit.h
rename to src/gallium/drivers/i965simple/brw_blit.h
diff --git a/src/mesa/pipe/i965simple/brw_cc.c b/src/gallium/drivers/i965simple/brw_cc.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_cc.c
rename to src/gallium/drivers/i965simple/brw_cc.c
diff --git a/src/mesa/pipe/i965simple/brw_clip.c b/src/gallium/drivers/i965simple/brw_clip.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_clip.c
rename to src/gallium/drivers/i965simple/brw_clip.c
diff --git a/src/mesa/pipe/i965simple/brw_clip.h b/src/gallium/drivers/i965simple/brw_clip.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_clip.h
rename to src/gallium/drivers/i965simple/brw_clip.h
diff --git a/src/mesa/pipe/i965simple/brw_clip_line.c b/src/gallium/drivers/i965simple/brw_clip_line.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_clip_line.c
rename to src/gallium/drivers/i965simple/brw_clip_line.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_point.c b/src/gallium/drivers/i965simple/brw_clip_point.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_clip_point.c
rename to src/gallium/drivers/i965simple/brw_clip_point.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_state.c b/src/gallium/drivers/i965simple/brw_clip_state.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_clip_state.c
rename to src/gallium/drivers/i965simple/brw_clip_state.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_tri.c b/src/gallium/drivers/i965simple/brw_clip_tri.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_clip_tri.c
rename to src/gallium/drivers/i965simple/brw_clip_tri.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_unfilled.c b/src/gallium/drivers/i965simple/brw_clip_unfilled.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_clip_unfilled.c
rename to src/gallium/drivers/i965simple/brw_clip_unfilled.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_util.c b/src/gallium/drivers/i965simple/brw_clip_util.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_clip_util.c
rename to src/gallium/drivers/i965simple/brw_clip_util.c
diff --git a/src/mesa/pipe/i965simple/brw_context.c b/src/gallium/drivers/i965simple/brw_context.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_context.c
rename to src/gallium/drivers/i965simple/brw_context.c
diff --git a/src/mesa/pipe/i965simple/brw_context.h b/src/gallium/drivers/i965simple/brw_context.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_context.h
rename to src/gallium/drivers/i965simple/brw_context.h
diff --git a/src/mesa/pipe/i965simple/brw_curbe.c b/src/gallium/drivers/i965simple/brw_curbe.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_curbe.c
rename to src/gallium/drivers/i965simple/brw_curbe.c
diff --git a/src/mesa/pipe/i965simple/brw_defines.h b/src/gallium/drivers/i965simple/brw_defines.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_defines.h
rename to src/gallium/drivers/i965simple/brw_defines.h
diff --git a/src/mesa/pipe/i965simple/brw_draw.c b/src/gallium/drivers/i965simple/brw_draw.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_draw.c
rename to src/gallium/drivers/i965simple/brw_draw.c
diff --git a/src/mesa/pipe/i965simple/brw_draw.h b/src/gallium/drivers/i965simple/brw_draw.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_draw.h
rename to src/gallium/drivers/i965simple/brw_draw.h
diff --git a/src/mesa/pipe/i965simple/brw_draw_upload.c b/src/gallium/drivers/i965simple/brw_draw_upload.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_draw_upload.c
rename to src/gallium/drivers/i965simple/brw_draw_upload.c
diff --git a/src/mesa/pipe/i965simple/brw_eu.c b/src/gallium/drivers/i965simple/brw_eu.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_eu.c
rename to src/gallium/drivers/i965simple/brw_eu.c
diff --git a/src/mesa/pipe/i965simple/brw_eu.h b/src/gallium/drivers/i965simple/brw_eu.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_eu.h
rename to src/gallium/drivers/i965simple/brw_eu.h
diff --git a/src/mesa/pipe/i965simple/brw_eu_debug.c b/src/gallium/drivers/i965simple/brw_eu_debug.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_eu_debug.c
rename to src/gallium/drivers/i965simple/brw_eu_debug.c
diff --git a/src/mesa/pipe/i965simple/brw_eu_emit.c b/src/gallium/drivers/i965simple/brw_eu_emit.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_eu_emit.c
rename to src/gallium/drivers/i965simple/brw_eu_emit.c
diff --git a/src/mesa/pipe/i965simple/brw_eu_util.c b/src/gallium/drivers/i965simple/brw_eu_util.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_eu_util.c
rename to src/gallium/drivers/i965simple/brw_eu_util.c
diff --git a/src/mesa/pipe/i965simple/brw_flush.c b/src/gallium/drivers/i965simple/brw_flush.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_flush.c
rename to src/gallium/drivers/i965simple/brw_flush.c
diff --git a/src/mesa/pipe/i965simple/brw_gs.c b/src/gallium/drivers/i965simple/brw_gs.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_gs.c
rename to src/gallium/drivers/i965simple/brw_gs.c
diff --git a/src/mesa/pipe/i965simple/brw_gs.h b/src/gallium/drivers/i965simple/brw_gs.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_gs.h
rename to src/gallium/drivers/i965simple/brw_gs.h
diff --git a/src/mesa/pipe/i965simple/brw_gs_emit.c b/src/gallium/drivers/i965simple/brw_gs_emit.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_gs_emit.c
rename to src/gallium/drivers/i965simple/brw_gs_emit.c
diff --git a/src/mesa/pipe/i965simple/brw_gs_state.c b/src/gallium/drivers/i965simple/brw_gs_state.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_gs_state.c
rename to src/gallium/drivers/i965simple/brw_gs_state.c
diff --git a/src/mesa/pipe/i965simple/brw_misc_state.c b/src/gallium/drivers/i965simple/brw_misc_state.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_misc_state.c
rename to src/gallium/drivers/i965simple/brw_misc_state.c
diff --git a/src/mesa/pipe/i965simple/brw_reg.h b/src/gallium/drivers/i965simple/brw_reg.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_reg.h
rename to src/gallium/drivers/i965simple/brw_reg.h
diff --git a/src/mesa/pipe/i965simple/brw_sf.c b/src/gallium/drivers/i965simple/brw_sf.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_sf.c
rename to src/gallium/drivers/i965simple/brw_sf.c
diff --git a/src/mesa/pipe/i965simple/brw_sf.h b/src/gallium/drivers/i965simple/brw_sf.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_sf.h
rename to src/gallium/drivers/i965simple/brw_sf.h
diff --git a/src/mesa/pipe/i965simple/brw_sf_emit.c b/src/gallium/drivers/i965simple/brw_sf_emit.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_sf_emit.c
rename to src/gallium/drivers/i965simple/brw_sf_emit.c
diff --git a/src/mesa/pipe/i965simple/brw_sf_state.c b/src/gallium/drivers/i965simple/brw_sf_state.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_sf_state.c
rename to src/gallium/drivers/i965simple/brw_sf_state.c
diff --git a/src/mesa/pipe/i965simple/brw_shader_info.c b/src/gallium/drivers/i965simple/brw_shader_info.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_shader_info.c
rename to src/gallium/drivers/i965simple/brw_shader_info.c
diff --git a/src/mesa/pipe/i965simple/brw_state.c b/src/gallium/drivers/i965simple/brw_state.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_state.c
rename to src/gallium/drivers/i965simple/brw_state.c
diff --git a/src/mesa/pipe/i965simple/brw_state.h b/src/gallium/drivers/i965simple/brw_state.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_state.h
rename to src/gallium/drivers/i965simple/brw_state.h
diff --git a/src/mesa/pipe/i965simple/brw_state_batch.c b/src/gallium/drivers/i965simple/brw_state_batch.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_state_batch.c
rename to src/gallium/drivers/i965simple/brw_state_batch.c
diff --git a/src/mesa/pipe/i965simple/brw_state_cache.c b/src/gallium/drivers/i965simple/brw_state_cache.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_state_cache.c
rename to src/gallium/drivers/i965simple/brw_state_cache.c
diff --git a/src/mesa/pipe/i965simple/brw_state_pool.c b/src/gallium/drivers/i965simple/brw_state_pool.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_state_pool.c
rename to src/gallium/drivers/i965simple/brw_state_pool.c
diff --git a/src/mesa/pipe/i965simple/brw_state_upload.c b/src/gallium/drivers/i965simple/brw_state_upload.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_state_upload.c
rename to src/gallium/drivers/i965simple/brw_state_upload.c
diff --git a/src/mesa/pipe/i965simple/brw_strings.c b/src/gallium/drivers/i965simple/brw_strings.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_strings.c
rename to src/gallium/drivers/i965simple/brw_strings.c
diff --git a/src/mesa/pipe/i965simple/brw_structs.h b/src/gallium/drivers/i965simple/brw_structs.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_structs.h
rename to src/gallium/drivers/i965simple/brw_structs.h
diff --git a/src/mesa/pipe/i965simple/brw_surface.c b/src/gallium/drivers/i965simple/brw_surface.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_surface.c
rename to src/gallium/drivers/i965simple/brw_surface.c
diff --git a/src/mesa/pipe/i965simple/brw_tex_layout.c b/src/gallium/drivers/i965simple/brw_tex_layout.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_tex_layout.c
rename to src/gallium/drivers/i965simple/brw_tex_layout.c
diff --git a/src/mesa/pipe/i965simple/brw_tex_layout.h b/src/gallium/drivers/i965simple/brw_tex_layout.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_tex_layout.h
rename to src/gallium/drivers/i965simple/brw_tex_layout.h
diff --git a/src/mesa/pipe/i965simple/brw_urb.c b/src/gallium/drivers/i965simple/brw_urb.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_urb.c
rename to src/gallium/drivers/i965simple/brw_urb.c
diff --git a/src/mesa/pipe/i965simple/brw_util.c b/src/gallium/drivers/i965simple/brw_util.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_util.c
rename to src/gallium/drivers/i965simple/brw_util.c
diff --git a/src/mesa/pipe/i965simple/brw_util.h b/src/gallium/drivers/i965simple/brw_util.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_util.h
rename to src/gallium/drivers/i965simple/brw_util.h
diff --git a/src/mesa/pipe/i965simple/brw_vs.c b/src/gallium/drivers/i965simple/brw_vs.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_vs.c
rename to src/gallium/drivers/i965simple/brw_vs.c
diff --git a/src/mesa/pipe/i965simple/brw_vs.h b/src/gallium/drivers/i965simple/brw_vs.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_vs.h
rename to src/gallium/drivers/i965simple/brw_vs.h
diff --git a/src/mesa/pipe/i965simple/brw_vs_emit.c b/src/gallium/drivers/i965simple/brw_vs_emit.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_vs_emit.c
rename to src/gallium/drivers/i965simple/brw_vs_emit.c
diff --git a/src/mesa/pipe/i965simple/brw_vs_state.c b/src/gallium/drivers/i965simple/brw_vs_state.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_vs_state.c
rename to src/gallium/drivers/i965simple/brw_vs_state.c
diff --git a/src/mesa/pipe/i965simple/brw_winsys.h b/src/gallium/drivers/i965simple/brw_winsys.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_winsys.h
rename to src/gallium/drivers/i965simple/brw_winsys.h
diff --git a/src/mesa/pipe/i965simple/brw_wm.c b/src/gallium/drivers/i965simple/brw_wm.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_wm.c
rename to src/gallium/drivers/i965simple/brw_wm.c
diff --git a/src/mesa/pipe/i965simple/brw_wm.h b/src/gallium/drivers/i965simple/brw_wm.h
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_wm.h
rename to src/gallium/drivers/i965simple/brw_wm.h
diff --git a/src/mesa/pipe/i965simple/brw_wm_decl.c b/src/gallium/drivers/i965simple/brw_wm_decl.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_wm_decl.c
rename to src/gallium/drivers/i965simple/brw_wm_decl.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_glsl.c b/src/gallium/drivers/i965simple/brw_wm_glsl.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_wm_glsl.c
rename to src/gallium/drivers/i965simple/brw_wm_glsl.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_iz.c b/src/gallium/drivers/i965simple/brw_wm_iz.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_wm_iz.c
rename to src/gallium/drivers/i965simple/brw_wm_iz.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_sampler_state.c b/src/gallium/drivers/i965simple/brw_wm_sampler_state.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_wm_sampler_state.c
rename to src/gallium/drivers/i965simple/brw_wm_sampler_state.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_state.c b/src/gallium/drivers/i965simple/brw_wm_state.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_wm_state.c
rename to src/gallium/drivers/i965simple/brw_wm_state.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_surface_state.c b/src/gallium/drivers/i965simple/brw_wm_surface_state.c
similarity index 100%
rename from src/mesa/pipe/i965simple/brw_wm_surface_state.c
rename to src/gallium/drivers/i965simple/brw_wm_surface_state.c
diff --git a/src/mesa/pipe/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile
similarity index 100%
rename from src/mesa/pipe/softpipe/Makefile
rename to src/gallium/drivers/softpipe/Makefile
diff --git a/src/mesa/pipe/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
similarity index 100%
rename from src/mesa/pipe/softpipe/SConscript
rename to src/gallium/drivers/softpipe/SConscript
diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/gallium/drivers/softpipe/sp_clear.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_clear.c
rename to src/gallium/drivers/softpipe/sp_clear.c
diff --git a/src/mesa/pipe/softpipe/sp_clear.h b/src/gallium/drivers/softpipe/sp_clear.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_clear.h
rename to src/gallium/drivers/softpipe/sp_clear.h
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_context.c
rename to src/gallium/drivers/softpipe/sp_context.c
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/gallium/drivers/softpipe/sp_context.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_context.h
rename to src/gallium/drivers/softpipe/sp_context.h
diff --git a/src/mesa/pipe/softpipe/sp_draw_arrays.c b/src/gallium/drivers/softpipe/sp_draw_arrays.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_draw_arrays.c
rename to src/gallium/drivers/softpipe/sp_draw_arrays.c
diff --git a/src/mesa/pipe/softpipe/sp_flush.c b/src/gallium/drivers/softpipe/sp_flush.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_flush.c
rename to src/gallium/drivers/softpipe/sp_flush.c
diff --git a/src/mesa/pipe/softpipe/sp_flush.h b/src/gallium/drivers/softpipe/sp_flush.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_flush.h
rename to src/gallium/drivers/softpipe/sp_flush.h
diff --git a/src/mesa/pipe/softpipe/sp_headers.h b/src/gallium/drivers/softpipe/sp_headers.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_headers.h
rename to src/gallium/drivers/softpipe/sp_headers.h
diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.c b/src/gallium/drivers/softpipe/sp_prim_setup.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_setup.c
rename to src/gallium/drivers/softpipe/sp_prim_setup.c
diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.h b/src/gallium/drivers/softpipe/sp_prim_setup.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_setup.h
rename to src/gallium/drivers/softpipe/sp_prim_setup.h
diff --git a/src/mesa/pipe/softpipe/sp_prim_vbuf.c b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_vbuf.c
rename to src/gallium/drivers/softpipe/sp_prim_vbuf.c
diff --git a/src/mesa/pipe/softpipe/sp_prim_vbuf.h b/src/gallium/drivers/softpipe/sp_prim_vbuf.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_vbuf.h
rename to src/gallium/drivers/softpipe/sp_prim_vbuf.h
diff --git a/src/mesa/pipe/softpipe/sp_quad.c b/src/gallium/drivers/softpipe/sp_quad.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad.c
rename to src/gallium/drivers/softpipe/sp_quad.c
diff --git a/src/mesa/pipe/softpipe/sp_quad.h b/src/gallium/drivers/softpipe/sp_quad.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad.h
rename to src/gallium/drivers/softpipe/sp_quad.h
diff --git a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c b/src/gallium/drivers/softpipe/sp_quad_alpha_test.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_alpha_test.c
rename to src/gallium/drivers/softpipe/sp_quad_alpha_test.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/sp_quad_blend.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_blend.c
rename to src/gallium/drivers/softpipe/sp_quad_blend.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_bufloop.c b/src/gallium/drivers/softpipe/sp_quad_bufloop.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_bufloop.c
rename to src/gallium/drivers/softpipe/sp_quad_bufloop.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_colormask.c b/src/gallium/drivers/softpipe/sp_quad_colormask.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_colormask.c
rename to src/gallium/drivers/softpipe/sp_quad_colormask.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_coverage.c b/src/gallium/drivers/softpipe/sp_quad_coverage.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_coverage.c
rename to src/gallium/drivers/softpipe/sp_quad_coverage.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_depth_test.c b/src/gallium/drivers/softpipe/sp_quad_depth_test.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_depth_test.c
rename to src/gallium/drivers/softpipe/sp_quad_depth_test.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_earlyz.c b/src/gallium/drivers/softpipe/sp_quad_earlyz.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_earlyz.c
rename to src/gallium/drivers/softpipe/sp_quad_earlyz.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/gallium/drivers/softpipe/sp_quad_fs.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_fs.c
rename to src/gallium/drivers/softpipe/sp_quad_fs.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_occlusion.c b/src/gallium/drivers/softpipe/sp_quad_occlusion.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_occlusion.c
rename to src/gallium/drivers/softpipe/sp_quad_occlusion.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_output.c b/src/gallium/drivers/softpipe/sp_quad_output.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_output.c
rename to src/gallium/drivers/softpipe/sp_quad_output.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_stencil.c b/src/gallium/drivers/softpipe/sp_quad_stencil.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_stencil.c
rename to src/gallium/drivers/softpipe/sp_quad_stencil.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_stipple.c b/src/gallium/drivers/softpipe/sp_quad_stipple.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_quad_stipple.c
rename to src/gallium/drivers/softpipe/sp_quad_stipple.c
diff --git a/src/mesa/pipe/softpipe/sp_query.c b/src/gallium/drivers/softpipe/sp_query.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_query.c
rename to src/gallium/drivers/softpipe/sp_query.c
diff --git a/src/mesa/pipe/softpipe/sp_query.h b/src/gallium/drivers/softpipe/sp_query.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_query.h
rename to src/gallium/drivers/softpipe/sp_query.h
diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_state.h
rename to src/gallium/drivers/softpipe/sp_state.h
diff --git a/src/mesa/pipe/softpipe/sp_state_blend.c b/src/gallium/drivers/softpipe/sp_state_blend.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_state_blend.c
rename to src/gallium/drivers/softpipe/sp_state_blend.c
diff --git a/src/mesa/pipe/softpipe/sp_state_clip.c b/src/gallium/drivers/softpipe/sp_state_clip.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_state_clip.c
rename to src/gallium/drivers/softpipe/sp_state_clip.c
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/gallium/drivers/softpipe/sp_state_derived.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_state_derived.c
rename to src/gallium/drivers/softpipe/sp_state_derived.c
diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/gallium/drivers/softpipe/sp_state_fs.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_state_fs.c
rename to src/gallium/drivers/softpipe/sp_state_fs.c
diff --git a/src/mesa/pipe/softpipe/sp_state_rasterizer.c b/src/gallium/drivers/softpipe/sp_state_rasterizer.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_state_rasterizer.c
rename to src/gallium/drivers/softpipe/sp_state_rasterizer.c
diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_state_sampler.c
rename to src/gallium/drivers/softpipe/sp_state_sampler.c
diff --git a/src/mesa/pipe/softpipe/sp_state_surface.c b/src/gallium/drivers/softpipe/sp_state_surface.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_state_surface.c
rename to src/gallium/drivers/softpipe/sp_state_surface.c
diff --git a/src/mesa/pipe/softpipe/sp_state_vertex.c b/src/gallium/drivers/softpipe/sp_state_vertex.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_state_vertex.c
rename to src/gallium/drivers/softpipe/sp_state_vertex.c
diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/gallium/drivers/softpipe/sp_surface.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_surface.c
rename to src/gallium/drivers/softpipe/sp_surface.c
diff --git a/src/mesa/pipe/softpipe/sp_surface.h b/src/gallium/drivers/softpipe/sp_surface.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_surface.h
rename to src/gallium/drivers/softpipe/sp_surface.h
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_tex_sample.c
rename to src/gallium/drivers/softpipe/sp_tex_sample.c
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.h b/src/gallium/drivers/softpipe/sp_tex_sample.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_tex_sample.h
rename to src/gallium/drivers/softpipe/sp_tex_sample.h
diff --git a/src/mesa/pipe/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_texture.c
rename to src/gallium/drivers/softpipe/sp_texture.c
diff --git a/src/mesa/pipe/softpipe/sp_texture.h b/src/gallium/drivers/softpipe/sp_texture.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_texture.h
rename to src/gallium/drivers/softpipe/sp_texture.h
diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.c b/src/gallium/drivers/softpipe/sp_tile_cache.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_tile_cache.c
rename to src/gallium/drivers/softpipe/sp_tile_cache.c
diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.h b/src/gallium/drivers/softpipe/sp_tile_cache.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_tile_cache.h
rename to src/gallium/drivers/softpipe/sp_tile_cache.h
diff --git a/src/mesa/pipe/softpipe/sp_winsys.h b/src/gallium/drivers/softpipe/sp_winsys.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_winsys.h
rename to src/gallium/drivers/softpipe/sp_winsys.h
diff --git a/src/mesa/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
similarity index 100%
rename from src/mesa/pipe/p_compiler.h
rename to src/gallium/include/pipe/p_compiler.h
diff --git a/src/mesa/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
similarity index 100%
rename from src/mesa/pipe/p_context.h
rename to src/gallium/include/pipe/p_context.h
diff --git a/src/mesa/pipe/p_debug.h b/src/gallium/include/pipe/p_debug.h
similarity index 100%
rename from src/mesa/pipe/p_debug.h
rename to src/gallium/include/pipe/p_debug.h
diff --git a/src/mesa/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
similarity index 100%
rename from src/mesa/pipe/p_defines.h
rename to src/gallium/include/pipe/p_defines.h
diff --git a/src/mesa/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
similarity index 100%
rename from src/mesa/pipe/p_format.h
rename to src/gallium/include/pipe/p_format.h
diff --git a/src/mesa/pipe/p_inlines.h b/src/gallium/include/pipe/p_inlines.h
similarity index 100%
rename from src/mesa/pipe/p_inlines.h
rename to src/gallium/include/pipe/p_inlines.h
diff --git a/src/mesa/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h
similarity index 100%
rename from src/mesa/pipe/p_shader_tokens.h
rename to src/gallium/include/pipe/p_shader_tokens.h
diff --git a/src/mesa/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
similarity index 100%
rename from src/mesa/pipe/p_state.h
rename to src/gallium/include/pipe/p_state.h
diff --git a/src/mesa/pipe/p_thread.h b/src/gallium/include/pipe/p_thread.h
similarity index 100%
rename from src/mesa/pipe/p_thread.h
rename to src/gallium/include/pipe/p_thread.h
diff --git a/src/mesa/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
similarity index 100%
rename from src/mesa/pipe/p_util.h
rename to src/gallium/include/pipe/p_util.h
diff --git a/src/mesa/pipe/p_winsys.h b/src/gallium/include/pipe/p_winsys.h
similarity index 100%
rename from src/mesa/pipe/p_winsys.h
rename to src/gallium/include/pipe/p_winsys.h
diff --git a/src/mesa/drivers/dri/intel_winsys/Makefile b/src/gallium/winsys/dri/intel/Makefile
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/Makefile
rename to src/gallium/winsys/dri/intel/Makefile
diff --git a/src/mesa/drivers/dri/intel_winsys/SConscript b/src/gallium/winsys/dri/intel/SConscript
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/SConscript
rename to src/gallium/winsys/dri/intel/SConscript
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c b/src/gallium/winsys/dri/intel/intel_batchbuffer.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c
rename to src/gallium/winsys/dri/intel/intel_batchbuffer.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.h b/src/gallium/winsys/dri/intel/intel_batchbuffer.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.h
rename to src/gallium/winsys/dri/intel/intel_batchbuffer.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchpool.c b/src/gallium/winsys/dri/intel/intel_batchpool.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_batchpool.c
rename to src/gallium/winsys/dri/intel/intel_batchpool.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchpool.h b/src/gallium/winsys/dri/intel/intel_batchpool.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_batchpool.h
rename to src/gallium/winsys/dri/intel/intel_batchpool.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/gallium/winsys/dri/intel/intel_context.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_context.c
rename to src/gallium/winsys/dri/intel/intel_context.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/gallium/winsys/dri/intel/intel_context.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_context.h
rename to src/gallium/winsys/dri/intel/intel_context.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_lock.c b/src/gallium/winsys/dri/intel/intel_lock.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_lock.c
rename to src/gallium/winsys/dri/intel/intel_lock.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_reg.h b/src/gallium/winsys/dri/intel/intel_reg.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_reg.h
rename to src/gallium/winsys/dri/intel/intel_reg.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/gallium/winsys/dri/intel/intel_screen.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_screen.c
rename to src/gallium/winsys/dri/intel/intel_screen.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.h b/src/gallium/winsys/dri/intel/intel_screen.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_screen.h
rename to src/gallium/winsys/dri/intel/intel_screen.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c b/src/gallium/winsys/dri/intel/intel_swapbuffers.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
rename to src/gallium/winsys/dri/intel/intel_swapbuffers.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h b/src/gallium/winsys/dri/intel/intel_swapbuffers.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
rename to src/gallium/winsys/dri/intel/intel_swapbuffers.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys.h b/src/gallium/winsys/dri/intel/intel_winsys.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_winsys.h
rename to src/gallium/winsys/dri/intel/intel_winsys.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c b/src/gallium/winsys/dri/intel/intel_winsys_i915.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
rename to src/gallium/winsys/dri/intel/intel_winsys_i915.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c b/src/gallium/winsys/dri/intel/intel_winsys_pipe.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
rename to src/gallium/winsys/dri/intel/intel_winsys_pipe.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_softpipe.c b/src/gallium/winsys/dri/intel/intel_winsys_softpipe.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/intel_winsys_softpipe.c
rename to src/gallium/winsys/dri/intel/intel_winsys_softpipe.c
diff --git a/src/mesa/drivers/dri/intel_winsys/server/i830_common.h b/src/gallium/winsys/dri/intel/server/i830_common.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/server/i830_common.h
rename to src/gallium/winsys/dri/intel/server/i830_common.h
diff --git a/src/mesa/drivers/dri/intel_winsys/server/i830_dri.h b/src/gallium/winsys/dri/intel/server/i830_dri.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/server/i830_dri.h
rename to src/gallium/winsys/dri/intel/server/i830_dri.h
diff --git a/src/mesa/drivers/dri/intel_winsys/server/intel.h b/src/gallium/winsys/dri/intel/server/intel.h
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/server/intel.h
rename to src/gallium/winsys/dri/intel/server/intel.h
diff --git a/src/mesa/drivers/dri/intel_winsys/server/intel_dri.c b/src/gallium/winsys/dri/intel/server/intel_dri.c
similarity index 100%
rename from src/mesa/drivers/dri/intel_winsys/server/intel_dri.c
rename to src/gallium/winsys/dri/intel/server/intel_dri.c
diff --git a/src/mesa/pipe/xlib/brw_aub.c b/src/gallium/winsys/xlib/brw_aub.c
similarity index 100%
rename from src/mesa/pipe/xlib/brw_aub.c
rename to src/gallium/winsys/xlib/brw_aub.c
diff --git a/src/mesa/pipe/xlib/brw_aub.h b/src/gallium/winsys/xlib/brw_aub.h
similarity index 100%
rename from src/mesa/pipe/xlib/brw_aub.h
rename to src/gallium/winsys/xlib/brw_aub.h
diff --git a/src/mesa/pipe/xlib/fakeglx.c b/src/gallium/winsys/xlib/fakeglx.c
similarity index 100%
rename from src/mesa/pipe/xlib/fakeglx.c
rename to src/gallium/winsys/xlib/fakeglx.c
diff --git a/src/mesa/pipe/xlib/glxapi.c b/src/gallium/winsys/xlib/glxapi.c
similarity index 100%
rename from src/mesa/pipe/xlib/glxapi.c
rename to src/gallium/winsys/xlib/glxapi.c
diff --git a/src/mesa/pipe/xlib/glxapi.h b/src/gallium/winsys/xlib/glxapi.h
similarity index 100%
rename from src/mesa/pipe/xlib/glxapi.h
rename to src/gallium/winsys/xlib/glxapi.h
diff --git a/src/mesa/pipe/xlib/glxheader.h b/src/gallium/winsys/xlib/glxheader.h
similarity index 100%
rename from src/mesa/pipe/xlib/glxheader.h
rename to src/gallium/winsys/xlib/glxheader.h
diff --git a/src/mesa/pipe/xlib/realglx.c b/src/gallium/winsys/xlib/realglx.c
similarity index 100%
rename from src/mesa/pipe/xlib/realglx.c
rename to src/gallium/winsys/xlib/realglx.c
diff --git a/src/mesa/pipe/xlib/realglx.h b/src/gallium/winsys/xlib/realglx.h
similarity index 100%
rename from src/mesa/pipe/xlib/realglx.h
rename to src/gallium/winsys/xlib/realglx.h
diff --git a/src/mesa/pipe/xlib/xfonts.c b/src/gallium/winsys/xlib/xfonts.c
similarity index 100%
rename from src/mesa/pipe/xlib/xfonts.c
rename to src/gallium/winsys/xlib/xfonts.c
diff --git a/src/mesa/pipe/xlib/xfonts.h b/src/gallium/winsys/xlib/xfonts.h
similarity index 100%
rename from src/mesa/pipe/xlib/xfonts.h
rename to src/gallium/winsys/xlib/xfonts.h
diff --git a/src/mesa/pipe/xlib/xm_api.c b/src/gallium/winsys/xlib/xm_api.c
similarity index 100%
rename from src/mesa/pipe/xlib/xm_api.c
rename to src/gallium/winsys/xlib/xm_api.c
diff --git a/src/mesa/pipe/xlib/xm_image.c b/src/gallium/winsys/xlib/xm_image.c
similarity index 100%
rename from src/mesa/pipe/xlib/xm_image.c
rename to src/gallium/winsys/xlib/xm_image.c
diff --git a/src/mesa/pipe/xlib/xm_image.h b/src/gallium/winsys/xlib/xm_image.h
similarity index 100%
rename from src/mesa/pipe/xlib/xm_image.h
rename to src/gallium/winsys/xlib/xm_image.h
diff --git a/src/mesa/pipe/xlib/xm_winsys.c b/src/gallium/winsys/xlib/xm_winsys.c
similarity index 100%
rename from src/mesa/pipe/xlib/xm_winsys.c
rename to src/gallium/winsys/xlib/xm_winsys.c
diff --git a/src/mesa/pipe/xlib/xm_winsys_aub.c b/src/gallium/winsys/xlib/xm_winsys_aub.c
similarity index 100%
rename from src/mesa/pipe/xlib/xm_winsys_aub.c
rename to src/gallium/winsys/xlib/xm_winsys_aub.c
diff --git a/src/mesa/pipe/xlib/xm_winsys_aub.h b/src/gallium/winsys/xlib/xm_winsys_aub.h
similarity index 100%
rename from src/mesa/pipe/xlib/xm_winsys_aub.h
rename to src/gallium/winsys/xlib/xm_winsys_aub.h
diff --git a/src/mesa/pipe/xlib/xmesaP.h b/src/gallium/winsys/xlib/xmesaP.h
similarity index 100%
rename from src/mesa/pipe/xlib/xmesaP.h
rename to src/gallium/winsys/xlib/xmesaP.h