Each commit moves or renames a file; though logically separate, I've grouped them under this pull request for convenience.
mcfunley
