Minor adjustments to file layout.