Refactor challenges into specific folders