Moved structs to their corresponding header files.