2.01

Optimize layout and class architecture.