Remove the use of a bunch of global variables.
Do some file renamin'.