Add puzzles for first two level packs and refactor packages