Some more organization, and additions to the README.

This closes #13 and #12.
Merge branch 'dev'