diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/Upgrade664to665.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/Upgrade664to665.java
new file mode 100644
index 000000000..417d40108
--- /dev/null
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/Upgrade664to665.java
@@ -0,0 +1,33 @@
+package com.arsdigita.cms.contenttypes.upgrades;
+
+import com.arsdigita.util.cmd.Program;
+import org.apache.commons.cli.CommandLine;
+
+/**
+ *
+ * @author Jens Pelzetter <jens@jp-digital.de>
+ * @version $Id$
+ */
+public class Upgrade664to665 extends Program {
+
+    public Upgrade664to665() {
+        super("Upgrade664to665", "1.0.0", "", true, true);
+    }
+        
+    @Override
+    protected void doRun(CommandLine cmdLine) {
+        new CreateContactBundles().doUpgrade();
+        new CreateOrgaUnitBundles().doUpgrade();
+        new CreatePersonBundles().doUpgrade();
+        new GenericContactGenericPersonAssocUpgrade().doUpgrade();
+        new GenericOrgaUnitGenericContactAssocUpgrade().doUpgrade();
+        new GenericOrgaUnitGenericOrgaUnitAssocUpgrade().doUpgrade();
+        new GenericOrgaUnitGenericPersonAssocUpgrade().doUpgrade();
+        
+    }
+    
+    public static void main(final String[] args) {
+        new Upgrade664to665().run(args);
+    }
+    
+}
diff --git a/ccm-sci-publications/src/ccm-sci-publications.upgrade b/ccm-sci-publications/src/ccm-sci-publications.upgrade
index a1951cbf2..8d3ebcd73 100644
--- a/ccm-sci-publications/src/ccm-sci-publications.upgrade
+++ b/ccm-sci-publications/src/ccm-sci-publications.upgrade
@@ -6,32 +6,6 @@
         <script sql="ccm-sci-publications/upgrade/::database::-6.6.1-6.6.2.sql"/>
     </version>
     <version from="6.6.2" to="6.6.3">
-        <script class="com.arsdigita.cms.contenttypes.upgrades.JournalTypeUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.ArticleInCollectedVolumeBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.ArticleInJournalBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.CollectedVolumeBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.ExpertiseBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.InProceedingsBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.InternetArticleBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.JournalBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.ProceedingsBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.PublicationBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.PublicationWithPublisherBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.PublisherBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.SeriesBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.UnPublishedBundleUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.CollectedVolumeArticlesAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.ExpertiseOrdererAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.ExpertiseOrganizationAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.InternetArticleOrganizationAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.JournalArticlesAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.ProceedingsOrganizerAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.ProceedingsPapersAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.PublicationAuthorsAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.PublicationOrgaunitAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.PublicationWithPublisherAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.SeriesEditorsAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.SeriesPublicationsAssocUpgrade"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.UnPublishedOrganizationAssocUpgrade"/>
+        <script class="com.arsdigita.cms.contenttypes.upgrades.SciPublicationsUpgrade662to663"/>       
     </version>
 </upgrade>
