Moved some structs and enums out to headers.

Hoping to refactor some more functions, just moving easy enums and structs out
to their own headers.