Updated Structures to enums.

Anything else that needs converting?
Merge remote-tracking branch 'origin/master'