Mild Revisions to Structure and added classes.