typo
fine-tune code/structure.php, pi/structure.php
Merge commit 'github/testing' into beta