Organization

Seriously reorganized classes into packages. Getters/setters. Better
data containment.