Move and rename the table model classes