Move class to other package
Removed todo
Added Javadoc to generated code
Get rid of a depricated API method
Code cleanup
Make sure that imports are only added once.
Removed supperflous test