relocate folder, add test util