Index: primary_term.module
===================================================================
--- primary_term.module	(revision 20613)
+++ primary_term.module	(working copy)
@@ -134,7 +134,7 @@
         $type = $types[$node->type];
 
         // Create a new field.
-        $form['primaryterm'] = array(
+        $primary_term_array = array(
           '#type' => 'select',
           '#multiple' => 0,
           '#title' => variable_get('pt_title_'. $form['type']['#value'], t('Primary Term')),
@@ -146,7 +146,21 @@
           '#theme' => 'taxonomy_term_select',
           '#required' => variable_get('pt_required_'. $form['type']['#value'], FALSE),
           '#weight' => content_extra_field_weight($node->type, 'primary_term'),
+          '#tree' => FALSE, // Added to ensure this field appears at 
+                            // the root of the node regardless of its
+                            // location in the form.
           );
+        if (variable_get('pt_group_with_taxonomy_fieldset_'. $form['type']['#value'], FALSE)) {
+          $form['taxonomy']['primaryterm'] = $primary_term_array;
+          // With this being the Primary Term we're going to want it at the
+          // top of the taxonomy fieldset to put it in a more primary position.
+          // As far as I can tell content_extra_field_weight() isn't used to
+          // to position things within the taxonomy fieldset.
+          $form['taxonomy']['primaryterm']['#weight'] = -50;
+        }
+        else {
+          $form['primaryterm'] = $primary_term_array;
+        }
       }
       break;
 
@@ -170,6 +184,12 @@
       '#default_value' => variable_get('pt_required_'. $node_type, FALSE),
       '#description' => t('Select whether a Primary Term is required for this node type.'),
     );
+    $form['workflow']['pt_group_with_taxonomy_fieldset'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Group the Primary Term selector with the Taxonomy Fieldset.'),
+      '#default_value' => variable_get('pt_group_with_taxonomy_fieldset_'. $node_type, FALSE),
+      '#description' => t('Checking this will group the Primary Term with the Taxomony fieldset for easy sorting in the Content Type Manage Fields view'),
+    );
     $form['workflow']['pt_title'] = array(
       '#type' => 'textfield',
       '#title' => t('Primary Term Title'),