First pass at file layout guidance
Merge branch 'layout-guidance'