diff --git a/stormperson/stormperson.module b/stormperson/stormperson.module
index e8ade4f..75b595a 100644
--- a/stormperson/stormperson.module
+++ b/stormperson/stormperson.module
@@ -249,8 +249,8 @@ function stormperson_node_info() {
 function stormperson_content_extra_fields($type_name) {
   if ($type_name == 'stormperson') {
     return array(
-      'group1' => array('label' => 'Organization/Name/User Group', 'weight' => -20),
-      'group2' => array('label' => 'Prefix/Fullname Group', 'weight' => -19),
+      'group1' => array('label' => 'Prefix/Name Group', 'weight' => -20),
+      'group2' => array('label' => 'Organization/User Group', 'weight' => -19),
       'group3' => array('label' => 'Email/WWW Group', 'weight' => -18),
       'group4' => array('label' => 'Phone/IM Group', 'weight' => -17),
     );
@@ -288,6 +288,27 @@ function stormperson_form(&$node) {
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group1') : -20,
   );
 
+  $form['group1']['prefix'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Prefix'),
+    '#size' => 20,
+    '#default_value' => isset($node->prefix) ? $node->prefix : '',
+  );
+
+  $form['group1']['title'] = array(
+    '#type' => 'textfield',
+    '#title' => check_plain($type->title_label),
+    '#required' => TRUE,
+    '#default_value' => $node->title,
+    '#size' => 40,
+  );
+
+  $form['group2'] = array(
+    '#type' => 'markup',
+    '#theme' => 'storm_form_group',
+    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
+  );
+
   $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormorganization} AS sor ON sor.vid=n.vid WHERE n.status=1 AND n.type='stormorganization' ORDER BY n.title";
   $s = stormorganization_access_sql($s);
   $s = db_rewrite_sql($s);
@@ -297,7 +318,7 @@ function stormperson_form(&$node) {
     $organizations[$organization->nid] = $organization->title;
     if (!isset($node->organization_nid)) $node->organization_nid = $organization->nid;
   }
-  $form['group1']['organization_nid'] = array(
+  $form['group2']['organization_nid'] = array(
     '#type' => 'select',
     '#title' => t('Organization'),
     '#default_value' => $node->organization_nid,
@@ -306,16 +327,8 @@ function stormperson_form(&$node) {
     '#attributes' => array('onchange' => "stormperson_organization_project_tasks(this, 'edit-project-nid', 'edit-parent-nid', true, '-')"),
   );
 
-  $form['title'] = array(
-    '#type' => 'textfield',
-    '#title' => check_plain($type->title_label),
-    '#required' => TRUE,
-    '#default_value' => $node->title,
-    '#size' => 40,
-    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'title') : -21,
-  );
 
-  $form['group1']['user_name'] = array(
+  $form['group2']['user_name'] = array(
     '#type' => 'textfield',
     '#title' => t('User'),
     '#default_value' => isset($node->user_name) ? $node->user_name : '',
@@ -323,26 +336,6 @@ function stormperson_form(&$node) {
     '#size' => 40,
   );
 
-  $form['group2'] = array(
-    '#type' => 'markup',
-    '#theme' => 'storm_form_group',
-    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
-  );
-
-  $form['group2']['prefix'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Prefix'),
-    '#size' => 20,
-    '#default_value' => isset($node->prefix) ? $node->prefix : '',
-  );
-
-  $form['group2']['fullname'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Fullname'),
-    '#size' => 40,
-    '#default_value' => isset($node->fullname) ? $node->fullname : '',
-  );
-
   $form['group3'] = array(
     '#type' => 'markup',
     '#theme' => 'storm_form_group',
@@ -400,17 +393,12 @@ function stormperson_insert($node) {
 
   db_query("INSERT INTO {stormperson}
           (vid, nid, organization_nid, organization_title,
-          prefix, fullname, email, www,
-          phone, im, user_uid
-          )
+          prefix, email, www, phone, im, user_uid)
           VALUES
           (%d, %d, %d, '%s',
-          '%s', '%s', '%s', '%s',
-          '%s', '%s', %d
-          )",
+          '%s', '%s', '%s', '%s', '%s', %d)",
           $node->vid, $node->nid, $node->organization_nid, $node->organization_title,
-          $node->prefix, $node->fullname, $node->email, $node->www,
-          $node->phone, $node->im, $node->user_uid);
+          $node->prefix, $node->email, $node->www, $node->phone, $node->im, $node->user_uid);
   _stormperson_aftersave($node);
 }
 
@@ -424,11 +412,11 @@ function stormperson_update($node) {
 
     db_query("UPDATE {stormperson} SET
       organization_nid=%d, organization_title='%s',
-      prefix='%s', fullname='%s', email='%s', www='%s',
+      prefix='%s', email='%s', www='%s',
       phone='%s', im='%s', user_uid=%d
       WHERE vid = %d",
       $node->organization_nid, $node->organization_title,
-      $node->prefix, $node->fullname, $node->email, $node->www,
+      $node->prefix, $node->email, $node->www,
       $node->phone, $node->im, $node->user_uid,
       $node->vid);
 
diff --git a/stormperson/stormperson.theme.inc b/stormperson/stormperson.theme.inc
index 3dbcf92..93127f7 100644
--- a/stormperson/stormperson.theme.inc
+++ b/stormperson/stormperson.theme.inc
@@ -50,19 +50,6 @@ function theme_stormperson_view($node, $teaser = FALSE, $page = FALSE) {
     '#value' => theme('storm_view_item', t('Organization'), l($node->organization_title, 'node/'. $node->organization_nid)),
     '#weight' => 1,
   );
-
-  $node->content['group2'] = array(
-    '#prefix' => '<div class="stormfields">',
-    '#suffix' => '</div>',
-    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
-  );
-
-  $node->content['group2']['fullname'] = array(
-    '#prefix' => '<div id="fullname">',
-    '#suffix' => '</div>',
-    '#value' => theme('storm_view_item', t('Fullname'), check_plain($node->fullname)),
-    '#weight' => 1,
-  );
   
   $node->content['group3'] = array(
     '#prefix' => '<div class="stormfields">',
diff --git a/stormperson/stormperson.views.inc b/stormperson/stormperson.views.inc
index 3bbff69..7244827 100644
--- a/stormperson/stormperson.views.inc
+++ b/stormperson/stormperson.views.inc
@@ -54,23 +54,6 @@ function stormperson_views_data() {
     ),
   );
   
-  $data['stormperson']['fullname'] = array(
-    'title' => t('Fullname'),
-    'help' => t('Storm Person Fullname'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_string',
-    ),
-  );
-  
   $data['stormperson']['email'] = array(
     'title' => t('Email'),
     'help' => t('Storm Person Email'),