diff --git a/test/allcalls.h b/zNEW_test/allcalls.h
similarity index 100%
rename from test/allcalls.h
rename to zNEW_test/allcalls.h
diff --git a/test/controls.c b/zNEW_test/controls.c
similarity index 100%
rename from test/controls.c
rename to zNEW_test/controls.c
diff --git a/test/controls_darwin.m b/zNEW_test/controls_darwin.m
similarity index 100%
rename from test/controls_darwin.m
rename to zNEW_test/controls_darwin.m
diff --git a/test/controls_darwin_errors.m b/zNEW_test/controls_darwin_errors.m
similarity index 100%
rename from test/controls_darwin_errors.m
rename to zNEW_test/controls_darwin_errors.m
diff --git a/test/controls_errors.cpp b/zNEW_test/controls_errors.cpp
similarity index 100%
rename from test/controls_errors.cpp
rename to zNEW_test/controls_errors.cpp
diff --git a/test/controls_haiku.c b/zNEW_test/controls_haiku.c
similarity index 100%
rename from test/controls_haiku.c
rename to zNEW_test/controls_haiku.c
diff --git a/test/controls_haiku_errors.cpp b/zNEW_test/controls_haiku_errors.cpp
similarity index 100%
rename from test/controls_haiku_errors.cpp
rename to zNEW_test/controls_haiku_errors.cpp
diff --git a/test/controls_unix.c b/zNEW_test/controls_unix.c
similarity index 100%
rename from test/controls_unix.c
rename to zNEW_test/controls_unix.c
diff --git a/test/controls_unix_errors.cpp b/zNEW_test/controls_unix_errors.cpp
similarity index 100%
rename from test/controls_unix_errors.cpp
rename to zNEW_test/controls_unix_errors.cpp
diff --git a/test/controls_windows.c b/zNEW_test/controls_windows.c
similarity index 100%
rename from test/controls_windows.c
rename to zNEW_test/controls_windows.c
diff --git a/test/controls_windows_errors.cpp b/zNEW_test/controls_windows_errors.cpp
similarity index 100%
rename from test/controls_windows_errors.cpp
rename to zNEW_test/controls_windows_errors.cpp
diff --git a/test/errors.c b/zNEW_test/errors.c
similarity index 100%
rename from test/errors.c
rename to zNEW_test/errors.c
diff --git a/test/events.c b/zNEW_test/events.c
similarity index 100%
rename from test/events.c
rename to zNEW_test/events.c
diff --git a/test/events_errors.cpp b/zNEW_test/events_errors.cpp
similarity index 100%
rename from test/events_errors.cpp
rename to zNEW_test/events_errors.cpp
diff --git a/test/initmain.c b/zNEW_test/initmain.c
similarity index 100%
rename from test/initmain.c
rename to zNEW_test/initmain.c
diff --git a/test/lib/meson.build b/zNEW_test/lib/meson.build
similarity index 100%
rename from test/lib/meson.build
rename to zNEW_test/lib/meson.build
diff --git a/test/lib/testing.c b/zNEW_test/lib/testing.c
similarity index 100%
rename from test/lib/testing.c
rename to zNEW_test/lib/testing.c
diff --git a/test/lib/testing.h b/zNEW_test/lib/testing.h
similarity index 100%
rename from test/lib/testing.h
rename to zNEW_test/lib/testing.h
diff --git a/test/lib/testingpriv.c b/zNEW_test/lib/testingpriv.c
similarity index 100%
rename from test/lib/testingpriv.c
rename to zNEW_test/lib/testingpriv.c
diff --git a/test/lib/testingpriv.h b/zNEW_test/lib/testingpriv.h
similarity index 100%
rename from test/lib/testingpriv.h
rename to zNEW_test/lib/testingpriv.h
diff --git a/test/lib/thread.h b/zNEW_test/lib/thread.h
similarity index 100%
rename from test/lib/thread.h
rename to zNEW_test/lib/thread.h
diff --git a/test/lib/thread_darwinunix.c b/zNEW_test/lib/thread_darwinunix.c
similarity index 100%
rename from test/lib/thread_darwinunix.c
rename to zNEW_test/lib/thread_darwinunix.c
diff --git a/test/lib/thread_windows.c b/zNEW_test/lib/thread_windows.c
similarity index 100%
rename from test/lib/thread_windows.c
rename to zNEW_test/lib/thread_windows.c
diff --git a/test/lib/timer.c b/zNEW_test/lib/timer.c
similarity index 100%
rename from test/lib/timer.c
rename to zNEW_test/lib/timer.c
diff --git a/test/lib/timer.h b/zNEW_test/lib/timer.h
similarity index 100%
rename from test/lib/timer.h
rename to zNEW_test/lib/timer.h
diff --git a/test/lib/timer_darwinunix.c b/zNEW_test/lib/timer_darwinunix.c
similarity index 100%
rename from test/lib/timer_darwinunix.c
rename to zNEW_test/lib/timer_darwinunix.c
diff --git a/test/lib/timer_windows.c b/zNEW_test/lib/timer_windows.c
similarity index 100%
rename from test/lib/timer_windows.c
rename to zNEW_test/lib/timer_windows.c
diff --git a/test/lib/timerpriv.h b/zNEW_test/lib/timerpriv.h
similarity index 100%
rename from test/lib/timerpriv.h
rename to zNEW_test/lib/timerpriv.h
diff --git a/test/main.c b/zNEW_test/main.c
similarity index 100%
rename from test/main.c
rename to zNEW_test/main.c
diff --git a/test/meson.build b/zNEW_test/meson.build
similarity index 100%
rename from test/meson.build
rename to zNEW_test/meson.build
diff --git a/test/noinitwrongthread.cpp b/zNEW_test/noinitwrongthread.cpp
similarity index 100%
rename from test/noinitwrongthread.cpp
rename to zNEW_test/noinitwrongthread.cpp
diff --git a/test/resources_shared.rc b/zNEW_test/resources_shared.rc
similarity index 100%
rename from test/resources_shared.rc
rename to zNEW_test/resources_shared.rc
diff --git a/test/resources_static.rc b/zNEW_test/resources_static.rc
similarity index 100%
rename from test/resources_static.rc
rename to zNEW_test/resources_static.rc
diff --git a/test/test.h b/zNEW_test/test.h
similarity index 100%
rename from test/test.h
rename to zNEW_test/test.h
diff --git a/test/test_darwin.h b/zNEW_test/test_darwin.h
similarity index 100%
rename from test/test_darwin.h
rename to zNEW_test/test_darwin.h
diff --git a/test/test_haiku.h b/zNEW_test/test_haiku.h
similarity index 100%
rename from test/test_haiku.h
rename to zNEW_test/test_haiku.h
diff --git a/test/test_shared.manifest b/zNEW_test/test_shared.manifest
similarity index 100%
rename from test/test_shared.manifest
rename to zNEW_test/test_shared.manifest
diff --git a/test/test_static.manifest b/zNEW_test/test_static.manifest
similarity index 100%
rename from test/test_static.manifest
rename to zNEW_test/test_static.manifest
diff --git a/test/test_unix.h b/zNEW_test/test_unix.h
similarity index 100%
rename from test/test_unix.h
rename to zNEW_test/test_unix.h
diff --git a/test/test_windows.h b/zNEW_test/test_windows.h
similarity index 100%
rename from test/test_windows.h
rename to zNEW_test/test_windows.h