diff --git a/pmorganization/pmorganization.module b/pmorganization/pmorganization.module
index 27fec00..13a3088 100644
--- a/pmorganization/pmorganization.module
+++ b/pmorganization/pmorganization.module
@@ -100,386 +100,6 @@ function pmorganization_menu() {
   return $items;
 }
 
-/**
- * Implements hook_theme().
- */
-function pmorganization_theme() {
-  return array(
-    'pmorganization_view' => array(
-      'file'      => 'pmorganization.theme.inc',
-      'variables' => array('node', 'view_mode'),
-    ),
-  );
-}
-
-/**
- * Implements hook_node_info().
- */
-function pmorganization_node_info() {
-  return array(
-    'pmorganization' => array(
-      'name' => t('Organization'),
-      'base' => 'pmorganization',
-      'description' => t("An organization for Project Management."),
-      'title_label' => t("Name"),
-      'body_label' => t("Description"),
-    )
-  );
-}
-
-/**
- * Implements hook_field_extra_fields().
- */
-function pmorganization_field_extra_fields() {
-  $extra['node']['pmorganization'] = array(
-    'form' => array(
-      'group1' => array(
-        'label' => 'Customer/Provider/Active Group',
-        'weight' => -21,
-      ),
-      'group2' => array(
-        'label' => 'Address Group',
-        'weight' => -19,
-      ),
-      'group3' => array(
-        'label' => 'Phone/WWW/Email Group',
-        'weight' => -18,
-      ),
-      'group4' => array(
-        'label' => 'Currency/Language/Tax ID Group',
-        'weight' => -17,
-      ),
-    ),
-  );
-  return $extra;
-}
-
-/**
- * Implements hook_field_extra_fields_alter().
- */
-function pmorganization_field_extra_fields_alter(&$info) {
-  $info['node']['pmorganization']['form']['title']['weight'] = -20;
-}
-
-/**
- * Implements hook_form().
- */
-function pmorganization_form(&$node) {
-  $breadcrumb = array();
-  $breadcrumb[] = l(t('Project Management'), 'pm');
-  $breadcrumb[] = l(t('Organizations'), 'pm/organizations');
-  drupal_set_breadcrumb($breadcrumb);
-
-  $type = node_type_get_type($node);
-  $info = field_info_extra_fields('node', 'pmorganization', 'form');
-
-  $form['#attributes']['class'] = 'pmcomponent_node_form';
-
-  $form['group1'] = array(
-    '#type' => 'markup',
-    '#theme' => 'pm_form_group',
-    '#weight' => $info['group1']['weight'],
-  );
-
-  $form['group1']['iscustomer'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Customer'),
-    '#default_value' => $node->iscustomer,
-  );
-
-  $form['group1']['isprovider'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Provider'),
-    '#default_value' => $node->isprovider,
-  );
-
-  $form['group1']['isactive'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Active'),
-    '#default_value' => $node->isactive,
-  );
-
-  $form['title'] = array(
-    '#type' => 'textfield',
-    '#title' => check_plain($type->title_label),
-    '#required' => TRUE,
-    '#default_value' => $node->title,
-    '#weight' => $info['title']['weight'],
-  );
-
-  $form['group2'] = array(
-    '#type' => 'markup',
-    '#theme' => 'pm_form_group',
-    '#weight' => $info['group2']['weight'],
-  );
-
-  $form['group2']['address'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Address'),
-    '#default_value' => isset($node->address) ? $node->address : NULL,
-    '#weight' => 1,
-  );
-
-  $form['group2']['city'] = array(
-    '#type' => 'textfield',
-    '#title' => t('City'),
-    '#size' => 20,
-    '#default_value' => isset($node->city) ? $node->city : NULL,
-    '#weight' => 2,
-  );
-
-  $form['group2']['provstate'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Province / State'),
-    '#size' => 20,
-    '#default_value' => isset($node->provstate) ? $node->provstate : NULL,
-    '#weight' => 3,
-  );
-
-  $country_list = pm_attributes_bydomain('Country');
-  $form['group2']['country'] = array(
-    '#type' => 'select',
-    '#title' => t('Country'),
-    '#options' => $country_list['values'],
-    '#default_value' => $node->country,
-    '#weight' => 4,
-  );
-
-  $form['group2']['zip'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Zip'),
-    '#size' => 15,
-    '#default_value' => isset($node->zip) ? $node->zip : NULL,
-    '#weight' => 5,
-  );
-
-  $form['group3'] = array(
-    '#type' => 'markup',
-    '#theme' => 'pm_form_group',
-    '#weight' => $info['group3']['weight'],
-  );
-
-  $form['group3']['phone'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Phone'),
-    '#default_value' => isset($node->phone) ? $node->phone : NULL,
-  );
-
-  $form['group3']['www'] = array(
-    '#type' => 'textfield',
-    '#title' => t('WWW'),
-    '#size' => 30,
-    '#default_value' => isset($node->www) ? $node->www : NULL,
-  );
-
-  $form['group3']['email'] = array(
-    '#type' => 'textfield',
-    '#title' => t('E-mail'),
-    '#size' => 30,
-    '#default_value' => isset($node->email) ? $node->email : NULL,
-  );
-
-  $form['group4'] = array(
-    '#type' => 'markup',
-    '#theme' => 'pm_form_group',
-    '#weight' => $info['group4']['weight'],
-  );
-
-  $currency_list = pm_attributes_bydomain('Currency');
-  $form['group4']['currency'] = array(
-    '#type' => 'select',
-    '#title' => t('Currency'),
-    '#options' => $currency_list['values'],
-    '#default_value' => $node->currency,
-  );
-
-  $pricemode_list = pm_attributes_bydomain('Price mode');
-  $form['group4']['pricemode'] = array(
-    '#type' => 'select',
-    '#title' => t('Price mode'),
-    '#default_value' => $node->pricemode,
-    '#options' => $pricemode_list['values'],
-  );
-
-  $form['group4']['price'] = array(
-    '#title' => t('Price'),
-    '#type' => 'textfield',
-    '#size' => 15,
-    '#default_value' => isset($node->price) ? $node->price : NULL,
-  );
-
-  $languages = language_list('language', TRUE);
-  $languages_options = array();
-  foreach ($languages as $language_code => $language) {
-    $languages_options[$language_code] = $language->name;
-  }
-  $form['group4']['orglanguage'] = array(
-    '#type' => 'select',
-    '#title' => t('Language'),
-    '#options' => $languages_options,
-    '#default_value' => isset($node->orglanguage) ? $node->orglanguage : NULL,
-  );
-
-  $form['group4']['taxid'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Tax ID'),
-    '#size' => 20,
-    '#default_value' => isset($node->taxid) ? $node->taxid : NULL,
-  );
-
-  // Check to see if the body field is still there, if so display it
-  $body = field_get_items('pmorganization', $node, 'body');
-  if ($body) {
-    $form['body_field'] = $body;
-  }
-
-  $form['title_old'] = array(
-    '#type' => 'hidden',
-    '#default_value' => isset($node->title_old) ? $node->title_old : NULL,
-  );
-
-  return $form;
-}
-
-/**
- * Implements hook_insert().
- */
-function pmorganization_insert($node) {
-  db_insert('pmorganization')
-    ->fields(array(
-      'vid' => $node->vid,
-      'nid' => $node->nid,
-      'country' => $node->country,
-      'www' => $node->www,
-      'phone' => $node->phone,
-      'email' => $node->email,
-      'currency' => $node->currency,
-      'provstate' => $node->provstate,
-      'zip' => $node->zip,
-      'city' => $node->city,
-      'address' => $node->address,
-      'taxid' => $node->taxid,
-      'orglanguage' => $node->orglanguage,
-      'iscustomer' => $node->iscustomer,
-      'isprovider' => $node->isprovider,
-      'isactive' => $node->isactive,
-      'pricemode' => $node->pricemode,
-//      'price' => $node->price,
-    ))
-    ->execute();
-}
-
-/**
- * Implements hook_update().
- */
-function pmorganization_update($node) {
-  // if this is a new node or we're adding a new revision,
-  if ($node->revision) {
-    pmorganization_insert($node);
-  }
-  else {
-    db_update('pmorganization')
-      ->fields(array(
-        'country' => $node->country,
-        'www' => $node->www,
-        'phone' => $node->phone,
-        'email' => $node->email,
-        'currency' => $node->currency,
-        'provstate' => $node->provstate,
-        'zip' => $node->zip,
-        'city' => $node->city,
-        'address' => $node->address,
-        'taxid' => $node->taxid,
-        'orglanguage' => $node->orglanguage,
-        'iscustomer' => $node->iscustomer,
-        'isprovider' => $node->isprovider,
-        'isactive' => $node->isactive,
-        'pricemode' => $node->pricemode,
-//        'price' => $node->price,
-      ))
-      ->condition('vid', $node->vid, '=')
-      ->execute();
-
-    if ($node->title != $node->title_old) {
-      module_invoke_all('pmorganization_change', $node->nid, $node->title);
-    }
-  }
-}
-
-/**
- * Implements hook_node_prepare().
- */
-function pmorganization_node_prepare($node) {
-  if (!isset($node->nid)) {
-    $node->iscustomer = 1;
-    $node->isprovider = 0;
-    $node->isactive = 1;
-
-    $country_list = pm_attributes_bydomain('Country');
-    $node->country = $country_list['default'];
-
-    $currency_list = pm_attributes_bydomain('Currency');
-    $node->currency = $currency_list['default'];
-
-    $pricemode_list = pm_attributes_bydomain('Price mode');
-    $node->pricemode = $pricemode_list['default'];
-  }
-}
-
-/**
- * Implements hook_node_revision_delete().
- */
-function pmorganization_node_revision_delete($node) {
-  // Notice that we're matching a single revision based on the node's vid.
-  db_delete('pmorganization')
-    ->condition('vid', $node->vid)
-    ->execute();
-}
-
-/**
- * Implements hook_delete().
- */
-function pmorganization_delete($node) {
-  // Notice that we're matching all revision, by using the node's nid.
-  db_delete('pmorganization')
-    ->condition('nid', $node->nid)
-    ->execute();
-}
-
-/**
- * Implements hook_load().
- */
-function pmorganization_load($nodes) {
-  foreach ($nodes as $nid => &$node) {
-    $result = db_select('pmorganization', 'sor')
-      ->fields('sor')
-      ->condition('vid', $node->vid)
-      ->execute();
-    $record = array();
-    $record = $result->fetchAssoc();
-    if ($record) {
-      foreach ($record as $key => $value) {
-        $node->$key = $value;
-      }
-    }
-
-    $node->title_old = $node->title;
-  }
-}
-
-/**
- * Implements hook_view().
- */
-function pmorganization_view($node, $view_mode) {
-  if ($view_mode == 'full' && node_is_page($node)) {
-    $breadcrumb = array();
-    $breadcrumb[] = l(t('Project Management'), 'pm');
-    $breadcrumb[] = l(t('Organizations'), 'pm/organizations');
-    drupal_set_breadcrumb($breadcrumb);
-  }
-
-  return theme('pmorganization_view', array('node' => $node, 'view_mode' => $view_mode));
-}
 
 /**
  * Admin settings form for pmproject module
@@ -522,17 +142,6 @@ function pmorganization_admin_settings() {
 }
 
 /**
- * Implements hook_views_api().
- */
-function pmorganization_views_api() {
-  return array(
-    'api' => 2,
-    'path' => drupal_get_path('module', 'pmorganization'),
-  );
-}
-
-
-/**
  * Implements hook_node_access_records().
  */
 function pmorganization_node_access_records($node) {
diff --git a/pmorganization/pmorganization.theme.inc b/pmorganization/pmorganization.theme.inc
deleted file mode 100644
index f279d44..0000000
--- a/pmorganization/pmorganization.theme.inc
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-/**
- * @file
- */
-function theme_pmorganization_view($variables) {
-  $node = $variables['node'];
-
-  drupal_add_css(drupal_get_path('module', 'pm') . '/pm-node.css');
-
-  $l_pos = 1; // Used to increase the link position number (see issue 814820)
-
-  $node->content['links'] = array(
-    '#prefix' => '<div class="pmlinks"><dl>',
-    '#suffix' => '</dl></div>',
-    '#weight' => -25,
-  );
-
-/**
-  $node->content['links']['expenses'] = theme('pm_link', 'pmorganization', 'pmexpense', $node->nid, $l_pos++);
-  $node->content['links']['invoices'] = theme('pm_link', 'pmorganization', 'pminvoice', $node->nid, $l_pos++);
-  $node->content['links']['notes'] = theme('pm_link', 'pmorganization', 'pmnote', $node->nid, $l_pos++);
-  $node->content['links']['people'] = theme('pm_link', 'pmorganization', 'pmperson', $node->nid, $l_pos++);
-  $node->content['links']['projects'] = theme('pm_link', 'pmorganization', 'pmproject', $node->nid, $l_pos++);
-  $node->content['links']['tasks'] = theme('pm_link', 'pmorganization', 'pmtask', $node->nid, $l_pos++);
-  $node->content['links']['tickets'] = theme('pm_link', 'pmorganization', 'pmticket', $node->nid, $l_pos++);
-  $node->content['links']['timetrackings'] = theme('pm_link', 'pmorganization', 'pmtimetracking', $node->nid, $l_pos++);
- */
-
-  $node->content['group2'] = array(
-    '#prefix' => '<div class="pmfields">',
-    '#suffix' => '</div>',
-    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
-  );
-
-  $node->content['group3'] = array(
-    '#prefix' => '<div class="pmfields">',
-    '#suffix' => '</div>',
-    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group3') : -18,
-  );
-
-  $node->content['group3']['address'] = array(
-    '#prefix' => '<div class="address">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('Address'), 'value' => check_plain($node->address))),
-    '#weight' => 1,
-  );
-
-  $node->content['group3']['city'] = array(
-    '#prefix' => '<div class="city">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('City'), 'value' => check_plain($node->city))),
-    '#weight' => 2,
-  );
-
-  $node->content['group3']['provstate'] = array(
-    '#prefix' => '<div class="provstate">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('Province / State'), 'value' => check_plain($node->provstate))),
-    '#weight' => 3,
-  );
-
-  $node->content['group3'] ['country'] = array(
-    '#prefix' => '<div class="country">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('Country'), 'value' => check_plain($node->country))),
-    '#weight' => 4,
-  );
-
-  $node->content['group3'] ['zip'] = array(
-    '#prefix' => '<div class="zip">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('Zip'), 'value' => check_plain($node->zip))),
-    '#weight' => 5,
-  );
-
-  $node->content['group4'] = array(
-    '#prefix' => '<div class="pmfields">',
-    '#suffix' => '</div>',
-    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group4') : -17,
-  );
-
-  $node->content['group4']['phone'] = array(
-    '#prefix' => '<div class="phone">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('Phone'), 'value' => check_plain($node->phone))),
-    '#weight' => 1,
-  );
-
-  $node->content['group4']['www'] = array(
-    '#prefix' => '<div class="www">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('WWW'), 'value' => l($node->www, 'http://' . $node->www, array('absolute' => TRUE)))),
-    '#weight' => 2,
-  );
-
-  $node->content['group4']['mail'] = array(
-    '#prefix' => '<div class="mail">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('E-mail'), 'value' => l($node->email, 'mailto:' . $node->email, array('absolute' => TRUE)))),
-    '#weight' => 3,
-  );
-
-  $node->content['group5'] = array(
-    '#prefix' => '<div class="pmfields">',
-    '#suffix' => '</div>',
-    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group5') : -16,
-  );
-
-  $node->content['group5']['currency'] = array(
-    '#prefix' => '<div class="currency">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('Currency'), 'value' => check_plain($node->currency))),
-    '#weight' => 1,
-  );
-
-  $languages = language_list('language', TRUE);
-  $languages_options = array();
-  foreach ($languages as $language_code => $language) {
-    $languages_options[$language_code] = $language->name;
-  }
-
-  $node->content['group5']['language'] = array(
-    '#prefix' => '<div class="language">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('Language'), 'value' => check_plain($languages_options[$node->orglanguage]))),
-    '#weight' => 2,
-  );
-
-  $node->content['group5'] ['taxid'] = array(
-    '#prefix' => '<div class="taxid">',
-    '#suffix' => '</div>',
-    '#markup' => theme('pm_view_item', array('label' => t('Tax ID'), 'value' => check_plain($node->taxid))),
-    '#weight' => 3,
-  );
-  $body = field_get_items('node', $node, 'body');
-  if ($body) {
-    $node->content['body'] = array(
-      '#prefix' => '<div class="pmbody">',
-      '#suffix' => '</div>',
-      '#markup' => theme('pm_view_item', array('label' => t('Description'), 'value' => $body[0]['safe_value'])),
-      '#weight' => 4,
-    );
-  }
-
-  return $node;
-}
diff --git a/pmorganization/pmorganization.views.inc b/pmorganization/pmorganization.views.inc
deleted file mode 100644
index 18db95d..0000000
--- a/pmorganization/pmorganization.views.inc
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * @file
- * Functions to expose Project Management organization data to views
- */
-function pmorganization_views_data() {
-  $data['pmorganization']['table']['group']  = 'Project Management Organization';
-  $data['pmorganization']['table']['join'] = array(
-    'node' => array(
-      'left_field' => 'vid',
-      'field' => 'vid',
-    ),
-  );
-
-  $data['pmorganization']['country'] = array(
-    'title' => t('Country'),
-    'help' => t('Project Management Organization Country'),
-    '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['pmorganization']['orglanguage'] = array(
-    'title' => t('Language'),
-    'help' => t('Project Management Organization Language'),
-    '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['pmorganization']['provstate'] = array(
-    'title' => t('Province / State'),
-    'help' => t('Project Management Organization Province / State'),
-    '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['pmorganization']['city'] = array(
-    'title' => t('City'),
-    'help' => t('Project Management Organization City'),
-    '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['pmorganization']['zip'] = array(
-    'title' => t('Zip'),
-    'help' => t('Project Management Organization Zip'),
-    '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['pmorganization']['address'] = array(
-    'title' => t('Address'),
-    'help' => t('Project Management Organization Address'),
-    '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['pmorganization']['taxid'] = array(
-    'title' => t('Tax ID'),
-    'help' => t('Project Management Organization Tax ID'),
-    '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['pmorganization']['email'] = array(
-    'title' => t('Email'),
-    'help' => t('Project Management Organization Email'),
-    '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['pmorganization']['www'] = array(
-    'title' => t('WWW'),
-    'help' => t('Project Management Organization WWW'),
-    '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['pmorganization']['phone'] = array(
-    'title' => t('Phone'),
-    'help' => t('Project Management Organization Phone'),
-    '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['pmorganization']['currency'] = array(
-    'title' => t('Currency'),
-    'help' => t('Project Management Organization Currency'),
-    'field' => array(
-      'handler' => 'pm_handler_field_attributes_domain',
-      'domain' => 'Currency',
-      'click sortable' => TRUE,
-    ),
-    'filter' => array(
-      'handler' => 'pm_handler_filter_attributes_domain',
-      'domain' => 'Currency',
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_string',
-    ),
-  );
-
-  $data['pmorganization']['iscustomer'] = array(
-    'title' => t('Is customer'),
-    'help' => t('Project Management Organization Is Customer'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-    ),
-  );
-
-  $data['pmorganization']['isprovider'] = array(
-    'title' => t('Is provider'),
-    'help' => t('Project Management Organization Is Provider'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-    ),
-  );
-
-  $data['pmorganization']['isactive'] = array(
-    'title' => t('Is active'),
-    'help' => t('Project Management Organization Is Active'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-    ),
-  );
-
-  $data['pmorganization']['operation'] = array(
-    'field' => array(
-      'title' => t('Edit/Delete link'),
-      'help' => t('Provide a simple link to edit and delete the node.'),
-      'handler' => 'pm_handler_field_operation',
-      'type' => 'pmorganization',
-    ),
-  );
-
-  return $data;
-}
-
-/**
- * Implements pmorganization_views_handlers().
- */
-function pmorganization_views_handlers() {
-  return array(
-    'info' => array(
-      'path' => drupal_get_path('module', 'pm'),
-    ),
-    'handlers' => array(
-      'pm_handler_field_attributes_domain' => array(
-        'parent' => 'views_handler_field',
-      ),
-      'pm_handler_filter_attributes_domain' => array(
-        'parent' => 'views_handler_filter_in_operator',
-      ),
-      'pm_handler_field_operation' => array(
-        'parent' => 'views_handler_field_node_link',
-        'path' => drupal_get_path('module', 'pm'),
-      ),
-    ),
-  );
-}
diff --git a/pmorganization/pmorganization.views_default.inc b/pmorganization/pmorganization.views_default.inc
deleted file mode 100644
index 6af1544..0000000
--- a/pmorganization/pmorganization.views_default.inc
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * @file
- *
- * Views integration default settings.
- *
- * Stores default values for views. The view provides a list of organization
- * nodes and is available at 'pm/organizations'
- */
-
-/**
- * Implements hook_views_default_views().
- */
-function pmorganization_views_default_views() {
-  $views = array();
-
-  $view = new view();
-  $view->name = 'pm_organization_list';
-  $view->description = '';
-  $view->tag = 'pm';
-  $view->base_table = 'node';
-  $view->human_name = 'Project Management Organization List';
-  $view->core = 7;
-  $view->api_version = '3.0';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-
-  /* Display: Master */
-  $handler = $view->new_display('default', 'Master', 'default');
-  $handler->display->display_options['title'] = 'Organizations';
-  $handler->display->display_options['use_more_always'] = FALSE;
-  $handler->display->display_options['access']['type'] = 'perm';
-  $handler->display->display_options['access']['perm'] = 'Project Management Organization: access';
-  $handler->display->display_options['cache']['type'] = 'none';
-  $handler->display->display_options['query']['type'] = 'views_query';
-  $handler->display->display_options['exposed_form']['type'] = 'basic';
-  $handler->display->display_options['pager']['type'] = 'full';
-  $handler->display->display_options['pager']['options']['items_per_page'] = '10';
-  $handler->display->display_options['style_plugin'] = 'table';
-  $handler->display->display_options['style_options']['columns'] = array(
-    'title' => 'title',
-    'country' => 'country',
-    'edit_node' => 'edit_node',
-    'delete_node' => 'edit_node',
-  );
-  $handler->display->display_options['style_options']['default'] = 'title';
-  $handler->display->display_options['style_options']['info'] = array(
-    'title' => array(
-      'sortable' => 1,
-      'default_sort_order' => 'asc',
-      'align' => '',
-      'separator' => '',
-      'empty_column' => 0,
-    ),
-    'country' => array(
-      'sortable' => 1,
-      'default_sort_order' => 'asc',
-      'align' => '',
-      'separator' => '',
-      'empty_column' => 0,
-    ),
-    'edit_node' => array(
-      'align' => '',
-      'separator' => ' ',
-      'empty_column' => 1,
-    ),
-    'delete_node' => array(
-      'align' => '',
-      'separator' => '',
-      'empty_column' => 1,
-    ),
-  );
-  /* Field: Content: Title */
-  $handler->display->display_options['fields']['title']['id'] = 'title';
-  $handler->display->display_options['fields']['title']['table'] = 'node';
-  $handler->display->display_options['fields']['title']['field'] = 'title';
-  $handler->display->display_options['fields']['title']['label'] = 'Organization';
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
-  /* Field: Project Management Organization: Country */
-  $handler->display->display_options['fields']['country']['id'] = 'country';
-  $handler->display->display_options['fields']['country']['table'] = 'pmorganization';
-  $handler->display->display_options['fields']['country']['field'] = 'country';
-  /* Field: Content: Edit link */
-  $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
-  $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
-  $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
-  $handler->display->display_options['fields']['edit_node']['label'] = 'Operations';
-  /* Field: Content: Delete link */
-  $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
-  $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
-  $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
-  $handler->display->display_options['fields']['delete_node']['label'] = '';
-  $handler->display->display_options['fields']['delete_node']['element_label_colon'] = FALSE;
-  /* Sort criterion: Content: Title */
-  $handler->display->display_options['sorts']['title']['id'] = 'title';
-  $handler->display->display_options['sorts']['title']['table'] = 'node';
-  $handler->display->display_options['sorts']['title']['field'] = 'title';
-  /* Filter criterion: Content: Published */
-  $handler->display->display_options['filters']['status']['id'] = 'status';
-  $handler->display->display_options['filters']['status']['table'] = 'node';
-  $handler->display->display_options['filters']['status']['field'] = 'status';
-  $handler->display->display_options['filters']['status']['value'] = 1;
-  $handler->display->display_options['filters']['status']['group'] = 1;
-  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
-  $handler->display->display_options['filters']['type']['id'] = 'type';
-  $handler->display->display_options['filters']['type']['table'] = 'node';
-  $handler->display->display_options['filters']['type']['field'] = 'type';
-  $handler->display->display_options['filters']['type']['value'] = array(
-    'pmorganization' => 'pmorganization',
-  );
-  /* Filter criterion: Content: Title */
-  $handler->display->display_options['filters']['title']['id'] = 'title';
-  $handler->display->display_options['filters']['title']['table'] = 'node';
-  $handler->display->display_options['filters']['title']['field'] = 'title';
-  $handler->display->display_options['filters']['title']['operator'] = 'contains';
-  $handler->display->display_options['filters']['title']['exposed'] = TRUE;
-  $handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
-  $handler->display->display_options['filters']['title']['expose']['label'] = 'Organization';
-  $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
-  $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
-  $handler->display->display_options['filters']['title']['expose']['remember_roles'] = array(
-    2 => '2',
-    1 => 0,
-    3 => 0,
-  );
-
-  /* Display: Page */
-  $handler = $view->new_display('page', 'Page', 'page');
-  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
-  $handler->display->display_options['path'] = 'pm/organizations';
-  $handler->display->display_options['menu']['type'] = 'normal';
-  $handler->display->display_options['menu']['title'] = 'Organizations';
-  $handler->display->display_options['menu']['weight'] = '0';
-  $handler->display->display_options['menu']['context'] = '0';
-
-  $views[$view->name] = $view;
-
-  return $views;
-}