diff --git a/ccm-cms/src/ccm-cms.upgrade b/ccm-cms/src/ccm-cms.upgrade
index 756455caa..9cc799531 100755
--- a/ccm-cms/src/ccm-cms.upgrade
+++ b/ccm-cms/src/ccm-cms.upgrade
@@ -52,14 +52,7 @@
     <script sql="ccm-cms/upgrade/::database::-6.6.3-6.6.4.sql"/>
   </version>
   <version from="6.6.4" to="6.6.5">
-    <script class="com.arsdigita.cms.contenttypes.upgrades.CreateContactBundles"/>
-    <script class="com.arsdigita.cms.contenttypes.upgrades.CreateOrgaUnitBundles"/>
-    <script class="com.arsdigita.cms.contenttypes.upgrades.CreatePersonBundles"/>
-    <script class="com.arsdigita.cms.contenttypes.upgrades.GenericContactGenericPersonAssocUpgrade"/>
-    <script class="com.arsdigita.cms.contenttypes.upgrades.GenericOrgaUnitGenericContactAssocUpgrade"/>
-    <script class="com.arsdigita.cms.contenttypes.upgrades.GenericOrgaUnitGenericOrgaUnitAssocUpgrade"/>
-    <script class="com.arsdigita.cms.contenttypes.upgrades.GenericOrgaUnitGenericPersonAssocUpgrade"/>
-    <script sql="ccm-cms/upgrade::database::-6.6.4-6.6.5.sql"/>
+    <script class="com.arsdigita.cms.contenttypes.upgrades.Upgrade664to665"/>      
   </version>
  <version from="6.6.5" to="6.6.6">
     <!--  ContentSection now loaded as legacy free application             -->
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractAssocUpgrade.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractAssocUpgrade.java
index 8b2efeccb..eabbac8e0 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractAssocUpgrade.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractAssocUpgrade.java
@@ -1,7 +1,6 @@
 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.math.BigDecimal;
 import java.sql.Connection;
@@ -13,17 +12,16 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.cli.CommandLine;
 
 /**
  *
  * @author Jens Pelzetter 
  * @version $Id$
  */
