diff --git a/common/OLD_drawtext.c b/_wip/attrstr_metrics/common_OLD_drawtext.c
similarity index 100%
rename from common/OLD_drawtext.c
rename to _wip/attrstr_metrics/common_OLD_drawtext.c
diff --git a/common/OLD_uipriv_attrstr.h b/_wip/attrstr_metrics/common_OLD_uipriv_attrstr.h
similarity index 100%
rename from common/OLD_uipriv_attrstr.h
rename to _wip/attrstr_metrics/common_OLD_uipriv_attrstr.h
diff --git a/darwin/OLD__appkit_drawtext.m b/_wip/attrstr_metrics/darwin_OLD__appkit_drawtext.m
similarity index 100%
rename from darwin/OLD__appkit_drawtext.m
rename to _wip/attrstr_metrics/darwin_OLD__appkit_drawtext.m
diff --git a/darwin/OLD__appkit_fontmatch.m b/_wip/attrstr_metrics/darwin_OLD__appkit_fontmatch.m
similarity index 100%
rename from darwin/OLD__appkit_fontmatch.m
rename to _wip/attrstr_metrics/darwin_OLD__appkit_fontmatch.m
diff --git a/darwin/OLD__old_drawtext.m b/_wip/attrstr_metrics/darwin_OLD__old_drawtext.m
similarity index 100%
rename from darwin/OLD__old_drawtext.m
rename to _wip/attrstr_metrics/darwin_OLD__old_drawtext.m
diff --git a/darwin/OLD_drawtext.m b/_wip/attrstr_metrics/darwin_OLD_drawtext.m
similarity index 100%
rename from darwin/OLD_drawtext.m
rename to _wip/attrstr_metrics/darwin_OLD_drawtext.m
diff --git a/unix/OLD__old_drawtext.c b/_wip/attrstr_metrics/unix_OLD__old_drawtext.c
similarity index 100%
rename from unix/OLD__old_drawtext.c
rename to _wip/attrstr_metrics/unix_OLD__old_drawtext.c
diff --git a/unix/OLD_drawtext.c b/_wip/attrstr_metrics/unix_OLD_drawtext.c
similarity index 100%
rename from unix/OLD_drawtext.c
rename to _wip/attrstr_metrics/unix_OLD_drawtext.c
diff --git a/windows/OLD__old_drawtext.cpp b/_wip/attrstr_metrics/windows_OLD__old_drawtext.cpp
similarity index 100%
rename from windows/OLD__old_drawtext.cpp
rename to _wip/attrstr_metrics/windows_OLD__old_drawtext.cpp
diff --git a/windows/OLD_drawtext.cpp b/_wip/attrstr_metrics/windows_OLD_drawtext.cpp
similarity index 100%
rename from windows/OLD_drawtext.cpp
rename to _wip/attrstr_metrics/windows_OLD_drawtext.cpp