diff --git a/commerce_uuid.info b/commerce_uuid.info
index fad1590..4d85832 100644
--- a/commerce_uuid.info
+++ b/commerce_uuid.info
@@ -1,7 +1,7 @@
 name = Commerce UUID
-description = Adds universally unique identifiers support to commerce.
+description = Adds universally unique identifiers support to Drupal Commerce.
 core = 7.x
 package = UUID
 
 dependencies[] = commerce
-dependencies[] = uuid (> 1.0-alpha3)
+dependencies[] = uuid (>1.0-alpha3)
diff --git a/commerce_uuid.install b/commerce_uuid.install
new file mode 100644
index 0000000..b09a880
--- /dev/null
+++ b/commerce_uuid.install
@@ -0,0 +1,193 @@
+<?php
+
+/**
+ * Include some helper functions for the Entity API.
+ */
+module_load_include('inc', 'uuid', 'uuid.entity');
+
+/**
+ * Implements hook_schema_alter().
+ */
+function commerce_uuid_schema_alter(&$schema = array()) {
+  $field = uuid_schema_field_definition();
+
+  // Alter the schema definition for the commerce_customer_profile entity type.
+  if (isset($schema['commerce_customer_profile'])) {
+    $schema['commerce_customer_profile']['fields']['uuid'] = $field;
+    $schema['commerce_customer_profile_revision']['fields']['vuuid'] = $field;
+  }
+
+  // Alter the schema definition for the commerce_line_item entity type.
+  if (isset($schema['commerce_line_item'])) {
+    $schema['commerce_line_item']['fields']['uuid'] = $field;
+  }
+
+  // Alter the schema definition for the commerce_order entity type.
+  if (isset($schema['commerce_order'])) {
+    $schema['commerce_order']['fields']['uuid'] = $field;
+    $schema['commerce_order_revision']['fields']['vuuid'] = $field;
+  }
+
+  // Alter the schema definition for the commerce_payment_transaction entity type.
+  if (isset($schema['commerce_payment_transaction'])) {
+    $schema['commerce_payment_transaction']['fields']['uuid'] = $field;
+    $schema['commerce_payment_transaction_revision']['fields']['vuuid'] = $field;
+  }
+
+  // Alter the schema definition for the commerce_product entity type.
+  if (isset($schema['commerce_product'])) {
+    $schema['commerce_product']['fields']['uuid'] = $field;
+    $schema['commerce_product_revision']['fields']['vuuid'] = $field;
+  }
+}
+
+/**
+ * Implements hook_install().
+ */
+function commerce_uuid_install() {
+  $field = uuid_schema_field_definition();
+
+  // Add the uuid column for the commerce_customer_profile entity type.
+  if (db_table_exists('commerce_customer_profile')) {
+    if (!db_field_exists('commerce_customer_profile', 'uuid')) {
+      db_add_field('commerce_customer_profile', 'uuid', $field);
+      db_add_index('commerce_customer_profile', 'uuid', array('uuid'));
+    }
+
+    if (!db_field_exists('commerce_customer_profile_revision', 'vuuid')) {
+      db_add_field('commerce_customer_profile_revision', 'vuuid', $field);
+      db_add_index('commerce_customer_profile_revision', 'vuuid', array('vuuid'));
+    }
+  }
+
+  // Add the uuid column for the commerce_line_item entity type.
+  if (db_table_exists('commerce_line_item')) {
+    if (!db_field_exists('commerce_line_item', 'uuid')) {
+      db_add_field('commerce_line_item', 'uuid', $field);
+      db_add_index('commerce_line_item', 'uuid', array('uuid'));
+    }
+  }
+
+  // Add the uuid column for the commerce_order entity type.
+  if (db_table_exists('commerce_order')) {
+    if (!db_field_exists('commerce_order', 'uuid')) {
+      db_add_field('commerce_order', 'uuid', $field);
+      db_add_index('commerce_order', 'uuid', array('uuid'));
+    }
+
+    if (!db_field_exists('commerce_order_revision', 'vuuid')) {
+      db_add_field('commerce_order_revision', 'vuuid', $field);
+      db_add_index('commerce_order_revision', 'vuuid', array('vuuid'));
+    }
+  }
+
+  // Add the uuid column for the commerce_payment_transaction entity type.
+  if (db_table_exists('commerce_payment_transaction')) {
+    if (!db_field_exists('commerce_payment_transaction', 'uuid')) {
+      db_add_field('commerce_payment_transaction', 'uuid', $field);
+      db_add_index('commerce_payment_transaction', 'uuid', array('uuid'));
+    }
+
+    if (!db_field_exists('commerce_payment_transaction_revision', 'vuuid')) {
+      db_add_field('commerce_payment_transaction_revision', 'vuuid', $field);
+      db_add_index('commerce_payment_transaction_revision', 'vuuid', array('vuuid'));
+    }
+  }
+
+  // Add the uuid column for the commerce_product entity type.
+  if (db_table_exists('commerce_product')) {
+    if (!db_field_exists('commerce_product', 'uuid')) {
+      db_add_field('commerce_product', 'uuid', $field);
+      db_add_index('commerce_product', 'uuid', array('uuid'));
+    }
+
+    if (!db_field_exists('commerce_product_revision', 'vuuid')) {
+      db_add_field('commerce_product_revision', 'vuuid', $field);
+      db_add_index('commerce_product_revision', 'vuuid', array('vuuid'));
+    }
+  }
+
+  uuid_sync_all();
+}
+
+/**
+ * Implements hook_uninstall().
+ */
+function commerce_uuid_uninstall() {
+  // Remove the uuid column for the commerce_customer_profile entity type.
+  if (db_table_exists('commerce_customer_profile')) {
+    if (db_field_exists('commerce_customer_profile', 'uuid')) {
+      db_drop_field('commerce_customer_profile', 'uuid');
+      db_drop_index('commerce_customer_profile', 'uuid');
+    }
+
+    if (db_field_exists('commerce_customer_profile_revision', 'vuuid')) {
+      db_drop_field('commerce_customer_profile_revision', 'vuuid');
+      db_drop_index('commerce_customer_profile_revision', 'vuuid');
+    }
+  }
+
+  // Remove the uuid column for the commerce_line_item entity type.
+  if (db_table_exists('commerce_line_item')) {
+    if (db_field_exists('commerce_line_item', 'uuid')) {
+      db_drop_field('commerce_line_item', 'uuid');
+      db_drop_index('commerce_line_item', 'uuid');
+    }
+  }
+
+  // Remove the uuid column for the commerce_order entity type.
+  if (db_table_exists('commerce_order')) {
+    if (db_field_exists('commerce_order', 'uuid')) {
+      db_drop_field('commerce_order', 'uuid');
+      db_drop_index('commerce_order', 'uuid');
+    }
+
+    if (db_field_exists('commerce_order_revision', 'vuuid')) {
+      db_drop_field('commerce_order_revision', 'vuuid');
+      db_drop_index('commerce_order_revision', 'vuuid');
+    }
+  }
+
+  // Remove the uuid column for the commerce_payment_transaction entity type.
+  if (db_table_exists('commerce_payment_transaction')) {
+    if (db_field_exists('commerce_payment_transaction', 'uuid')) {
+      db_drop_field('commerce_payment_transaction', 'uuid');
+      db_drop_index('commerce_payment_transaction', 'uuid');
+    }
+
+    if (db_field_exists('commerce_payment_transaction_revision', 'vuuid')) {
+      db_drop_field('commerce_payment_transaction_revision', 'vuuid');
+      db_drop_index('commerce_payment_transaction_revision', 'vuuid');
+    }
+  }
+
+  // Remove the uuid column for the commerce_product entity type.
+  if (db_table_exists('commerce_product')) {
+    if (db_field_exists('commerce_product', 'uuid')) {
+      db_drop_field('commerce_product', 'uuid');
+      db_drop_index('commerce_product', 'uuid');
+    }
+
+    if (db_field_exists('commerce_product_revision', 'vuuid')) {
+      db_drop_field('commerce_product_revision', 'vuuid');
+      db_drop_index('commerce_product_revision', 'vuuid');
+    }
+  }
+}
+
+/**
+ * Remove the commerce_uuid_* sub-modules from the system table.
+ */
+function commerce_uuid_update_7000() {
+  $commerce_uuid_modules = array(
+    'commerce_uuid_customer',
+    'commerce_uuid_line_item',
+    'commerce_uuid_order',
+    'commerce_uuid_payment',
+    'commerce_uuid_product',
+  );
+  db_delete('system')
+    ->condition('type', 'module')
+    ->condition('name', $commerce_uuid_modules, 'IN')
+    ->execute();
+}
diff --git a/commerce_uuid.module b/commerce_uuid.module
index d14c9bb..ce45bc6 100644
--- a/commerce_uuid.module
+++ b/commerce_uuid.module
@@ -2,7 +2,89 @@
 
 /**
  * @file
- *   commerce_uuid.module
- *
- *   This module doesn't do anything itself as its all in the sub modules.
- */
\ No newline at end of file
+ * Adds universally unique identifiers support to Drupal Commerce.
+ */
+
+/**
+ * Implements hook_entity_info_alter().
+ */
+function commerce_uuid_entity_info_alter(&$entity_info) {
+  if (isset($entity_info['commerce_customer_profile'])) {
+    $entity_info['commerce_customer_profile']['uuid'] = TRUE;
+    $entity_info['commerce_customer_profile']['entity keys']['uuid'] = 'uuid';
+    $entity_info['commerce_customer_profile']['entity keys']['revision uuid'] = 'vuuid';
+  }
+
+  if (isset($entity_info['commerce_line_item'])) {
+    $entity_info['commerce_line_item']['uuid'] = TRUE;
+    $entity_info['commerce_line_item']['entity keys']['uuid'] = 'uuid';
+  }
+
+  if (isset($entity_info['commerce_order'])) {
+    $entity_info['commerce_order']['uuid'] = TRUE;
+    $entity_info['commerce_order']['entity keys']['uuid'] = 'uuid';
+    $entity_info['commerce_order']['entity keys']['revision uuid'] = 'vuuid';
+  }
+
+  if (isset($entity_info['commerce_payment_transaction'])) {
+    $entity_info['commerce_payment_transaction']['uuid'] = TRUE;
+    $entity_info['commerce_payment_transaction']['entity keys']['uuid'] = 'uuid';
+    $entity_info['commerce_payment_transaction']['entity keys']['revision uuid'] = 'vuuid';
+  }
+
+  if (isset($entity_info['commerce_product'])) {
+    $entity_info['commerce_product']['uuid'] = TRUE;
+    $entity_info['commerce_product']['entity keys']['uuid'] = 'uuid';
+    $entity_info['commerce_product']['entity keys']['revision uuid'] = 'vuuid';
+  }
+}
+
+/**
+ * Implements hook_entity_uuid_load().
+ */
+function commerce_uuid_entity_uuid_load(&$entities, $entity_type) {
+  if ($entity_type == 'commerce_customer_profile') {
+    entity_property_id_to_uuid($entities, 'commerce_customer_profile', array('profile_id'));
+  }
+
+  if ($entity_type == 'commerce_line_item') {
+    entity_property_id_to_uuid($entities, 'commerce_line_item', array('line_item_id'));
+  }
+
+  if ($entity_type == 'commerce_order') {
+    entity_property_id_to_uuid($entities, 'commerce_order', array('order_id'));
+  }
+
+  if ($entity_type == 'commerce_payment_transaction') {
+    entity_property_id_to_uuid($entities, 'commerce_payment_transaction', array('transaction_id'));
+  }
+
+  if ($entity_type == 'commerce_product') {
+    entity_property_id_to_uuid($entities, 'commerce_product', array('product_id'));
+  }
+}
+
+/**
+ * Implements hook_entity_uuid_presave().
+ */
+function commerce_uuid_entity_uuid_presave(&$entity, $entity_type) {
+  if ($entity_type == 'commerce_customer_profile') {
+    entity_property_uuid_to_id($entity, 'commerce_customer_profile', array('profile_id'));
+  }
+
+  if ($entity_type == 'commerce_line_item') {
+    entity_property_uuid_to_id($entity, 'commerce_line_item', array('line_item_id'));
+  }
+
+  if ($entity_type == 'commerce_order') {
+    entity_property_uuid_to_id($entity, 'commerce_order', array('order_id'));
+  }
+
+  if ($entity_type == 'commerce_payment_transaction') {
+    entity_property_uuid_to_id($entity, 'commerce_payment_transaction', array('transaction_id'));
+  }
+
+  if ($entity_type == 'commerce_product') {
+    entity_property_uuid_to_id($entity, 'commerce_product', array('product_id'));
+  }
+}
diff --git a/customer/commerce_uuid_customer.info b/customer/commerce_uuid_customer.info
deleted file mode 100644
index 772e619..0000000
--- a/customer/commerce_uuid_customer.info
+++ /dev/null
@@ -1,7 +0,0 @@
-name = Commerce UUID Customer
-description = Adds universally unique identifiers support to commerce customer profiles.
-core = 7.x
-package = UUID
-
-dependencies[] = commerce_uuid
-dependencies[] = commerce_customer
\ No newline at end of file
diff --git a/customer/commerce_uuid_customer.install b/customer/commerce_uuid_customer.install
deleted file mode 100644
index 3fb11d5..0000000
--- a/customer/commerce_uuid_customer.install
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Include some helper functions for the Entity API.
- */
-module_load_include('inc', 'uuid', 'uuid.entity');
-
-/**
- * Implements of hook_schema_alter().
-*/
-function commerce_uuid_customer_schema_alter(&$schema = array()) {
-  $field = uuid_schema_field_definition();
-  $schema['commerce_customer_profile']['fields']['uuid'] = $field;
-  $schema['commerce_customer_profile_revision']['fields']['vuuid'] = $field;
-}
-
-/**
- * Implements hook_install().
- */
-function commerce_uuid_customer_install() {
-  $field = uuid_schema_field_definition();
-
-  if (!db_field_exists('commerce_customer_profile', 'uuid')) {
-    db_add_field('commerce_customer_profile', 'uuid', $field);
-    db_add_index('commerce_customer_profile', 'uuid', array('uuid'));
-  }
-
-  if (!db_field_exists('commerce_customer_profile_revision', 'vuuid')) {
-    db_add_field('commerce_customer_profile_revision', 'vuuid', $field);
-    db_add_index('commerce_customer_profile_revision', 'vuuid', array('vuuid'));
-  }
-
-  uuid_sync_all();
-}
-
-/**
- * Implements hook_uninstall().
- */
-function commerce_uuid_customer_uninstall() {
-  if (db_field_exists('commerce_customer_profile', 'uuid')) {
-    db_drop_field('commerce_customer_profile', 'uuid');
-    db_drop_index('commerce_customer_profile', 'uuid');
-  }
-
-  if (db_field_exists('commerce_customer_profile_revision', 'vuuid')) {
-    db_drop_field('commerce_customer_profile_revision', 'vuuid');
-    db_drop_index('commerce_customer_profile_revision', 'vuuid');
-  }
-}
diff --git a/customer/commerce_uuid_customer.module b/customer/commerce_uuid_customer.module
deleted file mode 100644
index 2e48307..0000000
--- a/customer/commerce_uuid_customer.module
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal hooks for the commerce_uuid module.
- */
-
-/**
- * Implements hook_entity_info_alter().
- */
-function commerce_uuid_customer_entity_info_alter(&$entity_info) {
-  $entity_info['commerce_customer_profile']['uuid'] = TRUE;
-  $entity_info['commerce_customer_profile']['entity keys']['uuid'] = 'uuid';
-  $entity_info['commerce_customer_profile']['entity keys']['revision uuid'] = 'vuuid';
-}
-
-/**
- * Implements hook_entity_uuid_load().
- */
-function commerce_uuid_customer_entity_uuid_load(&$entities, $entity_type) {
-  if ($entity_type == 'commerce_customer_profile') {
-    entity_property_id_to_uuid($entities, 'commerce_customer_profile', array('profile_id'));
-  }
-}
-
-/**
- * Implements hook_entity_uuid_presave().
- */
-function commerce_uuid_customer_entity_uuid_presave(&$entity, $entity_type) {
-  if ($entity_type == 'commerce_customer_profile') {
-    entity_property_uuid_to_id($entity, 'commerce_customer_profile', array('profile_id'));
-  }
-}
diff --git a/line_item/commerce_uuid_line_item.info b/line_item/commerce_uuid_line_item.info
deleted file mode 100644
index 3b5a89c..0000000
--- a/line_item/commerce_uuid_line_item.info
+++ /dev/null
@@ -1,7 +0,0 @@
-name = Commerce UUID Line Item
-description = Adds universally unique identifiers support to commerce line items.
-core = 7.x
-package = UUID
-
-dependencies[] = commerce_uuid
-dependencies[] = commerce_line_item
\ No newline at end of file
diff --git a/line_item/commerce_uuid_line_item.install b/line_item/commerce_uuid_line_item.install
deleted file mode 100644
index 6c479f9..0000000
--- a/line_item/commerce_uuid_line_item.install
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Include some helper functions for the Entity API.
- */
-module_load_include('inc', 'uuid', 'uuid.entity');
-
-/**
- * Implements of hook_schema_alter().
-*/
-function commerce_uuid_line_item_schema_alter(&$schema = array()) {
-  $field = uuid_schema_field_definition();
-  $schema['commerce_line_item']['fields']['uuid'] = $field;
-}
-
-/**
- * Implements hook_install().
- */
-function commerce_uuid_line_item_install() {
-  $field = uuid_schema_field_definition();
-
-  if (!db_field_exists('commerce_line_item', 'uuid')) {
-    db_add_field('commerce_line_item', 'uuid', $field);
-    db_add_index('commerce_line_item', 'uuid', array('uuid'));
-  }
-
-  uuid_sync_all();
-}
-
-/**
- * Implements hook_uninstall().
- */
-function commerce_uuid_line_item_uninstall() {
-  if (db_field_exists('commerce_line_item', 'uuid')) {
-    db_drop_field('commerce_line_item', 'uuid');
-    db_drop_index('commerce_line_item', 'uuid');
-  }
-
-}
diff --git a/line_item/commerce_uuid_line_item.module b/line_item/commerce_uuid_line_item.module
deleted file mode 100644
index 2fe9689..0000000
--- a/line_item/commerce_uuid_line_item.module
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal hooks for the commerce_uuid module.
- */
-
-/**
- * Implements hook_entity_info_alter().
- */
-function commerce_uuid_line_item_entity_info_alter(&$entity_info) {
-  $entity_info['commerce_line_item']['uuid'] = TRUE;
-  $entity_info['commerce_line_item']['entity keys']['uuid'] = 'uuid';
-}
-
-/**
- * Implements hook_entity_uuid_load().
- */
-function commerce_uuid_line_item_entity_uuid_load(&$entities, $entity_type) {
-  if ($entity_type == 'commerce_line_item') {
-    entity_property_id_to_uuid($entities, 'commerce_line_item', array('line_item_id'));
-  }
-}
-
-/**
- * Implements hook_entity_uuid_presave().
- */
-function commerce_uuid_line_item_entity_uuid_presave(&$entity, $entity_type) {
-  if ($entity_type == 'commerce_line_item') {
-    entity_property_uuid_to_id($entity, 'commerce_line_item', array('line_item_id'));
-  }
-}
diff --git a/order/commerce_uuid_order.info b/order/commerce_uuid_order.info
deleted file mode 100644
index 572cef2..0000000
--- a/order/commerce_uuid_order.info
+++ /dev/null
@@ -1,7 +0,0 @@
-name = Commerce UUID Order
-description = Adds universally unique identifiers support to commerce orders.
-core = 7.x
-package = UUID
-
-dependencies[] = commerce_uuid
-dependencies[] = commerce_order
\ No newline at end of file
diff --git a/order/commerce_uuid_order.install b/order/commerce_uuid_order.install
deleted file mode 100644
index 7691f23..0000000
--- a/order/commerce_uuid_order.install
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Include some helper functions for the Entity API.
- */
-module_load_include('inc', 'uuid', 'uuid.entity');
-
-/**
- * Implements of hook_schema_alter().
-*/
-function commerce_uuid_order_schema_alter(&$schema = array()) {
-  $field = uuid_schema_field_definition();
-  $schema['commerce_order']['fields']['uuid'] = $field;
-  $schema['commerce_order_revision']['fields']['vuuid'] = $field;
-}
-
-/**
- * Implements hook_install().
- */
-function commerce_uuid_order_install() {
-  $field = uuid_schema_field_definition();
-
-  if (!db_field_exists('commerce_order', 'uuid')) {
-    db_add_field('commerce_order', 'uuid', $field);
-    db_add_index('commerce_order', 'uuid', array('uuid'));
-  }
-
-  if (!db_field_exists('commerce_order_revision', 'vuuid')) {
-    db_add_field('commerce_order_revision', 'vuuid', $field);
-    db_add_index('commerce_order_revision', 'vuuid', array('vuuid'));
-  }
-
-  uuid_sync_all();
-}
-
-/**
- * Implements hook_uninstall().
- */
-function commerce_uuid_order_uninstall() {
-  if (db_field_exists('commerce_order', 'uuid')) {
-    db_drop_field('commerce_order', 'uuid');
-    db_drop_index('commerce_order', 'uuid');
-  }
-
-  if (db_field_exists('commerce_order_revision', 'vuuid')) {
-    db_drop_field('commerce_order_revision', 'vuuid');
-    db_drop_index('commerce_order_revision', 'vuuid');
-  }
-}
diff --git a/order/commerce_uuid_order.module b/order/commerce_uuid_order.module
deleted file mode 100644
index 0eb0b11..0000000
--- a/order/commerce_uuid_order.module
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal hooks for the commerce_uuid module.
- */
-
-/**
- * Implements hook_entity_info_alter().
- */
-function commerce_uuid_order_entity_info_alter(&$entity_info) {
-  $entity_info['commerce_order']['uuid'] = TRUE;
-  $entity_info['commerce_order']['entity keys']['uuid'] = 'uuid';
-  $entity_info['commerce_order']['entity keys']['revision uuid'] = 'vuuid';
-}
-
-/**
- * Implements hook_entity_uuid_load().
- */
-function commerce_uuid_order_entity_uuid_load(&$entities, $entity_type) {
-  if ($entity_type == 'commerce_order') {
-    entity_property_id_to_uuid($entities, 'commerce_order', array('order_id'));
-  }
-}
-
-/**
- * Implements hook_entity_uuid_presave().
- */
-function commerce_uuid_order_entity_uuid_presave(&$entity, $entity_type) {
-  if ($entity_type == 'commerce_order') {
-    entity_property_uuid_to_id($entity, 'commerce_order', array('order_id'));
-  }
-}
diff --git a/payment/commerce_uuid_payment.info b/payment/commerce_uuid_payment.info
deleted file mode 100644
index 3ca4a18..0000000
--- a/payment/commerce_uuid_payment.info
+++ /dev/null
@@ -1,7 +0,0 @@
-name = Commerce UUID Payment
-description = Adds universally unique identifiers support to commerce payment transactions.
-core = 7.x
-package = UUID
-
-dependencies[] = commerce_uuid
-dependencies[] = commerce_payment
\ No newline at end of file
diff --git a/payment/commerce_uuid_payment.install b/payment/commerce_uuid_payment.install
deleted file mode 100644
index 972896a..0000000
--- a/payment/commerce_uuid_payment.install
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Include some helper functions for the Entity API.
- */
-module_load_include('inc', 'uuid', 'uuid.entity');
-
-/**
- * Implements of hook_schema_alter().
-*/
-function commerce_uuid_payment_schema_alter(&$schema = array()) {
-  $field = uuid_schema_field_definition();
-  $schema['commerce_payment_transaction']['fields']['uuid'] = $field;
-  $schema['commerce_payment_transaction_revision']['fields']['vuuid'] = $field;
-}
-
-/**
- * Implements hook_install().
- */
-function commerce_uuid_payment_install() {
-  $field = uuid_schema_field_definition();
-
-  if (!db_field_exists('commerce_payment_transaction', 'uuid')) {
-    db_add_field('commerce_payment_transaction', 'uuid', $field);
-    db_add_index('commerce_payment_transaction', 'uuid', array('uuid'));
-  }
-
-  if (!db_field_exists('commerce_payment_transaction_revision', 'vuuid')) {
-    db_add_field('commerce_payment_transaction_revision', 'vuuid', $field);
-    db_add_index('commerce_payment_transaction_revision', 'vuuid', array('vuuid'));
-  }
-
-  uuid_sync_all();
-}
-
-/**
- * Implements hook_uninstall().
- */
-function commerce_uuid_payment_uninstall() {
-  if (db_field_exists('commerce_payment_transaction', 'uuid')) {
-    db_drop_field('commerce_payment_transaction', 'uuid');
-    db_drop_index('commerce_payment_transaction', 'uuid');
-  }
-
-  if (db_field_exists('commerce_payment_transaction_revision', 'vuuid')) {
-    db_drop_field('commerce_payment_transaction_revision', 'vuuid');
-    db_drop_index('commerce_payment_transaction_revision', 'vuuid');
-  }
-}
diff --git a/payment/commerce_uuid_payment.module b/payment/commerce_uuid_payment.module
deleted file mode 100644
index e9912dc..0000000
--- a/payment/commerce_uuid_payment.module
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal hooks for the commerce_uuid module.
- */
-
-/**
- * Implements hook_entity_info_alter().
- */
-function commerce_uuid_payment_entity_info_alter(&$entity_info) {
-  $entity_info['commerce_payment_transaction']['uuid'] = TRUE;
-  $entity_info['commerce_payment_transaction']['entity keys']['uuid'] = 'uuid';
-  $entity_info['commerce_payment_transaction']['entity keys']['revision uuid'] = 'vuuid';
-}
-
-/**
- * Implements hook_entity_uuid_load().
- */
-function commerce_uuid_payment_entity_uuid_load(&$entities, $entity_type) {
-  if ($entity_type == 'commerce_payment_transaction') {
-    entity_property_id_to_uuid($entities, 'commerce_payment_transaction', array('transaction_id'));
-  }
-}
-
-/**
- * Implements hook_entity_uuid_presave().
- */
-function commerce_uuid_payment_entity_uuid_presave(&$entity, $entity_type) {
-  if ($entity_type == 'commerce_payment_transaction') {
-    entity_property_uuid_to_id($entity, 'commerce_payment_transaction', array('transaction_id'));
-  }
-}
diff --git a/product/commerce_uuid_product.info b/product/commerce_uuid_product.info
deleted file mode 100644
index 1a82651..0000000
--- a/product/commerce_uuid_product.info
+++ /dev/null
@@ -1,7 +0,0 @@
-name = Commerce UUID Product
-description = Adds universally unique identifiers support to commerce products.
-core = 7.x
-package = UUID
-
-dependencies[] = commerce_uuid
-dependencies[] = commerce_product
\ No newline at end of file
diff --git a/product/commerce_uuid_product.install b/product/commerce_uuid_product.install
deleted file mode 100644
index 4acbeb3..0000000
--- a/product/commerce_uuid_product.install
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Include some helper functions for the Entity API.
- */
-module_load_include('inc', 'uuid', 'uuid.entity');
-
-/**
- * Implements of hook_schema_alter().
-*/
-function commerce_uuid_product_schema_alter(&$schema = array()) {
-  $field = uuid_schema_field_definition();
-  $schema['commerce_product']['fields']['uuid'] = $field;
-  $schema['commerce_product_revision']['fields']['vuuid'] = $field;
-}
-
-/**
- * Implements hook_install().
- */
-function commerce_uuid_product_install() {
-  $field = uuid_schema_field_definition();
-
-  if (!db_field_exists('commerce_product', 'uuid')) {
-    db_add_field('commerce_product', 'uuid', $field);
-    db_add_index('commerce_product', 'uuid', array('uuid'));
-  }
-
-  if (!db_field_exists('commerce_product_revision', 'vuuid')) {
-    db_add_field('commerce_product_revision', 'vuuid', $field);
-    db_add_index('commerce_product_revision', 'vuuid', array('vuuid'));
-  }
-
-  uuid_sync_all();
-}
-
-/**
- * Implements hook_uninstall().
- */
-function commerce_uuid_product_uninstall() {
-  if (db_field_exists('commerce_product', 'uuid')) {
-    db_drop_field('commerce_product', 'uuid');
-    db_drop_index('commerce_product', 'uuid');
-  }
-
-  if (db_field_exists('commerce_product_revision', 'vuuid')) {
-    db_drop_field('commerce_product_revision', 'vuuid');
-    db_drop_index('commerce_product_revision', 'vuuid');
-  }
-}
diff --git a/product/commerce_uuid_product.module b/product/commerce_uuid_product.module
deleted file mode 100644
index 8de408c..0000000
--- a/product/commerce_uuid_product.module
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal hooks for the commerce_uuid module.
- */
-
-/**
- * Implements hook_entity_info_alter().
- */
-function commerce_uuid_product_entity_info_alter(&$entity_info) {
-  $entity_info['commerce_product']['uuid'] = TRUE;
-  $entity_info['commerce_product']['entity keys']['uuid'] = 'uuid';
-  $entity_info['commerce_product']['entity keys']['revision uuid'] = 'vuuid';
-}
-
-/**
- * Implements hook_entity_uuid_load().
- */
-function commerce_uuid_product_entity_uuid_load(&$entities, $entity_type) {
-  if ($entity_type == 'commerce_product') {
-    entity_property_id_to_uuid($entities, 'commerce_product', array('product_id'));
-  }
-}
-
-/**
- * Implements hook_entity_uuid_presave().
- */
-function commerce_uuid_product_entity_uuid_presave(&$entity, $entity_type) {
-  if ($entity_type == 'commerce_product') {
-    entity_property_uuid_to_id($entity, 'commerce_product', array('product_id'));
-  }
-}