Minor reorganization so we can start writing up additional documentation.