Further Structure Split

Moved more structures into their own files.