Reorganize directories & clean up test scripts