=== renamed file 'definitions/contrib/cck/importexportapi_content.inc' => 'definitions/contrib/cck/importexportapi_definition_content.inc'
=== renamed file 'definitions/contrib/cck/importexportapi_nodereference.inc' => 'definitions/contrib/cck/importexportapi_definition_nodereference.inc'
=== renamed file 'definitions/contrib/cck/importexportapi_userreference.inc' => 'definitions/contrib/cck/importexportapi_definition_userreference.inc'
=== renamed file 'definitions/importexportapi_aggregator.inc' => 'definitions/importexportapi_definition_aggregator.inc'
=== renamed file 'definitions/importexportapi_block.inc' => 'definitions/importexportapi_definition_block.inc'
=== renamed file 'definitions/importexportapi_blog.inc' => 'definitions/importexportapi_definition_blog.inc'
=== renamed file 'definitions/importexportapi_book.inc' => 'definitions/importexportapi_definition_book.inc'
=== renamed file 'definitions/importexportapi_comment.inc' => 'definitions/importexportapi_definition_comment.inc'
=== renamed file 'definitions/importexportapi_dblog.inc' => 'definitions/importexportapi_definition_dblog.inc'
=== renamed file 'definitions/importexportapi_filter.inc' => 'definitions/importexportapi_definition_filter.inc'
=== renamed file 'definitions/importexportapi_forum.inc' => 'definitions/importexportapi_definition_forum.inc'
=== renamed file 'definitions/importexportapi_locale.inc' => 'definitions/importexportapi_definition_locale.inc'
=== renamed file 'definitions/importexportapi_menu.inc' => 'definitions/importexportapi_definition_menu.inc'
=== renamed file 'definitions/importexportapi_node.inc' => 'definitions/importexportapi_definition_node.inc'
=== renamed file 'definitions/importexportapi_path.inc' => 'definitions/importexportapi_definition_path.inc'
=== renamed file 'definitions/importexportapi_poll.inc' => 'definitions/importexportapi_definition_poll.inc'
=== renamed file 'definitions/importexportapi_profile.inc' => 'definitions/importexportapi_definition_profile.inc'
=== renamed file 'definitions/importexportapi_statistics.inc' => 'definitions/importexportapi_definition_statistics.inc'
=== renamed file 'definitions/importexportapi_system.inc' => 'definitions/importexportapi_definition_system.inc'
=== renamed file 'definitions/importexportapi_taxonomy.inc' => 'definitions/importexportapi_definition_taxonomy.inc'
=== renamed file 'definitions/importexportapi_user.inc' => 'definitions/importexportapi_definition_user.inc'
=== renamed file 'engines/importexportapi_csv.inc' => 'engines/importexportapi_engine_csv.inc'
=== renamed file 'engines/importexportapi_csv_get.inc' => 'engines/importexportapi_engine_csv_get.inc'
--- engines/importexportapi_csv_get.inc	2009-06-26 06:21:32 +0000
+++ engines/importexportapi_engine_csv_get.inc	2009-06-26 23:22:38 +0000
@@ -6,7 +6,7 @@
  * The 'csv' 'get' engine for the Import / Export API.
  */
 
-require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_csv.inc');
+require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_engine_csv.inc');
 
 /**
  * Callback for parsing CSV data into a structured array.

=== renamed file 'engines/importexportapi_csv_put.inc' => 'engines/importexportapi_engine_csv_put.inc'
--- engines/importexportapi_csv_put.inc	2009-06-26 06:21:32 +0000
+++ engines/importexportapi_engine_csv_put.inc	2009-06-26 23:22:38 +0000
@@ -6,7 +6,7 @@
  * The 'csv' 'put' engine for the Import / Export API.
  */
 
-require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_csv.inc');
+require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_engine_csv.inc');
 
 /**
  * Callback for rendering data in CSV export format.

=== renamed file 'engines/importexportapi_db.inc' => 'engines/importexportapi_engine_db.inc'
=== renamed file 'engines/importexportapi_db_get.inc' => 'engines/importexportapi_engine_db_get.inc'
--- engines/importexportapi_db_get.inc	2009-06-26 06:21:32 +0000
+++ engines/importexportapi_engine_db_get.inc	2009-06-26 23:22:38 +0000
@@ -8,7 +8,7 @@
  * for exports.
  */
 
-require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_db.inc');
+require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_engine_db.inc');
 
 /**
  * Callback for querying the database, and returning the results in a

=== renamed file 'engines/importexportapi_db_put.inc' => 'engines/importexportapi_engine_db_put.inc'
--- engines/importexportapi_db_put.inc	2009-06-26 06:21:32 +0000
+++ engines/importexportapi_engine_db_put.inc	2009-06-26 23:22:38 +0000
@@ -8,7 +8,7 @@
  * for imports.
  */
 
