diff --git a/plugins/entityreference_handler/entityreference_entity_field.inc b/plugins/entityreference/selection/entityreference_entity_field.inc
similarity index 99%
rename from plugins/entityreference_handler/entityreference_entity_field.inc
rename to plugins/entityreference/selection/entityreference_entity_field.inc
index 1945713..394a1f4 100644
--- a/plugins/entityreference_handler/entityreference_entity_field.inc
+++ b/plugins/entityreference/selection/entityreference_entity_field.inc
@@ -2,7 +2,7 @@
 
 $plugin = array(
   'title' => t('Webform Field (use a Field API Field from the base form as the label for autocompletion and display.)'),
-  'handler' => 'EntityReferenceHandler_field',
+  'class' => 'EntityReferenceHandler_field',
   'weight' => 0,
 );
 
diff --git a/webform_entity.module b/webform_entity.module
index de8b5e0..e634769 100644
--- a/webform_entity.module
+++ b/webform_entity.module
@@ -709,7 +709,7 @@ function webform_entity_ctools_plugin_directory($owner, $plugin_type) {
     return 'plugins/' . $plugin_type;
   }
   if ($owner == 'entityreference' && $plugin_type) {
-    return 'plugins/entityreference_handler';
+    return 'plugins/entityreference/' . $plugin_type;
   }
 }