cleanup: move test directories from top level to relevant dir