Refactored puzzle namespace.