Flatten layout folders.

Jekyll doesn't support layout subfolders <https://github.com/jekyll/jekyll/issues/1369> nor, apparently, layout file names with '-'s in them.