Improvements.

* Using normal rename.
* Improved code layout.