diff --git a/src/mesa/pipe/softpipe/sp_prim_clip.c b/src/mesa/pipe/draw/draw_clip.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_clip.c
rename to src/mesa/pipe/draw/draw_clip.c
diff --git a/src/mesa/pipe/softpipe/sp_draw.h b/src/mesa/pipe/draw/draw_context.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_draw.h
rename to src/mesa/pipe/draw/draw_context.h
diff --git a/src/mesa/pipe/softpipe/sp_prim_cull.c b/src/mesa/pipe/draw/draw_cull.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_cull.c
rename to src/mesa/pipe/draw/draw_cull.c
diff --git a/src/mesa/pipe/softpipe/sp_prim_flatshade.c b/src/mesa/pipe/draw/draw_flatshade.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_flatshade.c
rename to src/mesa/pipe/draw/draw_flatshade.c
diff --git a/src/mesa/pipe/softpipe/sp_prim_offset.c b/src/mesa/pipe/draw/draw_offset.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_offset.c
rename to src/mesa/pipe/draw/draw_offset.c
diff --git a/src/mesa/pipe/softpipe/sp_prim.h b/src/mesa/pipe/draw/draw_private.h
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim.h
rename to src/mesa/pipe/draw/draw_private.h
diff --git a/src/mesa/pipe/softpipe/sp_prim_twoside.c b/src/mesa/pipe/draw/draw_twoside.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_twoside.c
rename to src/mesa/pipe/draw/draw_twoside.c
diff --git a/src/mesa/pipe/softpipe/sp_prim_unfilled.c b/src/mesa/pipe/draw/draw_unfilled.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_prim_unfilled.c
rename to src/mesa/pipe/draw/draw_unfilled.c
diff --git a/src/mesa/pipe/softpipe/sp_draw.c b/src/mesa/pipe/draw/draw_vb.c
similarity index 100%
rename from src/mesa/pipe/softpipe/sp_draw.c
rename to src/mesa/pipe/draw/draw_vb.c