Better Javadoc
Add convert package