Reorganized the test folder to match with yuno format.