Added a new Puzzle model and new routes
fixed routes for bad merge