minor file layout changes