Working on renaming things because the game concept changed.
More renaming due to the change in concept, and a little reorganization