diff --git a/uc_addresses_example/README.txt b/uc_addresses_example/README.txt
index f0673dd..7c45bb0 100644
--- a/uc_addresses_example/README.txt
+++ b/uc_addresses_example/README.txt
@@ -13,11 +13,17 @@ The schema's of uc_addresses and uc_orders are altered to save
 the extra field values.
 
 For a quick start (and if you only need extra text fields), you
-can alter the field definitions in the file
-uc_addresses_example.fields.inc to your own needs. In that file
-extra address fields for both the schema API and the Ubercart
-Addresses field handler API are defined. Else, follow the
-instructions below.
+can alter the field definitions. In this example module, fields
+are defined for the Ubercart Addresses field handler API and for
+the schema API.
+The field definitions for the field handler API can be found in
+the function uc_addresses_example_uc_addresses_fields() from
+uc_addresses_example.module.
+The field definitions for the schema API can be found in the
+function _uc_addresses_example_schema_fields() from
+uc_addresses_example.install.
+
+If you like to learn more, follow the instructions below.
 
 
 Registering address fields
diff --git a/uc_addresses_example/uc_addresses_example.fields.inc b/uc_addresses_example/uc_addresses_example.fields.inc
deleted file mode 100644
index 085598a..0000000
--- a/uc_addresses_example/uc_addresses_example.fields.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * @file
- * Definitions of fields used in schema's and by Ubercart Addresses.
- *
- * These fields will be added to uc_addresses table and to uc_orders table.
- * The fields will be also registered, so Ubercart Addresses knows about
- * them.
- */
-
-/**
- * Defines which schema tables needs to be altered.
- *
- * A prefix is also defined because in case of the
- * uc_orders table two fields needs to be added:
- * - one for delivery
- * - and one for billing.
- *
- * @return array
- *   The schema's that needs to be altered.
- */
-function _uc_addresses_example_schema_tables() {
-  return array(
-    array(
-      'table' => 'uc_addresses',
-      'prefix' => '',
-    ),
-    array(
-      'table' => 'uc_orders',
-      'prefix' => 'delivery_',
-    ),
-    array(
-      'table' => 'uc_orders',
-      'prefix' => 'billing_',
-    ),
-  );
-}
-
-/**
- * Defines which schema fields need to be added
- * to the uc_addresses and uc_orders table.
- *
- * Some of the fields are set to not display by default.
- * These fields should be shown in forms, but it's value
- * should not be shown separately. The idea is that these
- * fields are added to the address format, which can be set
- * at:
- * admin/store/settings/countries/uc_addresses_formats
- *
- * @return array
- */
-function _uc_addresses_example_schema_fields() {
-  return array(
-    'title' => array(
-      // Schema
-      'description' => t("Person's stating social rank."),
-      'type' => 'varchar',
-      'length' => 255,
-      'not null' => TRUE,
-      'default' => '',
-      // UC Addresses
-      'title' => t('Title'),
-      'handler' => 'UcAddressesExampleTextFieldHandler',
-      'display_settings' => array(
-        'default' => FALSE,
-        'register' => TRUE,
-        'address_form' => TRUE,
-        'checkout_form' => TRUE,
-        'order_form' => TRUE,
-      ),
-      'compare' => TRUE,
-    ),
-    'surname_prefix' => array(
-      // Schema
-      'description' => 'The addressee\'s surname prefix',
-      'type' => 'varchar',
-      'length' => 255,
-      'not null' => TRUE,
-      'default' => '',
-      // UC Addresses
-      'title' => t('Surname prefix'),
-      'handler' => 'UcAddressesExampleTextFieldHandler',
-      'display_settings' => array(
-        'default' => FALSE,
-        'register' => TRUE,
-        'address_form' => TRUE,
-        'checkout_form' => TRUE,
-        'order_form' => TRUE,
-      ),
-      'compare' => TRUE,
-    ),
-    'house_number' => array(
-      // Schema
-      'description' => 'The addressee\'s house number',
-      'type' => 'varchar',
-      'length' => 10,
-      'not null' => TRUE,
-      'default' => '',
-      // UC Addresses
-      'title' => t('House number'),
-      'handler' => 'UcAddressesExampleTextFieldHandler',
-      'display_settings' => array(
-        'default' => FALSE,
-        'register' => TRUE,
-        'address_form' => TRUE,
-        'checkout_form' => TRUE,
-        'order_form' => TRUE,
-      ),
-      'compare' => TRUE,
-    ),
-  );
-}
diff --git a/uc_addresses_example/uc_addresses_example.install b/uc_addresses_example/uc_addresses_example.install
index f0fc669..504f5ae 100644
--- a/uc_addresses_example/uc_addresses_example.install
+++ b/uc_addresses_example/uc_addresses_example.install
@@ -1,13 +1,13 @@
 <?php
+
 /**
  * @file
  * Install file for Ubercart Addresses Example module.
  */
 
