Removed some variable prefixes and converted some constants to upper
case.  More style cleanups to come.
Big reorganization of code into separate source and header files.