-public abstract class AbstractAssocUpgrade extends Program {
+public abstract class AbstractAssocUpgrade {
 
-    public AbstractAssocUpgrade(final String name, final String version, final String usage) {
-        super(name, version, usage);
+    public AbstractAssocUpgrade() {
+        //Nothing
     }
 
     protected abstract String getTableName();
@@ -43,9 +41,8 @@ public abstract class AbstractAssocUpgrade extends Program {
     protected abstract String getOwnerTableName();
 
     protected abstract String getMemberTableName();
-
-    @Override
-    protected void doRun(final CommandLine cmdLine) {
+    
+    protected void doUpgrade() {
         System.out.println("Starting upgrade...");
         final List<AssocEntry> oldData = new ArrayList<AssocEntry>();
 
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractBundleUpgrade.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractBundleUpgrade.java
index 2a02abeed..5f26ae9c7 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractBundleUpgrade.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractBundleUpgrade.java
@@ -1,25 +1,19 @@
 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 abstract class AbstractBundleUpgrade extends Program {
-
-    public AbstractBundleUpgrade(final String name, final String version, final String usage) {
-        super(name, version, usage);
-    }
-
+public abstract class AbstractBundleUpgrade {
+    
     protected abstract String getBundleTableName();
 
     protected abstract String getContentItemTableName();
@@ -35,9 +29,8 @@ public abstract class AbstractBundleUpgrade extends Program {
     protected String getSuperBundleTable() {
         return "cms_bundles";
     }
-    
-    @Override
-    public void doRun(final CommandLine cmdLine) {
+     
+    public void doUpgrade() {
         System.out.println("Starting upgrade...");
 
         System.out.println("Trying to get JDBC connection...");
@@ -137,6 +130,7 @@ public abstract class AbstractBundleUpgrade extends Program {
 
     private void rollback(final Connection conn) {
         try {
+            System.err.println("WARNING: Rollback.");
             conn.rollback();
         } catch (SQLException ex1) {
             System.err.println("Rollback failed.");
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateContactBundles.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateContactBundles.java
index 338755c56..87061ceb9 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateContactBundles.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateContactBundles.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.GenericContactBundle;
  * @version $Id$
  */
 public class CreateContactBundles extends AbstractBundleUpgrade {
-
-    public CreateContactBundles() {
-        super("CreateContactBundles", "1.0.0", "");
-    }
-
-    public static void main(final String args[]) {
-        new CreateContactBundles().run(args);
-    }
-
+    
     @Override
     protected String getBundleTableName() {
         return "cms_contact_bundles";
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateOrgaUnitBundles.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateOrgaUnitBundles.java
index 799e01d48..aeca81848 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateOrgaUnitBundles.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateOrgaUnitBundles.java
@@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitBundle;
  * @version $Id$
  */
 public class CreateOrgaUnitBundles extends AbstractBundleUpgrade {
-
-    public CreateOrgaUnitBundles() {
-        super("CreateOrgaUnitBundles", "1.0.0", "");
-    }
-
-    public static void main(final String args[]) {
-        new CreateOrgaUnitBundles().run(args);
-    }
-
+  
     @Override
     protected String getBundleTableName() {
         return "cms_orgaunit_bundles";
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreatePersonBundles.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreatePersonBundles.java
index 3878324b1..695a57533 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreatePersonBundles.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreatePersonBundles.java
@@ -9,15 +9,7 @@ import com.arsdigita.cms.contenttypes.GenericPersonBundle;
  * @version $Id$
  */
 public class CreatePersonBundles extends AbstractBundleUpgrade {
-
-    public CreatePersonBundles() {
-        super("CreatePersonBundles", "1.0.0", "");
-    }
     
-    public static void main(final String args[]) {
-        new CreatePersonBundles().run(args);
-    }
-
     @Override
     protected String getBundleTableName() {
         return "cms_person_bundles";
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericContactGenericPersonAssocUpgrade.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericContactGenericPersonAssocUpgrade.java
index e1902c421..9f485a96b 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericContactGenericPersonAssocUpgrade.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericContactGenericPersonAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class GenericContactGenericPersonAssocUpgrade extends AbstractAssocUpgrade {
-
-    public GenericContactGenericPersonAssocUpgrade() {
-        super("GenericContactGenericPersonAssocUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new GenericContactGenericPersonAssocUpgrade().run(args);
-    }
-    
+   
     @Override
     protected String getTableName() {
         return "cms_person_contact_map";
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericContactAssocUpgrade.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericContactAssocUpgrade.java
index f6e655eae..bbfa871bd 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericContactAssocUpgrade.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericContactAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class GenericOrgaUnitGenericContactAssocUpgrade extends AbstractAssocUpgrade {
-    
-    public GenericOrgaUnitGenericContactAssocUpgrade() {
-        super("GenericOrgaUnitGenericContactAssocUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String args[]) {
-        new GenericOrgaUnitGenericContactAssocUpgrade().run(args);
-    }
-
+       
     @Override
     protected String getTableName() {
         return "cms_organizationalunits_contact_map";
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericOrgaUnitAssocUpgrade.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericOrgaUnitAssocUpgrade.java
index da658416d..ee425ccea 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericOrgaUnitAssocUpgrade.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericOrgaUnitAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class GenericOrgaUnitGenericOrgaUnitAssocUpgrade extends AbstractAssocUpgrade {
-
-    public GenericOrgaUnitGenericOrgaUnitAssocUpgrade() {
-        super("GenericOrgaUnitGenericOrgaUnitAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String args[]) {
-        new GenericOrgaUnitGenericOrgaUnitAssocUpgrade().run(args);
-    }
-
+  
     @Override
     protected String getTableName() {
         return "cms_organizationalunits_hierarchy_map";
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericPersonAssocUpgrade.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericPersonAssocUpgrade.java
index 984145d62..0f9e108b7 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericPersonAssocUpgrade.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericPersonAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class GenericOrgaUnitGenericPersonAssocUpgrade extends AbstractAssocUpgrade {
-
-    public GenericOrgaUnitGenericPersonAssocUpgrade() {
-        super("GenericOrgaUnitGenericPersonAssocUpgrade", "1.0.0", "");
-    }
-
-    public static void main(final String args[]) {
-        new GenericContactGenericPersonAssocUpgrade().run(args);
-    }
-
+   
     @Override
     protected String getTableName() {
         return "cms_organizationalunits_person_map";