The mac behavior of mixing files and folders when sorting alphabetically drove me crazy. It used to require a bit of a hack to change the behavior. The Sierra update now offers an easier way to do it.
Finder > Preferences > Advanced
Check “Keep folders on top when sorting by name”