Added new class.
Reorganized methods.