Improved Semantics more

Organized semantic logic.  Renamed headers to conform to project intent
more closely.