Moving challengetypes to its own file