modify default classes in client to match new structure