diff --git a/features/ns_article_polls/ns_article_polls.features.field.inc b/features/ns_article_polls/ns_article_polls.features.field.inc
new file mode 100644
index 0000000..81dab09
--- /dev/null
+++ b/features/ns_article_polls/ns_article_polls.features.field.inc
@@ -0,0 +1,120 @@
+<?php
+/**
+ * @file
+ * ns_article_polls.features.field.inc
+ */
+
+/**
+ * Implements hook_field_default_fields().
+ */
+function ns_article_polls_field_default_fields() {
+  $fields = array();
+
+  // Exported field: 'node-ns_article-field_ns_poll_ns_article_poll'
+  $fields['node-ns_article-field_ns_poll_ns_article_poll'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_ns_poll_ns_article_poll',
+      'foreign keys' => array(
+        'nid' => array(
+          'columns' => array(
+            'nid' => 'nid',
+          ),
+          'table' => 'node',
+        ),
+      ),
+      'indexes' => array(
+        'nid' => array(
+          0 => 'nid',
+        ),
+      ),
+      'module' => 'node_reference',
+      'settings' => array(
+        'referenceable_types' => array(
+          'ns_article' => 0,
+          'ns_ch_web_promo' => 0,
+          'ns_contributor' => 0,
+          'ns_fact' => 0,
+          'poll' => 'poll',
+        ),
+        'view' => array(
+          'args' => array(),
+          'display_name' => '',
+          'view_name' => '',
+        ),
+      ),
+      'translatable' => '1',
+      'type' => 'node_reference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'ns_article',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'node_reference',
+          'settings' => array(),
+          'type' => 'node_reference_default',
+          'weight' => '8',
+        ),
+        'search_index' => array(
+          'label' => 'hidden',
+          'module' => 'node_reference',
+          'settings' => array(),
+          'type' => 'node_reference_default',
+          'weight' => '6',
+        ),
+        'search_result' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => '3',
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'field_ns_poll_ns_article_poll',
+      'label' => 'Polls',
+      'required' => 0,
+      'settings' => array(
+        'crossclone' => array(
+          'couple_setting' => 0,
+          'coupling' => 0,
+          'delete_setting' => 0,
+        ),
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'node_reference',
+        'settings' => array(
+          'autocomplete_match' => 'contains',
+          'autocomplete_path' => 'node_reference/autocomplete',
+          'references_dialog_add' => 1,
+          'references_dialog_edit' => 1,
+          'references_dialog_search' => 1,
+          'references_dialog_search_view' => 'ns_article_reference_search:references_dialog_1',
+          'size' => '60',
+        ),
+        'type' => 'node_reference_autocomplete',
+        'weight' => '10',
+      ),
+    ),
+  );
+
+  // Translatables
+  // Included for use with string extractors like potx.
+  t('Polls');
+
+  return $fields;
+}
diff --git a/features/ns_article_polls/ns_article_polls.features.inc b/features/ns_article_polls/ns_article_polls.features.inc
new file mode 100644
index 0000000..5762f97
--- /dev/null
+++ b/features/ns_article_polls/ns_article_polls.features.inc
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @file
+ * ns_article_polls.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function ns_article_polls_ctools_plugin_api() {
+  list($module, $api) = func_get_args();
+  if ($module == "field_group" && $api == "field_group") {
+    return array("version" => "1");
+  }
+}
diff --git a/features/ns_article_polls/ns_article_polls.field_group.inc b/features/ns_article_polls/ns_article_polls.field_group.inc
new file mode 100644
index 0000000..4938431
--- /dev/null
+++ b/features/ns_article_polls/ns_article_polls.field_group.inc
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @file
+ * ns_article_polls.field_group.inc
+ */
+
+/**
+ * Implements hook_field_group_info().
+ */
+function ns_article_polls_field_group_info() {
+  $export = array();
+
+  $field_group = new stdClass;
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_ns_article_poll|node|ns_article|form';
+  $field_group->group_name = 'group_ns_article_poll';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'ns_article';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Polls',
+    'weight' => '9',
+    'children' => array(
+      0 => 'field_ns_poll_ns_article_poll',
+    ),
+    'format_type' => 'tab',
+    'format_settings' => array(
+      'formatter' => 'closed',
+      'instance_settings' => array(
+        'classes' => '',
+        'required_fields' => 1,
+      ),
+    ),
+  );
+  $export['group_ns_article_poll|node|ns_article|form'] = $field_group;
+
+  return $export;
+}
diff --git a/features/ns_article_polls/ns_article_polls.info b/features/ns_article_polls/ns_article_polls.info
new file mode 100644
index 0000000..e2b9e5b
--- /dev/null
+++ b/features/ns_article_polls/ns_article_polls.info
@@ -0,0 +1,10 @@
+core = "7.x"
+dependencies[] = "features"
+dependencies[] = "field_group"
+dependencies[] = "node_reference"
+description = "Adds the option to attach polls to articles."
+features[ctools][] = "field_group:field_group:1"
+features[field][] = "node-ns_article-field_ns_poll_ns_article_poll"
+features[field_group][] = "group_ns_article_poll|node|ns_article|form"
+name = "Article Polls"
+package = "Extensions"
diff --git a/features/ns_article_polls/ns_article_polls.module b/features/ns_article_polls/ns_article_polls.module
new file mode 100644
index 0000000..dfa3dad
--- /dev/null
+++ b/features/ns_article_polls/ns_article_polls.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the Article Polls feature.
+ */
+
+include_once('ns_article_polls.features.inc');
diff --git a/features/ns_poll/ns_poll.features.field.inc b/features/ns_poll/ns_poll.features.field.inc
deleted file mode 100644
index 3acd3a5..0000000
--- a/features/ns_poll/ns_poll.features.field.inc
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * @file
- * ns_poll.features.field.inc
- */
-
-/**
- * Implements hook_field_default_fields().
- */
-function ns_poll_field_default_fields() {
-  $fields = array();
-
-  // Exported field: 'node-ns_article-field_ns_poll_ns_article_poll'
-  $fields['node-ns_article-field_ns_poll_ns_article_poll'] = array(
-    'field_config' => array(
-      'active' => '1',
-      'cardinality' => '-1',
-      'deleted' => '0',
-      'entity_types' => array(),
-      'field_name' => 'field_ns_poll_ns_article_poll',
-      'foreign keys' => array(
-        'nid' => array(
-          'columns' => array(
-            'nid' => 'nid',
-          ),
-          'table' => 'node',
-        ),
-      ),
-      'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
-        ),
-      ),
-      'module' => 'node_reference',
-      'settings' => array(
-        'referenceable_types' => array(
-          'ns_article' => 0,
-          'ns_ch_web_promo' => 0,
-          'ns_contributor' => 0,
-          'ns_fact' => 0,
-          'poll' => 'poll',
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
-        ),
-      ),
-      'translatable' => '1',
-      'type' => 'node_reference',
-    ),
-    'field_instance' => array(
-      'bundle' => 'ns_article',
-      'default_value' => NULL,
-      'deleted' => '0',
-      'description' => '',
-      'display' => array(
-        'default' => array(
-          'label' => 'above',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '8',
-        ),
-        'search_index' => array(
-          'label' => 'hidden',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '6',
-        ),
-        'search_result' => array(
-          'label' => 'above',
-          'settings' => array(),
-          'type' => 'hidden',
-          'weight' => '3',
-        ),
-        'teaser' => array(
-          'label' => 'above',
-          'settings' => array(),
-          'type' => 'hidden',
-          'weight' => 0,
-        ),
-      ),
-      'entity_type' => 'node',
-      'field_name' => 'field_ns_poll_ns_article_poll',
-      'label' => 'Polls',
-      'required' => 0,
-      'settings' => array(
-        'crossclone' => array(
-          'couple_setting' => 0,
-          'coupling' => 0,
-          'delete_setting' => 0,
-        ),
-        'user_register_form' => FALSE,
-      ),
-      'widget' => array(
-        'active' => 1,
-        'module' => 'node_reference',
-        'settings' => array(
-          'autocomplete_match' => 'contains',
-          'autocomplete_path' => 'node_reference/autocomplete',
-          'references_dialog_add' => 1,
-          'references_dialog_edit' => 1,
-          'references_dialog_search' => 1,
-          'references_dialog_search_view' => 'ns_article_reference_search:references_dialog_1',
-          'size' => '60',
-        ),
-        'type' => 'node_reference_autocomplete',
-        'weight' => '9',
-      ),
-    ),
-  );
-
-  // Translatables
-  // Included for use with string extractors like potx.
-  t('Polls');
-
-  return $fields;
-}
diff --git a/features/ns_poll/ns_poll.features.inc b/features/ns_poll/ns_poll.features.inc
index 4f274bf..7b5b3b6 100644
--- a/features/ns_poll/ns_poll.features.inc
+++ b/features/ns_poll/ns_poll.features.inc
@@ -9,10 +9,6 @@
  */
 function ns_poll_ctools_plugin_api() {
   list($module, $api) = func_get_args();
-  if ($module == "field_group" && $api == "field_group") {
-    return array("version" => "1");
-  }
-  list($module, $api) = func_get_args();
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
diff --git a/features/ns_poll/ns_poll.field_group.inc b/features/ns_poll/ns_poll.field_group.inc
deleted file mode 100644
index 79ccd28..0000000
--- a/features/ns_poll/ns_poll.field_group.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @file
- * ns_poll.field_group.inc
- */
-
-/**
- * Implements hook_field_group_info().
- */
-function ns_poll_field_group_info() {
-  $export = array();
-
-  $field_group = new stdClass;
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_ns_poll|node|ns_article|form';
-  $field_group->group_name = 'group_ns_poll';
-  $field_group->entity_type = 'node';
-  $field_group->bundle = 'ns_article';
-  $field_group->mode = 'form';
-  $field_group->parent_name = '';
-  $field_group->data = array(
-    'label' => 'Polls',
-    'weight' => '8',
-    'children' => array(
-      0 => 'field_ns_poll_ns_article_poll',
-    ),
-    'format_type' => 'tab',
-    'format_settings' => array(
-      'formatter' => 'closed',
-      'instance_settings' => array(
-        'classes' => '',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $export['group_ns_poll|node|ns_article|form'] = $field_group;
-
-  return $export;
-}
diff --git a/features/ns_poll/ns_poll.info b/features/ns_poll/ns_poll.info
index f74d4dc..f4517e0 100644
--- a/features/ns_poll/ns_poll.info
+++ b/features/ns_poll/ns_poll.info
@@ -1,18 +1,9 @@
 core = "7.x"
 dependencies[] = "features"
-dependencies[] = "field_group"
-dependencies[] = "node_reference"
-dependencies[] = "ns_article"
 dependencies[] = "poll"
 dependencies[] = "strongarm"
-description = "Adds the option to attach polls to articles."
-features[ctools][] = "field_group:field_group:1"
 features[ctools][] = "strongarm:strongarm:1"
-features[field][] = "node-ns_article-field_ns_poll_ns_article_poll"
-features[field_group][] = "group_ns_poll|node|ns_article|form"
 features[variable][] = "language_content_type_poll"
-features[variable][] = "node_options_poll"
-name = "Article polls"
-nodestream_type = "extension"
-package = "Extensions"
-php = "5.2.4"
+description = "Provides content type poll."
+name = "Poll"
+package = "Content providers"
diff --git a/features/ns_poll/ns_poll.strongarm.inc b/features/ns_poll/ns_poll.strongarm.inc
index eadb0ea..deb3957 100644
--- a/features/ns_poll/ns_poll.strongarm.inc
+++ b/features/ns_poll/ns_poll.strongarm.inc
@@ -17,14 +17,5 @@ function ns_poll_strongarm() {
   $strongarm->value = '1';
   $export['language_content_type_poll'] = $strongarm;
 
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'node_options_poll';
-  $strongarm->value = array(
-    0 => 'status',
-  );
-  $export['node_options_poll'] = $strongarm;
-
   return $export;
 }