Started separating component classes. [#90]