Fixed jar dependency bugs and prepared code for 2.0 release.