Game State Patch 1 [Also huge edits]

Modified all files except legacy to have linearity by keeping all
opening braces on the opening line of a block rather than their own line