Refactor challenges into proper folders