More final changes.  Just some reorganization.