Refactor the folder name. Added the challenges in classes