diff --git a/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF
index f7200a615..64e665b09 100644
--- a/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF
@@ -12,5 +12,6 @@ Require-Bundle: com.ibm.wala.cast.java,
  com.ibm.wala.cast,
  com.ibm.wala.shrike
 Export-Package: com.ibm.wala.cast.java.client,
+ com.ibm.wala.cast.java.ecj.util,
  com.ibm.wala.cast.java.translator.jdt,
  com.ibm.wala.cast.java.translator.jdt.ecj
diff --git a/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
index 0c0c25f53..03ad64551 100644
--- a/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
@@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.html.nu_validator
 Bundle-Version: 1.4.3.qualifier
-Export-Package: com.ibm.wala.cast.js.html.nu_validator
+Export-Package: com.ibm.wala.cast.js.html.nu_validator,
+ com.ibm.wala.cast.js.test
 Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.0.0",
  com.ibm.wala.cast.js.rhino.test;bundle-version="1.0.0",
  com.ibm.wala.cast.js.test;bundle-version="1.0.0",
diff --git a/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
index b1254b83f..201a69395 100644
--- a/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
@@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.nodejs
 Bundle-Version: 1.4.3.qualifier
-Export-Package: com.ibm.wala.cast.js.nodejs
+Export-Package: com.ibm.wala.cast.js.nodejs,
+ org.json
 Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.3.10",
  com.ibm.wala.cast.js.rhino;bundle-version="1.3.10"
 Bundle-ClassPath: lib/json-20160212.jar,
diff --git a/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
index d5f4a16ea..fc8236242 100644
--- a/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
@@ -16,6 +16,8 @@ Require-Bundle: com.ibm.wala.cast.js.rhino;bundle-version="1.0.0",
  org.junit;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Export-Package: com.ibm.wala.cast.js.rhino.callgraph.fieldbased.test,
+Export-Package: com.ibm.wala.cast.js.examples.hybrid,
+ com.ibm.wala.cast.js.rhino.callgraph.fieldbased.test,
  com.ibm.wala.cast.js.rhino.test,
- com.ibm.wala.cast.js.test
+ com.ibm.wala.cast.js.test,
+ com.ibm.wala.cast.js.vis
diff --git a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
index 2f6558f65..56e32868d 100644
--- a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
@@ -13,11 +13,15 @@ Require-Bundle: com.ibm.wala.shrike,
  org.apache.ant,
  org.hamcrest.core;bundle-version="1.3.0"
 Bundle-Localization: plugin
-Export-Package: com.ibm.wala.core.tests.basic,
+Export-Package: com.ibm.wala.core.tests.arraybounds,
+ com.ibm.wala.core.tests.basic,
  com.ibm.wala.core.tests.callGraph,
+ com.ibm.wala.core.tests.cfg.exc.inter,
+ com.ibm.wala.core.tests.cfg.exc.intra,
  com.ibm.wala.core.tests.cha,
  com.ibm.wala.core.tests.collections,
  com.ibm.wala.core.tests.demandpa,
+ com.ibm.wala.core.tests.exceptionpruning,
  com.ibm.wala.core.tests.ir,
  com.ibm.wala.core.tests.plugin,
  com.ibm.wala.core.tests.ptrs,
diff --git a/com.ibm.wala.core/META-INF/MANIFEST.MF b/com.ibm.wala.core/META-INF/MANIFEST.MF
index 6f452b7f9..8143cc22e 100644
--- a/com.ibm.wala.core/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.core/META-INF/MANIFEST.MF
@@ -11,6 +11,10 @@ Require-Bundle: com.ibm.wala.shrike,
 Bundle-ActivationPolicy: lazy
 Export-Package: .,
  com.ibm.wala.analysis.arraybounds,
+ com.ibm.wala.analysis.arraybounds.hypergraph,
+ com.ibm.wala.analysis.arraybounds.hypergraph.algorithms,
+ com.ibm.wala.analysis.arraybounds.hypergraph.weight,
+ com.ibm.wala.analysis.arraybounds.hypergraph.weight.edgeweights,
  com.ibm.wala.analysis.exceptionanalysis,
  com.ibm.wala.analysis.nullpointer,
  com.ibm.wala.analysis.pointers,
@@ -70,7 +74,8 @@ Export-Package: .,
  com.ibm.wala.util.strings,
  com.ibm.wala.util.warnings,
  com.ibm.wala.viz,
- com.ibm.wala.viz.viewer
+ com.ibm.wala.viz.viewer,
+ com.ibm.wala.viz.viewer.images
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Eclipse-BuddyPolicy: registered
 Bundle-ClassPath: .
diff --git a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
index 3abfb76f6..aa15afe57 100644
--- a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
@@ -16,5 +16,9 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .,
  lib/dx.jar
-Export-Package: com.ibm.wala.dalvik.test.callGraph,
+Export-Package: com.ibm.wala.dalvik.drivers,
+ com.ibm.wala.dalvik.test,
+ com.ibm.wala.dalvik.test.callGraph,
+ com.ibm.wala.dalvik.test.callGraph.droidbench,
+ com.ibm.wala.dalvik.test.ir,
  com.ibm.wala.dalvik.test.util
diff --git a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
index babbbb670..92a310803 100644
--- a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
@@ -28,3 +28,6 @@ Require-Bundle: com.ibm.wala.cast.java.test;bundle-version="1.0.0",
  com.ibm.wala.cast.java.ecj
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: com.ibm.wala.cast.java.jdt.test,
+ com.ibm.wala.cast.java.test,
+ com.ibm.wala.demandpa.driver
diff --git a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
index 5b1d4fc4e..0b9581973 100644
--- a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
@@ -24,5 +24,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: com.ibm.wala.cast.java.client,
  com.ibm.wala.cast.java.translator.jdt,
+ com.ibm.wala.eclipse.headless,
+ com.ibm.wala.ide,
  com.ibm.wala.ide.jdt,
  com.ibm.wala.ide.util
diff --git a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
index bec9ff619..27597c3bd 100644
--- a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
@@ -21,5 +21,7 @@ Require-Bundle: com.ibm.wala.shrike,
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Export-Package: com.ibm.wala.ide.tests.util
+Export-Package: com.ibm.wala.examples.drivers,
+ com.ibm.wala.ide.test,
+ com.ibm.wala.ide.tests.util
 Bundle-Activator: com.ibm.wala.ide.test.Activator
diff --git a/com.ibm.wala.shrike/META-INF/MANIFEST.MF b/com.ibm.wala.shrike/META-INF/MANIFEST.MF
index 2e85e833a..dbf0dff61 100644
--- a/com.ibm.wala.shrike/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.shrike/META-INF/MANIFEST.MF
@@ -9,12 +9,14 @@ Bundle-Localization: plugin
 Export-Package: com.ibm.wala.shrike.bench,
  com.ibm.wala.shrike.cg,
  com.ibm.wala.shrike.copywriter,
+ com.ibm.wala.shrike.instrumentation,
  com.ibm.wala.shrikeBT,
  com.ibm.wala.shrikeBT.analysis,
  com.ibm.wala.shrikeBT.info,
  com.ibm.wala.shrikeBT.shrikeCT,
  com.ibm.wala.shrikeBT.shrikeCT.tools,
  com.ibm.wala.shrikeBT.tools,
- com.ibm.wala.shrikeCT
+ com.ibm.wala.shrikeCT,
+ com.ibm.wala.sourcepos
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.ibm.wala.util