diff --git a/modules/hosting/package/hosting_package.views_default.inc b/modules/hosting/package/hosting_package.views_default.inc
new file mode 100644
index 0000000..9078251
--- /dev/null
+++ b/modules/hosting/package/hosting_package.views_default.inc
@@ -0,0 +1,249 @@
+<?php
+/**
+ * @file
+ */
+
+/**
+ * Implementation of hook_views_default_views().
+ */
+function hosting_package_views_default_views() {
+  $views = array();
+
+  // Exported view: hosting_package_list
+  $view = new view;
+  $view->name = 'hosting_package_list';
+  $view->description = 'Display a list of packages for a hosted site';
+  $view->tag = '';
+  $view->base_table = 'hosting_package_instance';
+  $view->human_name = '';
+  $view->core = 6;
+  $view->api_version = '3.0';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+  /* Display: Defaults */
+  $handler = $view->new_display('default', 'Defaults', 'default');
+  $handler->display->display_options['use_ajax'] = TRUE;
+  $handler->display->display_options['access']['type'] = 'none';
+  $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'] = '25';
+  $handler->display->display_options['pager']['options']['offset'] = '0';
+  $handler->display->display_options['pager']['options']['id'] = '0';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = 0;
+  $handler->display->display_options['style_plugin'] = 'table';
+  $handler->display->display_options['style_options']['row_class'] = '[status]';
+  $handler->display->display_options['style_options']['columns'] = array(
+    'status' => 'status',
+    'status_1' => 'status_1',
+    'title' => 'title',
+    'version' => 'version',
+    'package_type' => 'package_type',
+  );
+  $handler->display->display_options['style_options']['default'] = 'status_1';
+  $handler->display->display_options['style_options']['info'] = array(
+    'status' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'status_1' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'desc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'title' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'version' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'package_type' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+  );
+  $handler->display->display_options['style_options']['override'] = 1;
+  $handler->display->display_options['style_options']['sticky'] = 0;
+  $handler->display->display_options['style_options']['empty_table'] = 0;
+  /* Relationship: Hosting Package Instance: Package ID */
+  $handler->display->display_options['relationships']['package_id']['id'] = 'package_id';
+  $handler->display->display_options['relationships']['package_id']['table'] = 'hosting_package_instance';
+  $handler->display->display_options['relationships']['package_id']['field'] = 'package_id';
+  $handler->display->display_options['relationships']['package_id']['required'] = 0;
+  /* Field: Class */
+  $handler->display->display_options['fields']['status']['id'] = 'status';
+  $handler->display->display_options['fields']['status']['table'] = 'hosting_package_instance';
+  $handler->display->display_options['fields']['status']['field'] = 'status';
+  $handler->display->display_options['fields']['status']['ui_name'] = 'Class';
+  $handler->display->display_options['fields']['status']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['status']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['status']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['status']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['status']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['status']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['status']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['status']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['status']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['status']['status_mode'] = 'class';
+  /* Field: Hosting Package Instance: Status */
+  $handler->display->display_options['fields']['status_1']['id'] = 'status_1';
+  $handler->display->display_options['fields']['status_1']['table'] = 'hosting_package_instance';
+  $handler->display->display_options['fields']['status_1']['field'] = 'status';
+  $handler->display->display_options['fields']['status_1']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['status_1']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['status_1']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['status_1']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['status_1']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['status_1']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['status_1']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['status_1']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['status_1']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['status_1']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['status_1']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['status_1']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['status_1']['element_class'] = 'hosting-status';
+  $handler->display->display_options['fields']['status_1']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['status_1']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['status_1']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['status_1']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['status_1']['hide_alter_empty'] = 1;
+  /* Field: Node: 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']['relationship'] = 'package_id';
+  $handler->display->display_options['fields']['title']['label'] = 'Package';
+  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  /* Field: Hosting Package Instance: Version */
+  $handler->display->display_options['fields']['version']['id'] = 'version';
+  $handler->display->display_options['fields']['version']['table'] = 'hosting_package_instance';
+  $handler->display->display_options['fields']['version']['field'] = 'version';
+  $handler->display->display_options['fields']['version']['label'] = 'Release';
+  $handler->display->display_options['fields']['version']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['version']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['version']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['version']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['version']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['version']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['version']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['version']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['version']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['version']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['version']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['version']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['version']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['version']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['version']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['version']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['version']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['version']['format_plural'] = 0;
+  /* Field: Hosting Package: Type */
+  $handler->display->display_options['fields']['package_type']['id'] = 'package_type';
+  $handler->display->display_options['fields']['package_type']['table'] = 'hosting_package';
+  $handler->display->display_options['fields']['package_type']['field'] = 'package_type';
+  $handler->display->display_options['fields']['package_type']['relationship'] = 'package_id';
+  $handler->display->display_options['fields']['package_type']['label'] = 'Package type';
+  $handler->display->display_options['fields']['package_type']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['package_type']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['package_type']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['package_type']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['package_type']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['package_type']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['package_type']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['package_type']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['package_type']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['package_type']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['package_type']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['package_type']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['package_type']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['package_type']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['package_type']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['package_type']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['package_type']['hide_alter_empty'] = 1;
+  /* Sort criterion: Hosting Package Instance: Status */
+  $handler->display->display_options['sorts']['status']['id'] = 'status';
+  $handler->display->display_options['sorts']['status']['table'] = 'hosting_package_instance';
+  $handler->display->display_options['sorts']['status']['field'] = 'status';
+  $handler->display->display_options['sorts']['status']['order'] = 'DESC';
+  /* Sort criterion: Node: 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';
+  $handler->display->display_options['sorts']['title']['relationship'] = 'package_id';
+  /* Argument: Hosting Package Instance: Reference ID */
+  $handler->display->display_options['arguments']['rid']['id'] = 'rid';
+  $handler->display->display_options['arguments']['rid']['table'] = 'hosting_package_instance';
+  $handler->display->display_options['arguments']['rid']['field'] = 'rid';
+  $handler->display->display_options['arguments']['rid']['default_action'] = 'default';
+  $handler->display->display_options['arguments']['rid']['style_plugin'] = 'default_summary';
+  $handler->display->display_options['arguments']['rid']['title'] = 'Packages on %1';
+  $handler->display->display_options['arguments']['rid']['default_argument_type'] = 'node';
+  $handler->display->display_options['arguments']['rid']['default_argument_skip_url'] = 0;
+  $handler->display->display_options['arguments']['rid']['validate_type'] = 'node';
+  $handler->display->display_options['arguments']['rid']['validate_options']['types'] = array(
+    'site' => 'site',
+  );
+  $handler->display->display_options['arguments']['rid']['validate_options']['access'] = 0;
+  $handler->display->display_options['arguments']['rid']['break_phrase'] = 0;
+  $handler->display->display_options['arguments']['rid']['not'] = 0;
+  /* Filter: Hosting Package: Type */
+  $handler->display->display_options['filters']['package_type']['id'] = 'package_type';
+  $handler->display->display_options['filters']['package_type']['table'] = 'hosting_package';
+  $handler->display->display_options['filters']['package_type']['field'] = 'package_type';
+  $handler->display->display_options['filters']['package_type']['relationship'] = 'package_id';
+  $handler->display->display_options['filters']['package_type']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['package_type']['expose']['operator'] = 'package_type_op';
+  $handler->display->display_options['filters']['package_type']['expose']['limit_operators'] = array();
+  $handler->display->display_options['filters']['package_type']['expose']['label'] = 'Type';
+  $handler->display->display_options['filters']['package_type']['expose']['identifier'] = 'package_type';
+  $handler->display->display_options['filters']['package_type']['expose']['reduce'] = 0;
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->display->display_options['path'] = 'node/%/packages';
+  $handler->display->display_options['menu']['type'] = 'tab';
+  $handler->display->display_options['menu']['title'] = 'Packages';
+  $handler->display->display_options['menu']['weight'] = '1';
+
+  $views[$view->name] = $view;
+
+  return $views;
+}
diff --git a/modules/hosting/package/hosting_platform.views_default.inc b/modules/hosting/package/hosting_platform.views_default.inc
deleted file mode 100644
index 9078251..0000000
--- a/modules/hosting/package/hosting_platform.views_default.inc
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-/**
- * @file
- */
-
-/**
- * Implementation of hook_views_default_views().
- */
-function hosting_package_views_default_views() {
-  $views = array();
-
-  // Exported view: hosting_package_list
-  $view = new view;
-  $view->name = 'hosting_package_list';
-  $view->description = 'Display a list of packages for a hosted site';
-  $view->tag = '';
-  $view->base_table = 'hosting_package_instance';
-  $view->human_name = '';
-  $view->core = 6;
-  $view->api_version = '3.0';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-
-  /* Display: Defaults */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->display->display_options['use_ajax'] = TRUE;
-  $handler->display->display_options['access']['type'] = 'none';
-  $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'] = '25';
-  $handler->display->display_options['pager']['options']['offset'] = '0';
-  $handler->display->display_options['pager']['options']['id'] = '0';
-  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = 0;
-  $handler->display->display_options['style_plugin'] = 'table';
-  $handler->display->display_options['style_options']['row_class'] = '[status]';
-  $handler->display->display_options['style_options']['columns'] = array(
-    'status' => 'status',
-    'status_1' => 'status_1',
-    'title' => 'title',
-    'version' => 'version',
-    'package_type' => 'package_type',
-  );
-  $handler->display->display_options['style_options']['default'] = 'status_1';
-  $handler->display->display_options['style_options']['info'] = array(
-    'status' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
-      'align' => '',
-      'separator' => '',
-    ),
-    'status_1' => array(
-      'sortable' => 1,
-      'default_sort_order' => 'desc',
-      'align' => '',
-      'separator' => '',
-    ),
-    'title' => array(
-      'sortable' => 1,
-      'default_sort_order' => 'asc',
-      'align' => '',
-      'separator' => '',
-    ),
-    'version' => array(
-      'sortable' => 1,
-      'default_sort_order' => 'asc',
-      'align' => '',
-      'separator' => '',
-    ),
-    'package_type' => array(
-      'sortable' => 1,
-      'default_sort_order' => 'asc',
-      'align' => '',
-      'separator' => '',
-    ),
-  );
-  $handler->display->display_options['style_options']['override'] = 1;
-  $handler->display->display_options['style_options']['sticky'] = 0;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
-  /* Relationship: Hosting Package Instance: Package ID */
-  $handler->display->display_options['relationships']['package_id']['id'] = 'package_id';
-  $handler->display->display_options['relationships']['package_id']['table'] = 'hosting_package_instance';
-  $handler->display->display_options['relationships']['package_id']['field'] = 'package_id';
-  $handler->display->display_options['relationships']['package_id']['required'] = 0;
-  /* Field: Class */
-  $handler->display->display_options['fields']['status']['id'] = 'status';
-  $handler->display->display_options['fields']['status']['table'] = 'hosting_package_instance';
-  $handler->display->display_options['fields']['status']['field'] = 'status';
-  $handler->display->display_options['fields']['status']['ui_name'] = 'Class';
-  $handler->display->display_options['fields']['status']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['status']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['status']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['status']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['status']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['status']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['status']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['status']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['status']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['status']['status_mode'] = 'class';
-  /* Field: Hosting Package Instance: Status */
-  $handler->display->display_options['fields']['status_1']['id'] = 'status_1';
-  $handler->display->display_options['fields']['status_1']['table'] = 'hosting_package_instance';
-  $handler->display->display_options['fields']['status_1']['field'] = 'status';
-  $handler->display->display_options['fields']['status_1']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['status_1']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['status_1']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['status_1']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['status_1']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['status_1']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['status_1']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['status_1']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['status_1']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['status_1']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['status_1']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['status_1']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['status_1']['element_class'] = 'hosting-status';
-  $handler->display->display_options['fields']['status_1']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['status_1']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['status_1']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['status_1']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['status_1']['hide_alter_empty'] = 1;
-  /* Field: Node: 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']['relationship'] = 'package_id';
-  $handler->display->display_options['fields']['title']['label'] = 'Package';
-  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['title']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
-  /* Field: Hosting Package Instance: Version */
-  $handler->display->display_options['fields']['version']['id'] = 'version';
-  $handler->display->display_options['fields']['version']['table'] = 'hosting_package_instance';
-  $handler->display->display_options['fields']['version']['field'] = 'version';
-  $handler->display->display_options['fields']['version']['label'] = 'Release';
-  $handler->display->display_options['fields']['version']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['version']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['version']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['version']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['version']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['version']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['version']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['version']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['version']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['version']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['version']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['version']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['version']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['version']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['version']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['version']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['version']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['version']['format_plural'] = 0;
-  /* Field: Hosting Package: Type */
-  $handler->display->display_options['fields']['package_type']['id'] = 'package_type';
-  $handler->display->display_options['fields']['package_type']['table'] = 'hosting_package';
-  $handler->display->display_options['fields']['package_type']['field'] = 'package_type';
-  $handler->display->display_options['fields']['package_type']['relationship'] = 'package_id';
-  $handler->display->display_options['fields']['package_type']['label'] = 'Package type';
-  $handler->display->display_options['fields']['package_type']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['package_type']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['package_type']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['package_type']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['package_type']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['package_type']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['package_type']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['package_type']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['package_type']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['package_type']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['package_type']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['package_type']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['package_type']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['package_type']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['package_type']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['package_type']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['package_type']['hide_alter_empty'] = 1;
-  /* Sort criterion: Hosting Package Instance: Status */
-  $handler->display->display_options['sorts']['status']['id'] = 'status';
-  $handler->display->display_options['sorts']['status']['table'] = 'hosting_package_instance';
-  $handler->display->display_options['sorts']['status']['field'] = 'status';
-  $handler->display->display_options['sorts']['status']['order'] = 'DESC';
-  /* Sort criterion: Node: 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';
-  $handler->display->display_options['sorts']['title']['relationship'] = 'package_id';
-  /* Argument: Hosting Package Instance: Reference ID */
-  $handler->display->display_options['arguments']['rid']['id'] = 'rid';
-  $handler->display->display_options['arguments']['rid']['table'] = 'hosting_package_instance';
-  $handler->display->display_options['arguments']['rid']['field'] = 'rid';
-  $handler->display->display_options['arguments']['rid']['default_action'] = 'default';
-  $handler->display->display_options['arguments']['rid']['style_plugin'] = 'default_summary';
-  $handler->display->display_options['arguments']['rid']['title'] = 'Packages on %1';
-  $handler->display->display_options['arguments']['rid']['default_argument_type'] = 'node';
-  $handler->display->display_options['arguments']['rid']['default_argument_skip_url'] = 0;
-  $handler->display->display_options['arguments']['rid']['validate_type'] = 'node';
-  $handler->display->display_options['arguments']['rid']['validate_options']['types'] = array(
-    'site' => 'site',
-  );
-  $handler->display->display_options['arguments']['rid']['validate_options']['access'] = 0;
-  $handler->display->display_options['arguments']['rid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['rid']['not'] = 0;
-  /* Filter: Hosting Package: Type */
-  $handler->display->display_options['filters']['package_type']['id'] = 'package_type';
-  $handler->display->display_options['filters']['package_type']['table'] = 'hosting_package';
-  $handler->display->display_options['filters']['package_type']['field'] = 'package_type';
-  $handler->display->display_options['filters']['package_type']['relationship'] = 'package_id';
-  $handler->display->display_options['filters']['package_type']['exposed'] = TRUE;
-  $handler->display->display_options['filters']['package_type']['expose']['operator'] = 'package_type_op';
-  $handler->display->display_options['filters']['package_type']['expose']['limit_operators'] = array();
-  $handler->display->display_options['filters']['package_type']['expose']['label'] = 'Type';
-  $handler->display->display_options['filters']['package_type']['expose']['identifier'] = 'package_type';
-  $handler->display->display_options['filters']['package_type']['expose']['reduce'] = 0;
-
-  /* Display: Page */
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->display->display_options['path'] = 'node/%/packages';
-  $handler->display->display_options['menu']['type'] = 'tab';
-  $handler->display->display_options['menu']['title'] = 'Packages';
-  $handler->display->display_options['menu']['weight'] = '1';
-
-  $views[$view->name] = $view;
-
-  return $views;
-}
diff --git a/modules/hosting/task/hosting_task.views.inc b/modules/hosting/task/hosting_task.views.inc
index d898707..986937f 100644
--- a/modules/hosting/task/hosting_task.views.inc
+++ b/modules/hosting/task/hosting_task.views.inc
@@ -22,7 +22,7 @@ function hosting_task_views_handlers() {
   );
 }
 
