Add and update classpaths.

Add and update classpaths to better deal with
importing into eclipse.