Comments and reorganization.

This is the first BX build fast enough to beat the 50 minute Travis expiry!