Code updates

Renamed classes,
Formatted documentation,
Minor logical reworking of project design