Revise file names and dir layout for issue 360

You can of course preview this new layout yourself by visiting: https://github.com/pnkfelix/rfcs/tree/fsk-revise-file-names-and-dir-layout-for-issue-360

Fix #360.