More tuning of layout and directory names