Remove some unused class.

Fix some package name.