-require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_db.inc');
+require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_engine_db.inc');
 
 /**
  * Callback for inserting structured data into the database.

=== renamed file 'engines/importexportapi_xml.inc' => 'engines/importexportapi_engine_xml.inc'
=== renamed file 'engines/importexportapi_xml_get.inc' => 'engines/importexportapi_engine_xml_get.inc'
--- engines/importexportapi_xml_get.inc	2009-06-26 06:21:32 +0000
+++ engines/importexportapi_engine_xml_get.inc	2009-06-26 23:22:38 +0000
@@ -6,7 +6,7 @@
  * The 'xml' 'get' engine for the Import / Export API.
  */
 
-require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_xml.inc');
+require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_engine_xml.inc');
 
 /**
  * Callback for parsing XML data into a structured array.

=== renamed file 'engines/importexportapi_xml_put.inc' => 'engines/importexportapi_engine_xml_put.inc'
--- engines/importexportapi_xml_put.inc	2009-06-26 06:21:32 +0000
+++ engines/importexportapi_engine_xml_put.inc	2009-06-26 23:22:38 +0000
@@ -6,7 +6,7 @@
  * The 'xml' 'put' engine for the Import / Export API.
  */
 
-require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_xml.inc');
+require_once(drupal_get_path('module', 'importexportapi') .'/engines/importexportapi_engine_xml.inc');
 
 /**
  * Callback for rendering data in XML export format.

=== renamed file 'fields/importexportapi_array.inc' => 'fields/importexportapi_field_array.inc'
=== renamed file 'fields/importexportapi_datetime.inc' => 'fields/importexportapi_field_datetime.inc'
=== renamed file 'fields/importexportapi_freeform.inc' => 'fields/importexportapi_field_freeform.inc'
=== renamed file 'fields/importexportapi_serialized.inc' => 'fields/importexportapi_field_serialized.inc'
=== modified file 'importexportapi.module'
--- importexportapi.module	2009-06-26 06:21:32 +0000
+++ importexportapi.module	2009-06-26 06:32:26 +0000
@@ -952,13 +952,11 @@
 function _importexportapi_include_core_defs() {
   // Acknowledgement: below code based on similar code in the views module.
   // Load all our module 'on behalfs'.
-  $path = drupal_get_path('module', 'importexportapi') .'/definitions';
-  $files = drupal_system_listing('importexportapi_.*\.inc$', $path, 'name', 0);
-
+  $files = drupal_system_listing('importexportapi_definition_.*\.inc$', 'modules', 'name', 0);
   foreach ($files as $file) {
     // The filename format is very specific. It must be
-    // importexportapi_MODULENAME.inc
-    $module = substr_replace($file->name, '', 0, 16);
+    // importexportapi_definition_MODULENAME.inc
+    $module = substr_replace($file->name, '', 0, 27);
     if (module_exists($module)) {
       require_once('./'. $file->filename);
     }
@@ -970,20 +968,19 @@
  * module.
  */
 function _importexportapi_include_core_engines() {
-  $path = drupal_get_path('module', 'importexportapi') .'/engines';
-  $files = drupal_system_listing('importexportapi_.*\.inc$', $path, 'name', 0);
-  $engines = importexportapi_engines_get_put();
+  $files = drupal_system_listing('importexportapi_engine_.*\.inc$', 'modules', 'name', 0);
+  $engines = module_invoke_all('engines_get_put');
   $engine_names = array();
 
   foreach ($engines as $engine => $callbacks) {
     foreach ($callbacks as $callback => $callback_functions) {
-      $engine_names['importexportapi_'. $engine .'_'. $callback] = TRUE;
+      $engine_names['importexportapi_engine_'. $engine .'_'. $callback] = TRUE;
     }
   }
-
+  
   foreach ($files as $file) {
     // The filename format is very specific. It must be
-    // importexportapi_ENGINE_CALLBACK.inc
+    // importexportapi_engine_ENGINE_CALLBACK.inc
     if (isset($engine_names[$file->name])) {
       require_once('./'. $file->filename);
     }
@@ -996,14 +993,13 @@
 function _importexportapi_include_core_fields() {
   // Acknowledgement: below code based on similar code in the views module.
   // Load all our module 'on behalfs'.
-  $path = drupal_get_path('module', 'importexportapi') .'/fields';
-  $files = drupal_system_listing('importexportapi_.*\.inc$', $path, 'name', 0);
+  $files = drupal_system_listing('importexportapi_field_.*\.inc$', 'modules', 'name', 0);
   $fields = importexportapi_get_field_type_info();
 
   foreach ($files as $file) {
     // The filename format is very specific. It must be
-    // importexportapi_MODULENAME.inc
-    $field = substr_replace($file->name, '', 0, 16);
+    // importexportapi_field_FIELDNAME.inc
+    $field = substr_replace($file->name, '', 0, 22);
     if (isset($fields[$field])) {
       require_once('./'. $file->filename);
     }