Moved some classes to separate packages for organization.