Add some better MainMenu code.
Rearrange some files to get a file hierarchy that is easier to understand.