Unified headers in prep for packages
Put classes in packages
Fixed errors after putting into packages

The errors were from package-level protection, which no longer worked.
Some variables I made public, and for some I put in accessor methods.