Maintenance

Namespace changes.
Added class descriptions.
Code cleanup.