-module_load_include('fields.inc', 'uc_addresses_example');
-
 /**
  * Implements hook_schema_alter().
+ *
  * @param array $schema
  * @return void
  */
@@ -73,3 +73,63 @@ function uc_addresses_example_uninstall() {
 
   return $ret;
 }
+
+/**
+ * Defines which schema tables needs to be altered.
+ *
+ * A prefix is also defined because in case of the
+ * uc_orders table two fields needs to be added:
+ * - one for delivery
+ * - and one for billing.
+ *
+ * @return array
+ *   The schema's that needs to be altered.
+ */
+function _uc_addresses_example_schema_tables() {
+  return array(
+    array(
+      'table' => 'uc_addresses',
+      'prefix' => '',
+    ),
+    array(
+      'table' => 'uc_orders',
+      'prefix' => 'delivery_',
+    ),
+    array(
+      'table' => 'uc_orders',
+      'prefix' => 'billing_',
+    ),
+  );
+}
+
+/**
+ * Defines which schema fields need to be added
+ * to the uc_addresses and uc_orders table.
+ *
+ * @return array
+ */
+function _uc_addresses_example_schema_fields() {
+  return array(
+    'title' => array(
+      'description' => t("Person's stating social rank."),
+      'type' => 'varchar',
+      'length' => 255,
+      'not null' => TRUE,
+      'default' => '',
+    ),
+    'surname_prefix' => array(
+      'description' => 'The addressee\'s surname prefix',
+      'type' => 'varchar',
+      'length' => 255,
+      'not null' => TRUE,
+      'default' => '',
+    ),
+    'house_number' => array(
+      'description' => 'The addressee\'s house number',
+      'type' => 'varchar',
+      'length' => 10,
+      'not null' => TRUE,
+      'default' => '',
+    ),
+  );
+}
diff --git a/uc_addresses_example/uc_addresses_example.module b/uc_addresses_example/uc_addresses_example.module
index 90f688a..0ee1b6b 100644
--- a/uc_addresses_example/uc_addresses_example.module
+++ b/uc_addresses_example/uc_addresses_example.module
@@ -3,13 +3,9 @@
  * @file
  * Example module for Ubercart Addresses.
  *
- * Adds extra address fields. See uc_addresses_example.fields.inc
- * for which fields are being added.
- *
  * This module can be used as an example for adding extra address fields.
  *
- * Note this example module is work in progress: it needs more examples.
- * Now there is only an example for how to add extra text fields.
+ * See the README.txt for more information.
  */
 
 // ---------------------------------------------------------------------------
@@ -19,7 +15,9 @@
 /**
  * Implements hook_uc_addresses_field_handlers().
  *
- * Registers field handlers.
+ * This tells Ubercart Addresses which field handlers there are.
+ * Every handler must be derived either directly or indirectly
+ * from UcAddressesFieldHandler.
  *
  * @return array
  */
@@ -43,11 +41,57 @@ function uc_addresses_example_uc_addresses_field_handlers() {
 /**
  * Implements hook_uc_addresses_fields().
  *
- * Registers all extra address fields for Ubercart Addresses.
+ * Registers extra address fields for Ubercart Addresses.
+ *
+ * Some of the fields are set to not display by default.
+ * These fields should be shown in forms, but it's value
+ * should not be shown separately. The idea is that these
+ * fields are added to the address format, which can be set
+ * at:
+ * admin/store/settings/countries/uc_addresses_formats
  *
  * @return array
  */
 function uc_addresses_example_uc_addresses_fields() {
-  module_load_include('fields.inc', 'uc_addresses_example');
-  return _uc_addresses_example_schema_fields();
+  return array(
+    'title' => array(
+      'title' => t('Title'),
+      'type' => 'text',
+      'handler' => 'UcAddressesExampleTextFieldHandler',
+      'display_settings' => array(
+        'default' => FALSE,
+        'register' => TRUE,
+        'address_form' => TRUE,
+        'checkout_form' => TRUE,
+        'order_form' => TRUE,
+      ),
+      'compare' => TRUE,
+    ),
+    'surname_prefix' => array(
+      'title' => t('Surname prefix'),
+      'type' => 'text',
+      'handler' => 'UcAddressesExampleTextFieldHandler',
+      'display_settings' => array(
+        'default' => FALSE,
+        'register' => TRUE,
+        'address_form' => TRUE,
+        'checkout_form' => TRUE,
+        'order_form' => TRUE,
+      ),
+      'compare' => TRUE,
+    ),
+    'house_number' => array(
+      'title' => t('House number'),
+      'type' => 'text',
+      'handler' => 'UcAddressesExampleTextFieldHandler',
+      'display_settings' => array(
+        'default' => FALSE,
+        'register' => TRUE,
+        'address_form' => TRUE,
+        'checkout_form' => TRUE,
+        'order_form' => TRUE,
+      ),
+      'compare' => TRUE,
+    ),
+  );
 }