-/** 
+/**
  * Implements hook_views_data().
  */
 function hosting_task_views_data() {
@@ -39,7 +39,7 @@ function hosting_task_views_data() {
 
   $data['hosting_task']['task_type'] = array(
     'title' => t('Type'),
-    'help' => t(''),
+    'help' => t('The type of task.'),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -50,14 +50,21 @@ function hosting_task_views_data() {
   );
 
   $data['hosting_task']['rid'] = array(
-    'title' => t('Reference'),
-    'help' => t(''),
+    'title' => t('Reference ID'),
+    'help' => t('The referenced ID for the task.'),
+    'field' => array(
+      'handler' => 'views_handler_field_node',
+      'click sortable' => TRUE,
+    ),
     'relationship' => array(
       'handler' => 'views_handler_relationship',
       'base' => 'node',
-      'field' => 'rid',
+      'base field' => 'nid',
       'label' => t('Reference'),
     ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_node_nid',
+    ),
   );
 
   $data['hosting_task']['task_status'] = array(
@@ -76,6 +83,24 @@ function hosting_task_views_data() {
       'handler' => 'views_handler_field_date',
       'click sortable' => TRUE,
     ),
+    'sort' => array(
+      'handler' => 'views_handler_sort_date',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_date',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_date',
+    ),
+  );
+
+  $data['hosting_task']['delta'] = array(
+    'title' => t('Execution time'),
+    'help' => t('Time this task took.'),
+    'field' => array(
+      'handler' => 'views_handler_field_time_interval',
+      'click sortable' => TRUE,
+    ),
   );
 
   return $data;
diff --git a/modules/hosting/task/hosting_task.views_default.inc b/modules/hosting/task/hosting_task.views_default.inc
index 0747da9..b39e12a 100644
--- a/modules/hosting/task/hosting_task.views_default.inc
+++ b/modules/hosting/task/hosting_task.views_default.inc
@@ -39,9 +39,13 @@ function hosting_task_views_default_views() {
   $handler->display->display_options['style_options']['columns'] = array(
     'task_status' => 'task_status',
     'title' => 'title',
+    'task_type' => 'task_type',
+    'created' => 'created',
+    'executed' => 'executed',
+    'delta' => 'delta',
     'view_node' => 'view_node',
   );
-  $handler->display->display_options['style_options']['default'] = '-1';
+  $handler->display->display_options['style_options']['default'] = 'executed';
   $handler->display->display_options['style_options']['info'] = array(
     'task_status' => array(
       'sortable' => 0,
@@ -55,6 +59,30 @@ function hosting_task_views_default_views() {
       'align' => '',
       'separator' => '',
     ),
+    'task_type' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'created' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'desc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'executed' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'desc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'delta' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'desc',
+      'align' => '',
+      'separator' => '',
+    ),
     'view_node' => array(
       'align' => '',
       'separator' => '',
@@ -63,7 +91,7 @@ function hosting_task_views_default_views() {
   $handler->display->display_options['style_options']['override'] = 1;
   $handler->display->display_options['style_options']['sticky'] = 0;
   $handler->display->display_options['style_options']['empty_table'] = 0;
-  /* Relationship: Hosting Task: Reference */
+  /* Relationship: Hosting Task: Reference ID */
   $handler->display->display_options['relationships']['rid']['id'] = 'rid';
   $handler->display->display_options['relationships']['rid']['table'] = 'hosting_task';
   $handler->display->display_options['relationships']['rid']['field'] = 'rid';
@@ -315,6 +343,28 @@ function hosting_task_views_default_views() {
   $handler->display->display_options['fields']['executed']['empty_zero'] = 0;
   $handler->display->display_options['fields']['executed']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['executed']['date_format'] = 'time ago';
+  /* Field: Hosting Task: Execution time */
+  $handler->display->display_options['fields']['delta']['id'] = 'delta';
+  $handler->display->display_options['fields']['delta']['table'] = 'hosting_task';
+  $handler->display->display_options['fields']['delta']['field'] = 'delta';
+  $handler->display->display_options['fields']['delta']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['delta']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['delta']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['delta']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['delta']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['delta']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['delta']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['delta']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['delta']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['delta']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['delta']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['delta']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['delta']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['delta']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['delta']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['delta']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['delta']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['delta']['granularity'] = '2';
   /* Field: Node: Link */
   $handler->display->display_options['fields']['view_node']['id'] = 'view_node';
   $handler->display->display_options['fields']['view_node']['table'] = 'node';