Organized Manifest
diff --git a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
index 799347a..5e7fd93 100644
--- a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
@@ -32,26 +32,26 @@
  org.eclipse.wst.validation,
  org.eclipse.wst.xml.core,
  org.eclipse.xsd
-Export-Package: org.eclipse.jpt.core.internal,
- org.eclipse.jpt.core.internal.content.java,
- org.eclipse.jpt.core.internal.content.java.mappings,
- org.eclipse.jpt.core.internal.content.java.mappings.util,
- org.eclipse.jpt.core.internal.content.java.util,
- org.eclipse.jpt.core.internal.content.orm,
- org.eclipse.jpt.core.internal.content.orm.resource,
- org.eclipse.jpt.core.internal.content.orm.util,
- org.eclipse.jpt.core.internal.content.persistence,
- org.eclipse.jpt.core.internal.content.persistence.resource,
- org.eclipse.jpt.core.internal.content.persistence.util,
+Export-Package: org.eclipse.jpt.core.internal;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.java;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.java.mappings;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.java.mappings.util;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.java.util;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.orm;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.orm.resource;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.orm.util;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.persistence;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.persistence.resource;x-internal:=true,
+ org.eclipse.jpt.core.internal.content.persistence.util;x-internal:=true,
  org.eclipse.jpt.core.internal.emfutility;x-internal:=true,
- org.eclipse.jpt.core.internal.facet,
- org.eclipse.jpt.core.internal.jdtutility,
- org.eclipse.jpt.core.internal.mappings,
- org.eclipse.jpt.core.internal.mappings.util,
- org.eclipse.jpt.core.internal.platform,
- org.eclipse.jpt.core.internal.platform.generic,
- org.eclipse.jpt.core.internal.prefs,
- org.eclipse.jpt.core.internal.synch,
- org.eclipse.jpt.core.internal.util,
- org.eclipse.jpt.core.internal.validation
+ org.eclipse.jpt.core.internal.facet;x-internal:=true,
+ org.eclipse.jpt.core.internal.jdtutility;x-internal:=true,
+ org.eclipse.jpt.core.internal.mappings;x-internal:=true,
+ org.eclipse.jpt.core.internal.mappings.util;x-internal:=true,
+ org.eclipse.jpt.core.internal.platform;x-internal:=true,
+ org.eclipse.jpt.core.internal.platform.generic;x-internal:=true,
+ org.eclipse.jpt.core.internal.prefs;x-internal:=true,
+ org.eclipse.jpt.core.internal.synch;x-internal:=true,
+ org.eclipse.jpt.core.internal.util;x-internal:=true,
+ org.eclipse.jpt.core.internal.validation;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.db.ui/META-INF/MANIFEST.MF
index c809b3e..b37aa6b 100644
--- a/jpa/plugins/org.eclipse.jpt.db.ui/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.db.ui/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jpt.db.ui.internal
+Export-Package: org.eclipse.jpt.db.ui.internal;x-internal:=true
 Require-Bundle: org.eclipse.ui,
  org.eclipse.jpt.db,
  org.eclipse.datatools.connectivity.ui,
diff --git a/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF
index a8da475..a91bdd2 100644
--- a/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.jpt.db.internal
+Export-Package: org.eclipse.jpt.db.internal;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.datatools.sqltools.editor.core,
  org.eclipse.jpt.utility
diff --git a/jpa/plugins/org.eclipse.jpt.gen/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.gen/META-INF/MANIFEST.MF
index 4035383..e7edcca 100644
--- a/jpa/plugins/org.eclipse.jpt.gen/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.gen/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jpt.gen.internal
+Export-Package: org.eclipse.jpt.gen.internal;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.core,
  org.eclipse.jpt.core,