Slightly easier-to-figure-out arrangement of files
Updated README