Reestructured the solution and Add Kata 3