changed folder structure and added more test cases