Refactor; pull in LibJava for base dependencies