Merge to XFA: Tidy public/ directory.