Merged the three external bundles; simpler now, less classpath horror