diff --git a/.clang-format b/libvalkeycluster/.clang-format
similarity index 100%
rename from .clang-format
rename to libvalkeycluster/.clang-format
diff --git a/.gitignore b/libvalkeycluster/.gitignore
similarity index 100%
rename from .gitignore
rename to libvalkeycluster/.gitignore
diff --git a/CHANGELOG.md b/libvalkeycluster/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to libvalkeycluster/CHANGELOG.md
diff --git a/CMakeLists.txt b/libvalkeycluster/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to libvalkeycluster/CMakeLists.txt
diff --git a/CONTRIBUTING.md b/libvalkeycluster/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to libvalkeycluster/CONTRIBUTING.md
diff --git a/COPYING b/libvalkeycluster/COPYING
similarity index 100%
rename from COPYING
rename to libvalkeycluster/COPYING
diff --git a/Makefile b/libvalkeycluster/Makefile
similarity index 100%
rename from Makefile
rename to libvalkeycluster/Makefile
diff --git a/README.md b/libvalkeycluster/README.md
similarity index 100%
rename from README.md
rename to libvalkeycluster/README.md
diff --git a/adapters/ae.h b/libvalkeycluster/adapters/ae.h
similarity index 100%
rename from adapters/ae.h
rename to libvalkeycluster/adapters/ae.h
diff --git a/adapters/glib.h b/libvalkeycluster/adapters/glib.h
similarity index 100%
rename from adapters/glib.h
rename to libvalkeycluster/adapters/glib.h
diff --git a/adapters/libev.h b/libvalkeycluster/adapters/libev.h
similarity index 100%
rename from adapters/libev.h
rename to libvalkeycluster/adapters/libev.h
diff --git a/adapters/libevent.h b/libvalkeycluster/adapters/libevent.h
similarity index 100%
rename from adapters/libevent.h
rename to libvalkeycluster/adapters/libevent.h
diff --git a/adapters/libuv.h b/libvalkeycluster/adapters/libuv.h
similarity index 100%
rename from adapters/libuv.h
rename to libvalkeycluster/adapters/libuv.h
diff --git a/adlist.c b/libvalkeycluster/adlist.c
similarity index 100%
rename from adlist.c
rename to libvalkeycluster/adlist.c
diff --git a/adlist.h b/libvalkeycluster/adlist.h
similarity index 100%
rename from adlist.h
rename to libvalkeycluster/adlist.h
diff --git a/cmddef.h b/libvalkeycluster/cmddef.h
similarity index 100%
rename from cmddef.h
rename to libvalkeycluster/cmddef.h
diff --git a/command.c b/libvalkeycluster/command.c
similarity index 100%
rename from command.c
rename to libvalkeycluster/command.c
diff --git a/command.h b/libvalkeycluster/command.h
similarity index 100%
rename from command.h
rename to libvalkeycluster/command.h
diff --git a/crc16.c b/libvalkeycluster/crc16.c
similarity index 100%
rename from crc16.c
rename to libvalkeycluster/crc16.c
diff --git a/dict.c b/libvalkeycluster/dict.c
similarity index 100%
rename from dict.c
rename to libvalkeycluster/dict.c
diff --git a/dict.h b/libvalkeycluster/dict.h
similarity index 100%
rename from dict.h
rename to libvalkeycluster/dict.h
diff --git a/examples/src/CMakeLists.txt b/libvalkeycluster/examples/src/CMakeLists.txt
similarity index 100%
rename from examples/src/CMakeLists.txt
rename to libvalkeycluster/examples/src/CMakeLists.txt
diff --git a/examples/src/clientside_caching_async.c b/libvalkeycluster/examples/src/clientside_caching_async.c
similarity index 100%
rename from examples/src/clientside_caching_async.c
rename to libvalkeycluster/examples/src/clientside_caching_async.c
diff --git a/examples/src/example.c b/libvalkeycluster/examples/src/example.c
similarity index 100%
rename from examples/src/example.c
rename to libvalkeycluster/examples/src/example.c
diff --git a/examples/src/example_async.c b/libvalkeycluster/examples/src/example_async.c
similarity index 100%
rename from examples/src/example_async.c
rename to libvalkeycluster/examples/src/example_async.c
diff --git a/examples/src/example_tls.c b/libvalkeycluster/examples/src/example_tls.c
similarity index 100%
rename from examples/src/example_tls.c
rename to libvalkeycluster/examples/src/example_tls.c
diff --git a/examples/using_cmake_and_make_mixed/build.sh b/libvalkeycluster/examples/using_cmake_and_make_mixed/build.sh
similarity index 100%
rename from examples/using_cmake_and_make_mixed/build.sh
rename to libvalkeycluster/examples/using_cmake_and_make_mixed/build.sh
diff --git a/examples/using_cmake_externalproject/CMakeLists.txt b/libvalkeycluster/examples/using_cmake_externalproject/CMakeLists.txt
similarity index 100%
rename from examples/using_cmake_externalproject/CMakeLists.txt
rename to libvalkeycluster/examples/using_cmake_externalproject/CMakeLists.txt
diff --git a/examples/using_cmake_externalproject/build.sh b/libvalkeycluster/examples/using_cmake_externalproject/build.sh
similarity index 100%
rename from examples/using_cmake_externalproject/build.sh
rename to libvalkeycluster/examples/using_cmake_externalproject/build.sh
diff --git a/examples/using_cmake_separate/build.sh b/libvalkeycluster/examples/using_cmake_separate/build.sh
similarity index 100%
rename from examples/using_cmake_separate/build.sh
rename to libvalkeycluster/examples/using_cmake_separate/build.sh
diff --git a/examples/using_make/build.sh b/libvalkeycluster/examples/using_make/build.sh
similarity index 100%
rename from examples/using_make/build.sh
rename to libvalkeycluster/examples/using_make/build.sh
diff --git a/gencommands.py b/libvalkeycluster/gencommands.py
similarity index 100%
rename from gencommands.py
rename to libvalkeycluster/gencommands.py
diff --git a/hiarray.c b/libvalkeycluster/hiarray.c
similarity index 100%
rename from hiarray.c
rename to libvalkeycluster/hiarray.c
diff --git a/hiarray.h b/libvalkeycluster/hiarray.h
similarity index 100%
rename from hiarray.h
rename to libvalkeycluster/hiarray.h
diff --git a/hircluster.c b/libvalkeycluster/hircluster.c
similarity index 100%
rename from hircluster.c
rename to libvalkeycluster/hircluster.c
diff --git a/hircluster.h b/libvalkeycluster/hircluster.h
similarity index 100%
rename from hircluster.h
rename to libvalkeycluster/hircluster.h
diff --git a/hircluster_ssl.c b/libvalkeycluster/hircluster_ssl.c
similarity index 100%
rename from hircluster_ssl.c
rename to libvalkeycluster/hircluster_ssl.c
diff --git a/hircluster_ssl.h b/libvalkeycluster/hircluster_ssl.h
similarity index 100%
rename from hircluster_ssl.h
rename to libvalkeycluster/hircluster_ssl.h
diff --git a/hiredis_cluster-config.cmake.in b/libvalkeycluster/hiredis_cluster-config.cmake.in
similarity index 100%
rename from hiredis_cluster-config.cmake.in
rename to libvalkeycluster/hiredis_cluster-config.cmake.in
diff --git a/hiredis_cluster.def b/libvalkeycluster/hiredis_cluster.def
similarity index 100%
rename from hiredis_cluster.def
rename to libvalkeycluster/hiredis_cluster.def
diff --git a/hiredis_cluster.pc.in b/libvalkeycluster/hiredis_cluster.pc.in
similarity index 100%
rename from hiredis_cluster.pc.in
rename to libvalkeycluster/hiredis_cluster.pc.in
diff --git a/hiredis_cluster_ssl-config.cmake.in b/libvalkeycluster/hiredis_cluster_ssl-config.cmake.in
similarity index 100%
rename from hiredis_cluster_ssl-config.cmake.in
rename to libvalkeycluster/hiredis_cluster_ssl-config.cmake.in
diff --git a/hiredis_cluster_ssl.pc.in b/libvalkeycluster/hiredis_cluster_ssl.pc.in
similarity index 100%
rename from hiredis_cluster_ssl.pc.in
rename to libvalkeycluster/hiredis_cluster_ssl.pc.in
diff --git a/hiutil.c b/libvalkeycluster/hiutil.c
similarity index 100%
rename from hiutil.c
rename to libvalkeycluster/hiutil.c
diff --git a/hiutil.h b/libvalkeycluster/hiutil.h
similarity index 100%
rename from hiutil.h
rename to libvalkeycluster/hiutil.h
diff --git a/tests/CMakeLists.txt b/libvalkeycluster/tests/CMakeLists.txt
similarity index 100%
rename from tests/CMakeLists.txt
rename to libvalkeycluster/tests/CMakeLists.txt
diff --git a/tests/clusterclient.c b/libvalkeycluster/tests/clusterclient.c
similarity index 100%
rename from tests/clusterclient.c
rename to libvalkeycluster/tests/clusterclient.c
diff --git a/tests/clusterclient_async.c b/libvalkeycluster/tests/clusterclient_async.c
similarity index 100%
rename from tests/clusterclient_async.c
rename to libvalkeycluster/tests/clusterclient_async.c
diff --git a/tests/clusterclient_reconnect_async.c b/libvalkeycluster/tests/clusterclient_reconnect_async.c
similarity index 100%
rename from tests/clusterclient_reconnect_async.c
rename to libvalkeycluster/tests/clusterclient_reconnect_async.c
diff --git a/tests/ct_async.c b/libvalkeycluster/tests/ct_async.c
similarity index 100%
rename from tests/ct_async.c
rename to libvalkeycluster/tests/ct_async.c
diff --git a/tests/ct_async_glib.c b/libvalkeycluster/tests/ct_async_glib.c
similarity index 100%
rename from tests/ct_async_glib.c
rename to libvalkeycluster/tests/ct_async_glib.c
diff --git a/tests/ct_async_libev.c b/libvalkeycluster/tests/ct_async_libev.c
similarity index 100%
rename from tests/ct_async_libev.c
rename to libvalkeycluster/tests/ct_async_libev.c
diff --git a/tests/ct_async_libuv.c b/libvalkeycluster/tests/ct_async_libuv.c
similarity index 100%
rename from tests/ct_async_libuv.c
rename to libvalkeycluster/tests/ct_async_libuv.c
diff --git a/tests/ct_commands.c b/libvalkeycluster/tests/ct_commands.c
similarity index 100%
rename from tests/ct_commands.c
rename to libvalkeycluster/tests/ct_commands.c
diff --git a/tests/ct_connection.c b/libvalkeycluster/tests/ct_connection.c
similarity index 100%
rename from tests/ct_connection.c
rename to libvalkeycluster/tests/ct_connection.c
diff --git a/tests/ct_connection_ipv6.c b/libvalkeycluster/tests/ct_connection_ipv6.c
similarity index 100%
rename from tests/ct_connection_ipv6.c
rename to libvalkeycluster/tests/ct_connection_ipv6.c
diff --git a/tests/ct_out_of_memory_handling.c b/libvalkeycluster/tests/ct_out_of_memory_handling.c
similarity index 100%
rename from tests/ct_out_of_memory_handling.c
rename to libvalkeycluster/tests/ct_out_of_memory_handling.c
diff --git a/tests/ct_pipeline.c b/libvalkeycluster/tests/ct_pipeline.c
similarity index 100%
rename from tests/ct_pipeline.c
rename to libvalkeycluster/tests/ct_pipeline.c
diff --git a/tests/ct_specific_nodes.c b/libvalkeycluster/tests/ct_specific_nodes.c
similarity index 100%
rename from tests/ct_specific_nodes.c
rename to libvalkeycluster/tests/ct_specific_nodes.c
diff --git a/tests/main_async_tls.c b/libvalkeycluster/tests/main_async_tls.c
similarity index 100%
rename from tests/main_async_tls.c
rename to libvalkeycluster/tests/main_async_tls.c
diff --git a/tests/main_tls.c b/libvalkeycluster/tests/main_tls.c
similarity index 100%
rename from tests/main_tls.c
rename to libvalkeycluster/tests/main_tls.c
diff --git a/tests/scripts/ask-redirect-connection-error-test.sh b/libvalkeycluster/tests/scripts/ask-redirect-connection-error-test.sh
similarity index 100%
rename from tests/scripts/ask-redirect-connection-error-test.sh
rename to libvalkeycluster/tests/scripts/ask-redirect-connection-error-test.sh
diff --git a/tests/scripts/ask-redirect-test.sh b/libvalkeycluster/tests/scripts/ask-redirect-test.sh
similarity index 100%
rename from tests/scripts/ask-redirect-test.sh
rename to libvalkeycluster/tests/scripts/ask-redirect-test.sh
diff --git a/tests/scripts/ask-redirect-using-cluster-nodes-test.sh b/libvalkeycluster/tests/scripts/ask-redirect-using-cluster-nodes-test.sh
similarity index 100%
rename from tests/scripts/ask-redirect-using-cluster-nodes-test.sh
rename to libvalkeycluster/tests/scripts/ask-redirect-using-cluster-nodes-test.sh
diff --git a/tests/scripts/cluster-down-test.sh b/libvalkeycluster/tests/scripts/cluster-down-test.sh
similarity index 100%
rename from tests/scripts/cluster-down-test.sh
rename to libvalkeycluster/tests/scripts/cluster-down-test.sh
diff --git a/tests/scripts/cluster-scale-down-test.sh b/libvalkeycluster/tests/scripts/cluster-scale-down-test.sh
similarity index 100%
rename from tests/scripts/cluster-scale-down-test.sh
rename to libvalkeycluster/tests/scripts/cluster-scale-down-test.sh
diff --git a/tests/scripts/command-from-callback-test.sh b/libvalkeycluster/tests/scripts/command-from-callback-test.sh
similarity index 100%
rename from tests/scripts/command-from-callback-test.sh
rename to libvalkeycluster/tests/scripts/command-from-callback-test.sh
diff --git a/tests/scripts/connect-error-using-cluster-nodes-test.sh b/libvalkeycluster/tests/scripts/connect-error-using-cluster-nodes-test.sh
similarity index 100%
rename from tests/scripts/connect-error-using-cluster-nodes-test.sh
rename to libvalkeycluster/tests/scripts/connect-error-using-cluster-nodes-test.sh
diff --git a/tests/scripts/connection-error-test.sh b/libvalkeycluster/tests/scripts/connection-error-test.sh
similarity index 100%
rename from tests/scripts/connection-error-test.sh
rename to libvalkeycluster/tests/scripts/connection-error-test.sh
diff --git a/tests/scripts/dbsize-to-all-nodes-during-scaledown-test-async.sh b/libvalkeycluster/tests/scripts/dbsize-to-all-nodes-during-scaledown-test-async.sh
similarity index 100%
rename from tests/scripts/dbsize-to-all-nodes-during-scaledown-test-async.sh
rename to libvalkeycluster/tests/scripts/dbsize-to-all-nodes-during-scaledown-test-async.sh
diff --git a/tests/scripts/dbsize-to-all-nodes-during-scaledown-test.sh b/libvalkeycluster/tests/scripts/dbsize-to-all-nodes-during-scaledown-test.sh
similarity index 100%
rename from tests/scripts/dbsize-to-all-nodes-during-scaledown-test.sh
rename to libvalkeycluster/tests/scripts/dbsize-to-all-nodes-during-scaledown-test.sh
diff --git a/tests/scripts/dbsize-to-all-nodes-test.sh b/libvalkeycluster/tests/scripts/dbsize-to-all-nodes-test.sh
similarity index 100%
rename from tests/scripts/dbsize-to-all-nodes-test.sh
rename to libvalkeycluster/tests/scripts/dbsize-to-all-nodes-test.sh
diff --git a/tests/scripts/moved-redirect-test.sh b/libvalkeycluster/tests/scripts/moved-redirect-test.sh
similarity index 100%
rename from tests/scripts/moved-redirect-test.sh
rename to libvalkeycluster/tests/scripts/moved-redirect-test.sh
diff --git a/tests/scripts/moved-redirect-using-cluster-nodes-test.sh b/libvalkeycluster/tests/scripts/moved-redirect-using-cluster-nodes-test.sh
similarity index 100%
rename from tests/scripts/moved-redirect-using-cluster-nodes-test.sh
rename to libvalkeycluster/tests/scripts/moved-redirect-using-cluster-nodes-test.sh
diff --git a/tests/scripts/reconnect-test.sh b/libvalkeycluster/tests/scripts/reconnect-test.sh
similarity index 100%
rename from tests/scripts/reconnect-test.sh
rename to libvalkeycluster/tests/scripts/reconnect-test.sh
diff --git a/tests/scripts/redirect-with-hostname-test.sh b/libvalkeycluster/tests/scripts/redirect-with-hostname-test.sh
similarity index 100%
rename from tests/scripts/redirect-with-hostname-test.sh
rename to libvalkeycluster/tests/scripts/redirect-with-hostname-test.sh
diff --git a/tests/scripts/redirect-with-ipv6-test.sh b/libvalkeycluster/tests/scripts/redirect-with-ipv6-test.sh
similarity index 100%
rename from tests/scripts/redirect-with-ipv6-test.sh
rename to libvalkeycluster/tests/scripts/redirect-with-ipv6-test.sh
diff --git a/tests/scripts/redis-cluster b/libvalkeycluster/tests/scripts/redis-cluster
similarity index 100%
rename from tests/scripts/redis-cluster
rename to libvalkeycluster/tests/scripts/redis-cluster
diff --git a/tests/scripts/set-get-test.sh b/libvalkeycluster/tests/scripts/set-get-test.sh
similarity index 100%
rename from tests/scripts/set-get-test.sh
rename to libvalkeycluster/tests/scripts/set-get-test.sh
diff --git a/tests/scripts/simulated-redis.pl b/libvalkeycluster/tests/scripts/simulated-redis.pl
similarity index 100%
rename from tests/scripts/simulated-redis.pl
rename to libvalkeycluster/tests/scripts/simulated-redis.pl
diff --git a/tests/scripts/slots-not-served-test-async.sh b/libvalkeycluster/tests/scripts/slots-not-served-test-async.sh
similarity index 100%
rename from tests/scripts/slots-not-served-test-async.sh
rename to libvalkeycluster/tests/scripts/slots-not-served-test-async.sh
diff --git a/tests/scripts/slots-not-served-test.sh b/libvalkeycluster/tests/scripts/slots-not-served-test.sh
similarity index 100%
rename from tests/scripts/slots-not-served-test.sh
rename to libvalkeycluster/tests/scripts/slots-not-served-test.sh
diff --git a/tests/scripts/timeout-handling-test.sh b/libvalkeycluster/tests/scripts/timeout-handling-test.sh
similarity index 100%
rename from tests/scripts/timeout-handling-test.sh
rename to libvalkeycluster/tests/scripts/timeout-handling-test.sh
diff --git a/tests/scripts/valkey-cluster b/libvalkeycluster/tests/scripts/valkey-cluster
similarity index 100%
rename from tests/scripts/valkey-cluster
rename to libvalkeycluster/tests/scripts/valkey-cluster
diff --git a/tests/test_utils.c b/libvalkeycluster/tests/test_utils.c
similarity index 100%
rename from tests/test_utils.c
rename to libvalkeycluster/tests/test_utils.c
diff --git a/tests/test_utils.h b/libvalkeycluster/tests/test_utils.h
similarity index 100%
rename from tests/test_utils.h
rename to libvalkeycluster/tests/test_utils.h
diff --git a/tests/ut_parse_cmd.c b/libvalkeycluster/tests/ut_parse_cmd.c
similarity index 100%
rename from tests/ut_parse_cmd.c
rename to libvalkeycluster/tests/ut_parse_cmd.c
diff --git a/win32.h b/libvalkeycluster/win32.h
similarity index 100%
rename from win32.h
rename to libvalkeycluster/win32.h