Begin adding class organization.