Moving puzzlers to core-general