\ No newline at end of file
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ArticleInCollectedVolumeBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ArticleInCollectedVolumeBundleUpgrade.java
index 12b9029f2..38809b3ce 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ArticleInCollectedVolumeBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ArticleInCollectedVolumeBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.ArticleInCollectedVolumeBundle;
  * @version $Id$
  */
 public class ArticleInCollectedVolumeBundleUpgrade extends AbstractBundleUpgrade {
-    
-    public ArticleInCollectedVolumeBundleUpgrade() {
-        super("ArticleInCollectedVolumeBundleUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new ArticleInCollectedVolumeBundleUpgrade().run(args);
-    }
-
+       
     @Override
     protected String getBundleTableName() {
         return "ct_article_in_collected_volume_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ArticleInJournalBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ArticleInJournalBundleUpgrade.java
index 14e593e1d..91292ee7a 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ArticleInJournalBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ArticleInJournalBundleUpgrade.java
@@ -9,15 +9,6 @@ import com.arsdigita.cms.contenttypes.ArticleInJournalBundle;
  */
 public class ArticleInJournalBundleUpgrade extends AbstractBundleUpgrade {
     
-    public ArticleInJournalBundleUpgrade() {
-        super("ArticleInJournalBundleUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new ArticleInJournalBundleUpgrade().run(args);
-    }
-    
-    
     @Override
     protected String getBundleTableName() {
         return "ct_article_in_journal_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/CollectedVolumeArticlesAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/CollectedVolumeArticlesAssocUpgrade.java
index b10359817..d5943afef 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/CollectedVolumeArticlesAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/CollectedVolumeArticlesAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class CollectedVolumeArticlesAssocUpgrade extends AbstractAssocUpgrade {
-
-    public CollectedVolumeArticlesAssocUpgrade() {
-        super("CollectedVolumeArticlesAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new CollectedVolumeArticlesAssocUpgrade().run(args);
-    }
-
+    
     @Override
     protected String getTableName() {
         return "ct_collected_volume_article_map";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/CollectedVolumeBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/CollectedVolumeBundleUpgrade.java
index db0fe87a0..465f8a596 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/CollectedVolumeBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/CollectedVolumeBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.CollectedVolumeBundle;
  * @version $Id$
  */
 public class CollectedVolumeBundleUpgrade extends AbstractBundleUpgrade {
-    
-    public CollectedVolumeBundleUpgrade() {
-        super("CollectedVolumeBundleUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new CollectedVolumeBundleUpgrade().run(args);
-    }
-
+      
     @Override
     protected String getBundleTableName() {
         return "ct_collected_volume_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseBundleUpgrade.java
index a2116050a..b462649f9 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.ExpertiseBundle;
  * @version $Id$
  */
 public class ExpertiseBundleUpgrade extends AbstractBundleUpgrade {
-    
-    public ExpertiseBundleUpgrade() {
-        super("ExpertiseBundleUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new ExpertiseBundleUpgrade().run(args);
-    }
-
+       
     @Override
     protected String getBundleTableName() {
         return "ct_expertise_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseOrdererAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseOrdererAssocUpgrade.java
index 7df6d06d7..d72c0f44b 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseOrdererAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseOrdererAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class ExpertiseOrdererAssocUpgrade extends AbstractAssocUpgrade {
-
-    public ExpertiseOrdererAssocUpgrade() {
-        super("ExpertiseOrdererAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new ExpertiseOrdererAssocUpgrade().run(args);
-    }
-
+  
     @Override
     protected String getTableName() {
         return "ct_expertise_orderer";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseOrganizationAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseOrganizationAssocUpgrade.java
index 4c6586aa3..4573e90bc 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseOrganizationAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ExpertiseOrganizationAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class ExpertiseOrganizationAssocUpgrade extends AbstractAssocUpgrade {
-    
-    public ExpertiseOrganizationAssocUpgrade() {
-        super("ExpertiseOrganizationAssocUpgrade", "1.0.0", "");
-    }    
-    
-    public static void main(final String[] args) {
-        new ExpertiseOrganizationAssocUpgrade().run(args);
-    }
-
+   
     @Override
     protected String getTableName() {
         return "ct_expertise_organization_map";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InProceedingsBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InProceedingsBundleUpgrade.java
index 19fc44d07..2cf65d98c 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InProceedingsBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InProceedingsBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.InProceedingsBundle;
  * @version $Id$
  */
 public class InProceedingsBundleUpgrade extends AbstractBundleUpgrade {
-
-    public InProceedingsBundleUpgrade() {
-        super("InProceedingsBundleUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new InProceedingsBundleUpgrade().run(args);
-    }
-
+   
     @Override
     protected String getBundleTableName() {
         return "ct_inproceedings_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InternetArticleBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InternetArticleBundleUpgrade.java
index 8e8d69641..c25ecfda7 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InternetArticleBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InternetArticleBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.InternetArticleBundle;
  * @version $Id$
  */
 public class InternetArticleBundleUpgrade extends AbstractBundleUpgrade {
-
-    public InternetArticleBundleUpgrade() {
-        super("InternetArticleBundleUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new InternetArticleBundleUpgrade().run(args);
-    }
-
+  
     @Override
     protected String getBundleTableName() {
         return "ct_internet_article_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InternetArticleOrganizationAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InternetArticleOrganizationAssocUpgrade.java
index c409ebbba..1b7c86aa2 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InternetArticleOrganizationAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/InternetArticleOrganizationAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class InternetArticleOrganizationAssocUpgrade extends AbstractAssocUpgrade {
-    
-    public InternetArticleOrganizationAssocUpgrade() {
-        super("InternetArticleOrganizationAssocUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new InternetArticleOrganizationAssocUpgrade().run(args);
-    }
-
+       
     @Override
     protected String getTableName() {
         return "ct_internet_article_organization_map";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalArticlesAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalArticlesAssocUpgrade.java
index 9377d2793..72c68de08 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalArticlesAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalArticlesAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class JournalArticlesAssocUpgrade extends AbstractAssocUpgrade {
-
-    public JournalArticlesAssocUpgrade() {
-        super("JournalArticlesAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new JournalArticlesAssocUpgrade().run(args);
-    }
-
+  
     @Override
     protected String getTableName() {
         return "ct_journal_article_map";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalBundleUpgrade.java
index cc18776d9..8af0ebd30 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.JournalBundle;
  * @version $Id$
  */
 public class JournalBundleUpgrade extends AbstractBundleUpgrade {
-
-    public JournalBundleUpgrade() {
-        super("JournalBundle", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new JournalBundleUpgrade().run(args);
-    }
-
+    
     @Override
     protected String getBundleTableName() {
         return "ct_journal_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalTypeUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalTypeUpgrade.java
index 01a5c6baa..777597f09 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalTypeUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/JournalTypeUpgrade.java
@@ -1,31 +1,20 @@
 package com.arsdigita.cms.contenttypes.upgrades;
 
 import com.arsdigita.runtime.RuntimeConfig;
-import com.arsdigita.util.cmd.Program;
 import com.arsdigita.util.jdbc.Connections;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import org.apache.commons.cli.CommandLine;
 
 /**
  *
  * @author Jens Pelzetter
  * @version $Id$
  */
-public class JournalTypeUpgrade extends Program {
-
-    public JournalTypeUpgrade() {
-        super("JournalTypeUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new JournalTypeUpgrade().run(args);
-    }
-
-    @Override
-    protected void doRun(final CommandLine cmdLine) {
+public class JournalTypeUpgrade {
+    
+    protected void doUpgrade() {
         System.out.println("Starting upgrade...");
 
         System.out.println("Trying to get JDBC connection...");
@@ -166,4 +155,5 @@ public class JournalTypeUpgrade extends Program {
             printStackTrace(ex.getNextException());
         }
     }
+
 }
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsBundleUpgrade.java
index 4c0f04b8d..1cc5d9446 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.ProceedingsBundle;
  * @version $Id$
  */
 public class ProceedingsBundleUpgrade extends AbstractBundleUpgrade {
-    
-    public ProceedingsBundleUpgrade() {
-        super("ProceedingsBundleUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new ProceedingsBundleUpgrade().run(args);
-    }
-
+       
     @Override
     protected String getBundleTableName() {
         return "ct_proceedings_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsOrganizerAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsOrganizerAssocUpgrade.java
index 5c6b0d291..6fa571dc3 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsOrganizerAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsOrganizerAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class ProceedingsOrganizerAssocUpgrade extends AbstractAssocUpgrade {
-
-    public ProceedingsOrganizerAssocUpgrade() {
-        super("ProceedingsOrganizerAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new ProceedingsOrganizerAssocUpgrade().run(args);
-    }
-
+   
     @Override
     protected String getTableName() {
         return "ct_proceedings_organizer_map";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsPapersAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsPapersAssocUpgrade.java
index 1c528f133..797c99ed7 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsPapersAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/ProceedingsPapersAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class ProceedingsPapersAssocUpgrade extends AbstractAssocUpgrade {
-
-    public ProceedingsPapersAssocUpgrade() {
-        super("ProceedingsPapersAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new ProceedingsPapersAssocUpgrade().run(args);
-    }
-
+ 
     @Override
     protected String getTableName() {
         return "ct_proceedings_papers_map";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationAuthorsAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationAuthorsAssocUpgrade.java
index cc57758e2..a7e3eb9d6 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationAuthorsAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationAuthorsAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class PublicationAuthorsAssocUpgrade extends AbstractAssocUpgrade {
-
-    public PublicationAuthorsAssocUpgrade() {
-        super("PublicationAuthorsAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new PublicationAuthorsAssocUpgrade().run(args);
-    }
-
+  
     @Override
     protected String getTableName() {
         return "ct_publications_authorship";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationBundleUpgrade.java
index ad244c0bd..74cdf3d07 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.PublicationBundle;
  * @version $Id$
  */
 public class PublicationBundleUpgrade extends AbstractBundleUpgrade {
-    
-    public PublicationBundleUpgrade() {
-        super("PublicationBundleUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new PublicationBundleUpgrade().run(args);
-    }
-
+        
     @Override
     protected String getBundleTableName() {
         return "ct_publication_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationOrgaUnitAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationOrgaUnitAssocUpgrade.java
index 1338edfa1..d49407791 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationOrgaUnitAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationOrgaUnitAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class PublicationOrgaUnitAssocUpgrade extends AbstractAssocUpgrade {
-
-    public PublicationOrgaUnitAssocUpgrade() {
-        super("PublicationOrgaUnitAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new PublicationOrgaUnitAssocUpgrade().run(args);
-    }
-
+   
     @Override
     protected String getTableName() {
         return "cms_organizationalunits_publications_map";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationWithPublisherBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationWithPublisherBundleUpgrade.java
index afb6eb3dc..147a1d692 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationWithPublisherBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationWithPublisherBundleUpgrade.java
@@ -9,14 +9,6 @@ import com.arsdigita.cms.contenttypes.PublicationWithPublisherBundle;
  */
 public class PublicationWithPublisherBundleUpgrade extends AbstractBundleUpgrade {
 
-    public PublicationWithPublisherBundleUpgrade() {
-        super("PublicationWithPublisherBundleUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new PublicationWithPublisherBundleUpgrade().run(args);
-    }
-
     @Override
     protected String getBundleTableName() {
         return "ct_publication_with_publisher_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationWithPublisherPublisherAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationWithPublisherPublisherAssocUpgrade.java
index 5fd640a6d..9af8616b9 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationWithPublisherPublisherAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublicationWithPublisherPublisherAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class PublicationWithPublisherPublisherAssocUpgrade extends AbstractAssocUpgrade {
-
-    public PublicationWithPublisherPublisherAssocUpgrade() {
-        super("PublicationWithPublisherPublisherAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new PublicationWithPublisherPublisherAssocUpgrade().run(args);
-    }
-
+   
     @Override
     protected String getTableName() {
         return "ct_publication_with_publisher_publisher_map";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublisherBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublisherBundleUpgrade.java
index 53b774613..d335dccb7 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublisherBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/PublisherBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.PublisherBundle;
  * @version $Id$
  */
 public class PublisherBundleUpgrade extends AbstractBundleUpgrade {
-    
-    public PublisherBundleUpgrade() {
-        super("PublisherBundleUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-         new PublicationBundleUpgrade().run(args);
-    }
-
+       
     @Override
     protected String getBundleTableName() {
         return "ct_publisher_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SciPublicationsUpgrade662to663.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SciPublicationsUpgrade662to663.java
new file mode 100644
index 000000000..dea6e39d7
--- /dev/null
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SciPublicationsUpgrade662to663.java
@@ -0,0 +1,48 @@
+package com.arsdigita.cms.contenttypes.upgrades;
+
+import com.arsdigita.util.cmd.Program;
+import org.apache.commons.cli.CommandLine;
+
+/**
+ *
+ * @author Jens Pelzetter <jens@jp-digital.de>
+ * @version $Id$
+ */
+public class SciPublicationsUpgrade662to663 extends Program {
+
+    public SciPublicationsUpgrade662to663() {
+        super("SciPublicationsUpgrade662to663", "1.0.0", "", true, true);
+    }
+
+    @Override
+    protected void doRun(final CommandLine cmdLine) {
+        new JournalTypeUpgrade().doUpgrade();
+        new PublicationBundleUpgrade().doUpgrade();
+        new PublicationWithPublisherBundleUpgrade().doUpgrade();
+        new ArticleInCollectedVolumeBundleUpgrade().doUpgrade();
+        new ArticleInJournalBundleUpgrade().doUpgrade();
+        new CollectedVolumeBundleUpgrade().doUpgrade();
+        new ExpertiseBundleUpgrade().doUpgrade();
+        new InProceedingsBundleUpgrade().doUpgrade();
+        new InternetArticleBundleUpgrade().doUpgrade();
+        new JournalBundleUpgrade().doUpgrade();
+        new ProceedingsBundleUpgrade().doUpgrade();
+        new PublisherBundleUpgrade().doUpgrade();
+        new SeriesBundleUpgrade().doUpgrade();
+        new UnPublishedBundleUpgrade().doUpgrade();
+        new CollectedVolumeArticlesAssocUpgrade().doUpgrade();
+        new ExpertiseOrdererAssocUpgrade().doUpgrade();
+        new ExpertiseOrganizationAssocUpgrade().doUpgrade();
+        new InternetArticleOrganizationAssocUpgrade().doUpgrade();
+        new JournalArticlesAssocUpgrade().doUpgrade();
+        new ProceedingsOrganizerAssocUpgrade().doUpgrade();
+        new ProceedingsPapersAssocUpgrade().doUpgrade();
+        new PublicationAuthorsAssocUpgrade().doUpgrade();
+        new PublicationOrgaUnitAssocUpgrade().doUpgrade();
+        new PublicationWithPublisherPublisherAssocUpgrade().doUpgrade();
+        new SeriesEditorsAssocUpgrade().doUpgrade();
+        new SeriesPublicationsAssocUpgrade().doUpgrade();
+        new UnPublishedOrganizationAssocUpgrade().doUpgrade();
+    }
+
+}
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesBundleUpgrade.java
index 61ec309e1..9f60f33e0 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesBundleUpgrade.java
@@ -9,14 +9,6 @@ import com.arsdigita.cms.contenttypes.SeriesBundle;
  */
 public class SeriesBundleUpgrade extends AbstractBundleUpgrade {
 
-    public SeriesBundleUpgrade() {
-        super("SeriesBundleUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new SeriesBundleUpgrade().run(args);
-    }
-
     @Override
     protected String getBundleTableName() {
         return "ct_series_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesEditorsAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesEditorsAssocUpgrade.java
index 7c1bf2c1d..4bf09b7e5 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesEditorsAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesEditorsAssocUpgrade.java
@@ -10,14 +10,6 @@ import java.util.Map;
  */
 public class SeriesEditorsAssocUpgrade extends AbstractAssocUpgrade {
 
-    public SeriesEditorsAssocUpgrade() {
-        super("SeriesEditorsAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new SeriesEditorsAssocUpgrade().run(args);
-    }
-
     @Override
     protected String getTableName() {
         return "ct_series_editship";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesPublicationsAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesPublicationsAssocUpgrade.java
index 915d2ba10..2e6ff93e8 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesPublicationsAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SeriesPublicationsAssocUpgrade.java
@@ -10,14 +10,6 @@ import java.util.Map;
  */
 public class SeriesPublicationsAssocUpgrade extends AbstractAssocUpgrade {
 
-    public SeriesPublicationsAssocUpgrade() {
-        super("SeriesPublicationsAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new SeriesPublicationsAssocUpgrade().run(args);
-    }
-
     @Override
     protected String getTableName() {
         return "ct_publications_volume_in_series";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/UnPublishedBundleUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/UnPublishedBundleUpgrade.java
index c065fe95b..9fe1ee370 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/UnPublishedBundleUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/UnPublishedBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.UnPublishedBundle;
  * @version $Id$
  */
 public class UnPublishedBundleUpgrade extends AbstractBundleUpgrade {
-    
-    public UnPublishedBundleUpgrade() {
-        super("UnPublishedBundleUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args ) {
-        new UnPublishedBundleUpgrade().run(args);
-    }
-
+  
     @Override
     protected String getBundleTableName() {
         return "ct_unpublished_bundles";
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/UnPublishedOrganizationAssocUpgrade.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/UnPublishedOrganizationAssocUpgrade.java
index c491fa982..998fe36b3 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/UnPublishedOrganizationAssocUpgrade.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/UnPublishedOrganizationAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class UnPublishedOrganizationAssocUpgrade extends AbstractAssocUpgrade {
-    
-    public UnPublishedOrganizationAssocUpgrade()  {
-        super("UnPublishedOrganizationAssocUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new UnPublishedOrganizationAssocUpgrade().run(args);
-    }
-
+       
     @Override
     protected String getTableName() {
         return "ct_unpublished_organization_map";
diff --git a/ccm-sci-types-department/src/ccm-sci-types-department.upgrade b/ccm-sci-types-department/src/ccm-sci-types-department.upgrade
index 3fa19d36d..05c5aeb2d 100644
--- a/ccm-sci-types-department/src/ccm-sci-types-department.upgrade
+++ b/ccm-sci-types-department/src/ccm-sci-types-department.upgrade
@@ -1,5 +1,5 @@
 <upgrade>
     <version from="6.6.4" to="6.6.5">
-        <script class="com.arsdigita.cms.contenttypes.upgrades.SciDepartmentBundleUpgrade"/>
+        <script class="com.arsdigita.cms.contenttypes.upgrades.SciDepartmentUpgrade664to665"/>
     </version>
 </upgrade>
\ No newline at end of file
diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/upgrades/SciDepartmentBundleUpgrade.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/upgrades/SciDepartmentBundleUpgrade.java
index 54c50fc30..3d9d4a010 100644
--- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/upgrades/SciDepartmentBundleUpgrade.java
+++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/upgrades/SciDepartmentBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.SciDepartmentBundle;
  * @version $Id$
  */
 public class SciDepartmentBundleUpgrade extends AbstractBundleUpgrade {
-
-    public SciDepartmentBundleUpgrade() {
-        super("SciDepartmentBundleUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new SciDepartmentBundleUpgrade().run(args);
-    }
-
+   
     @Override
     protected String getBundleTableName() {
         return "ct_sci_department_bundles";
diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/upgrades/SciDepartmentUpgrade664to665.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/upgrades/SciDepartmentUpgrade664to665.java
new file mode 100644
index 000000000..b8070a920
--- /dev/null
+++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/upgrades/SciDepartmentUpgrade664to665.java
@@ -0,0 +1,26 @@
+package com.arsdigita.cms.contenttypes.upgrades;
+
+import com.arsdigita.util.cmd.Program;
+import org.apache.commons.cli.CommandLine;
+
+/**
+ *
+ * @author Jens Pelzetter <jens@jp-digital.de>
+ * @version $Id$
+ */
+public class SciDepartmentUpgrade664to665 extends Program {
+
+    public SciDepartmentUpgrade664to665() {
+        super("SciDepartmentUpgrade664to665", "1.0.0", "", true, true);
+    }
+
+    @Override
+    protected void doRun(CommandLine cmdLine) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public static void main(final String[] args) {
+        new SciDepartmentUpgrade664to665().run(args);
+    }
+
+}
diff --git a/ccm-sci-types-institute/src/ccm-sci-types-institute.upgrade b/ccm-sci-types-institute/src/ccm-sci-types-institute.upgrade
index 61222b98c..039835921 100644
--- a/ccm-sci-types-institute/src/ccm-sci-types-institute.upgrade
+++ b/ccm-sci-types-institute/src/ccm-sci-types-institute.upgrade
@@ -1,5 +1,5 @@
 <upgrade>
     <version from="6.6.4" to="6.6.5">
-        <script class="com.arsdigita.cms.contenttypes.upgrades.SciInstituteBundleUpgrade"/>
+        <script class="com.arsdigita.cms.contenttypes.upgrades.SciInstituteUpgrade664to665"/>
     </version>
 </upgrade>
\ No newline at end of file
diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/upgrades/SciInstituteBundleUpgrade.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/upgrades/SciInstituteBundleUpgrade.java
index 3df639706..b7ed88776 100644
--- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/upgrades/SciInstituteBundleUpgrade.java
+++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/upgrades/SciInstituteBundleUpgrade.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.SciInstituteBundle;
  * @version $Id$
  */
 public class SciInstituteBundleUpgrade extends AbstractBundleUpgrade {
-
-    public SciInstituteBundleUpgrade() {
-        super("SciInstituteBundleUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new SciInstituteBundleUpgrade().run(args);
-    }
-
+  
     @Override
     protected String getBundleTableName() {
         return "ct_sci_institute_bundles";
diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/upgrades/SciInstituteUpgrade664to665.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/upgrades/SciInstituteUpgrade664to665.java
new file mode 100644
index 000000000..ae7b8844b
--- /dev/null
+++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/upgrades/SciInstituteUpgrade664to665.java
@@ -0,0 +1,28 @@
+package com.arsdigita.cms.contenttypes.upgrades;
+
+import com.arsdigita.util.cmd.Program;
+import org.apache.commons.cli.CommandLine;
+
+/**
+ *
+ * @author Jens Pelzetter <jens@jp-digital.de>
+ * @version $Id$
+ */
+public class SciInstituteUpgrade664to665 extends Program {
+    
+    public SciInstituteUpgrade664to665() {
+        super("SciInstituteUpgrade664to665", "1.0.0", "", true, true);
+    }
+
+    @Override
+    protected void doRun(CommandLine cmdLine) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+    
+    public static void main(final String[] args) {
+        new SciInstituteUpgrade664to665().run(args);
+    }
+    
+    
+    
+}
diff --git a/ccm-sci-types-project/src/ccm-sci-types-project.upgrade b/ccm-sci-types-project/src/ccm-sci-types-project.upgrade
index 7300a4e8c..53d991bcf 100644
--- a/ccm-sci-types-project/src/ccm-sci-types-project.upgrade
+++ b/ccm-sci-types-project/src/ccm-sci-types-project.upgrade
@@ -1,5 +1,5 @@
 <upgrade>
 <version from="6.6.5" to="6.6.6">
-        <script class="com.arsdigita.cms.contenttypes.upgrades.SciProjectBundleUpgrade"/>
+        <script class="com.arsdigita.cms.contenttypes.upgrades.SciProjectUpgrade665to666"/>
     </version>
 </upgrade>
\ No newline at end of file
diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/upgrades/SciProjectBundleUpgrade.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/upgrades/SciProjectBundleUpgrade.java
index c23b7bead..1068d32ab 100644
--- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/upgrades/SciProjectBundleUpgrade.java
+++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/upgrades/SciProjectBundleUpgrade.java
@@ -9,14 +9,6 @@ import com.arsdigita.cms.contenttypes.SciProjectBundle;
  */
 public class SciProjectBundleUpgrade extends AbstractBundleUpgrade {
     
-    public SciProjectBundleUpgrade() {
-        super("SciProjectBundleUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new SciProjectBundleUpgrade().run(args);
-    }
-
     @Override
     protected String getBundleTableName() {
         return "ct_sci_project_bundles";
diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/upgrades/SciProjectUpgrade665to666.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/upgrades/SciProjectUpgrade665to666.java
new file mode 100644
index 000000000..5e92885ed
--- /dev/null
+++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/upgrades/SciProjectUpgrade665to666.java
@@ -0,0 +1,25 @@
+package com.arsdigita.cms.contenttypes.upgrades;
+
+import com.arsdigita.util.cmd.Program;
+import org.apache.commons.cli.CommandLine;
+
+/**
+ *
+ * @author Jens Pelzetter <jens@jp-digital.de>
+ */
+public class SciProjectUpgrade665to666 extends Program {
+
+    public SciProjectUpgrade665to666() {
+        super("SciProjectUpgrade665to666", "1.0.0", "", true, true);
+    }
+    
+    @Override
+    protected void doRun(final CommandLine cmdLine) {
+        new SciProjectBundleUpgrade().doUpgrade();
+    }
+    
+    public static void main(final String[] args) {
+        new SciProjectUpgrade665to666().run(args);
+    }
+    
+}