Correct folder structure
Test cases added and improved