restructured.  Includes terminal window