min version
reorg class names