diff --git a/src/libXvMC/Makefile b/src/xvmc/Makefile
similarity index 100%
rename from src/libXvMC/Makefile
rename to src/xvmc/Makefile
diff --git a/src/libXvMC/attributes.c b/src/xvmc/attributes.c
similarity index 100%
rename from src/libXvMC/attributes.c
rename to src/xvmc/attributes.c
diff --git a/src/libXvMC/block.c b/src/xvmc/block.c
similarity index 100%
rename from src/libXvMC/block.c
rename to src/xvmc/block.c
diff --git a/src/libXvMC/context.c b/src/xvmc/context.c
similarity index 100%
rename from src/libXvMC/context.c
rename to src/xvmc/context.c
diff --git a/src/libXvMC/subpicture.c b/src/xvmc/subpicture.c
similarity index 100%
rename from src/libXvMC/subpicture.c
rename to src/xvmc/subpicture.c
diff --git a/src/libXvMC/surface.c b/src/xvmc/surface.c
similarity index 100%
rename from src/libXvMC/surface.c
rename to src/xvmc/surface.c
diff --git a/src/libXvMC/tests/.gitignore b/src/xvmc/tests/.gitignore
similarity index 100%
rename from src/libXvMC/tests/.gitignore
rename to src/xvmc/tests/.gitignore
diff --git a/src/libXvMC/tests/Makefile b/src/xvmc/tests/Makefile
similarity index 100%
rename from src/libXvMC/tests/Makefile
rename to src/xvmc/tests/Makefile
diff --git a/src/libXvMC/tests/test_blocks.c b/src/xvmc/tests/test_blocks.c
similarity index 100%
rename from src/libXvMC/tests/test_blocks.c
rename to src/xvmc/tests/test_blocks.c
diff --git a/src/libXvMC/tests/test_context.c b/src/xvmc/tests/test_context.c
similarity index 100%
rename from src/libXvMC/tests/test_context.c
rename to src/xvmc/tests/test_context.c
diff --git a/src/libXvMC/tests/test_rendering.c b/src/xvmc/tests/test_rendering.c
similarity index 100%
rename from src/libXvMC/tests/test_rendering.c
rename to src/xvmc/tests/test_rendering.c
diff --git a/src/libXvMC/tests/test_surface.c b/src/xvmc/tests/test_surface.c
similarity index 100%
rename from src/libXvMC/tests/test_surface.c
rename to src/xvmc/tests/test_surface.c
diff --git a/src/libXvMC/tests/testlib.c b/src/xvmc/tests/testlib.c
similarity index 100%
rename from src/libXvMC/tests/testlib.c
rename to src/xvmc/tests/testlib.c
diff --git a/src/libXvMC/tests/testlib.h b/src/xvmc/tests/testlib.h
similarity index 100%
rename from src/libXvMC/tests/testlib.h
rename to src/xvmc/tests/testlib.h
diff --git a/src/libXvMC/tests/xvmc_bench.c b/src/xvmc/tests/xvmc_bench.c
similarity index 100%
rename from src/libXvMC/tests/xvmc_bench.c
rename to src/xvmc/tests/xvmc_bench.c