Accessors & Mutators

Renamed and moved the base classes. Added accessors and mutators to the
mix.