Clean up and reorg

Moving things around and trying to make more generic so we can start
handling other save files.