move challenge objects to a more sensible package