Added Structs/Rearranged Headers