Remove unnecessary jar files.
Replace with generated by the newest sdk tool.
Rename the class and move package.