Rename the PuzzleHelper class to Puzzle as this has become the model object for puzzles rather then an add-on as it was in the past.