Reorganized the testing folder