create separate bundles and leave JARs alone, fix build path errors in
Eclipse and (occasionally) Jenkins