Kata 5: Move fields to an class