Rename some classes and package structure.