Removed dependency on Struct.
Removed a Struct.h include.
Misc. changes.