Rename BrazilXYZ to XYZ.
Move `beautify.ml` inside `print.ml`
cosmetic changes