diff --git a/modules/sparql_endpoint/sparql_endpoint.info b/modules/sparql_endpoint/sparql_endpoint.info
deleted file mode 100644
index 5970fae..0000000
--- a/modules/sparql_endpoint/sparql_endpoint.info
+++ /dev/null
@@ -1,7 +0,0 @@
-name = SPARQL Endpoint
-description = Expose local RDF data in a SPARQL endpoint.
-package = RDF
-dependencies[] = rdfx
-dependencies[] = sparql
-version = VERSION
-core = 7.x
diff --git a/modules/sparql_endpoint/sparql_endpoint.install b/modules/sparql_endpoint/sparql_endpoint.install
deleted file mode 100644
index ad983ac..0000000
--- a/modules/sparql_endpoint/sparql_endpoint.install
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update and uninstall functions for the SPARQL Endpoint module.
- */
-
-/**
- * Enable sparql module (new dependency).
- */
-function sparql_endpoint_update_7001() {
-  $t = get_t();
-
-  module_enable(array('sparql'));
-  drupal_set_message($t('The SPARQL module is now required by the SPARQL Endpoint module and has been enabled.'));
-}
-
-/**
- * Move SPARQL endpoint tables.
- */
-function sparql_endpoint_update_7002() {
-  $t = get_t();
-
-  $arc2_tables = array('g2t', 'id2val', 'o2val', 's2val', 'setting', 'triple');
-  $old_prefix = 'sparql_endpoint_arc2_';
-  $new_prefix = 'sparql_store_site_endpoint_';
-  foreach ($arc2_tables as $table) {
-    if (db_table_exists($old_prefix . $table)) {
-      db_rename_table($old_prefix . $table, $new_prefix . $table);
-    }
-  }
-
-  drupal_set_message($t('The SPARQL Endpoint database tables have been moved.'), 'status');
-}
diff --git a/modules/sparql_endpoint/sparql_endpoint.module b/modules/sparql_endpoint/sparql_endpoint.module
deleted file mode 100644
index 799b4d1..0000000
--- a/modules/sparql_endpoint/sparql_endpoint.module
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Implements hook_menu().
- */
-function sparql_endpoint_menu() {
-  // @todo use access RDF data permission instead of access content.
-  $items['sparql'] = array(
-    'title' => 'SPARQL endpoint',
-    'page callback' => 'sparql_endpoint_sparql_endpoint',
-    'access arguments' => array('access content'),
-  );
-  $items['sparql_endpoint_index'] = array(
-    'title' => 'Build RDF index',
-    'page callback' => 'sparql_endpoint_index_rdf',
-    'access arguments' => array('access content'),
-  );
-  return $items;
-}
-
-function sparql_endpoint_index_rdf() {
-  // Instantiate the ARC2 local store.
-  $store = sparql_get_store('site_endpoint');
-
-  // Emtpy the local store.
-  // FIXME optimize by doing this only when creating/saving a node.
-  $store->reset();
-
-  // Index all the nodes which are published.
-  $query = db_select('node', 'n')->extend('PagerDefault')->extend('TableSort');
-  $query->condition('n.status', 1);
-  $ids = $query
-    ->fields('n',array('nid'))
-    ->limit(500)
-    ->execute()
-    ->fetchCol();
-
-  foreach ($ids as $id) {
-    $rdf = rdfx_get_rdf_model('node', $id);
-    $store->insert($rdf->index, $rdf->uri);
-  }
-
-  // Index all the users.
-  $query = db_select('users', 'u')->extend('PagerDefault')->extend('TableSort');
-  $query->condition('u.uid', 0, '<>');
-  $ids = $query
-    ->fields('u', array('uid'))
-    ->limit(500)
-    ->execute()
-    ->fetchCol();
-
-  foreach ($ids as $id) {
-    $rdf = rdfx_get_rdf_model('user', $id);
-    $store->insert($rdf->index, $rdf->uri);
-  }
-
-  // Index all the terms.
-  $query = db_select('taxonomy_term_data', 't')->extend('PagerDefault')->extend('TableSort');
-  $ids = $query
-    ->fields('t', array('tid'))
-    ->limit(500)
-    ->execute()
-    ->fetchCol();
-
-  foreach ($ids as $id) {
-    $rdf = rdfx_get_rdf_model('taxonomy_term', $id);
-    $store->insert($rdf->index, $rdf->uri);
-  }
-
-  return t('The RDF index of the site has been rebuilt. Browse to the <a href="@endpoint">SPARQL endpoint</a> to query it.', array('@endpoint' => url('sparql')));
-}
-
-function sparql_endpoint_sparql_endpoint() {
-  // Instantiate the ARC2 SPARQL endpoint.
-  $ep = sparql_get_store('site_endpoint', SPARQL_ENDPOINT);
-  $ep->go();
-}
-
-/**
- * Implements hook_node_insert().
- */
-function sparql_endpoint_node_insert($node) {
-  // Instantiate the ARC2 local store.
-  $store = sparql_get_store('site_endpoint');
-
-  // Build RDF model for the node.
-  $rdf = rdfx_get_rdf_model('node', $node->nid);
-
-  // Add node to the store.
-  $store->insert($rdf->index, $rdf->uri);
-}
-
-/**
- * Implements hook_node_update().
- */
-function sparql_endpoint_node_update($node) {
-  // Instantiate the ARC2 local store.
-  $store = sparql_get_store('site_endpoint');
-
-  // Build RDF model for the node.
-  $rdf = rdfx_get_rdf_model('node', $node->nid);
-
-  // Cleans out the graph and reindex the node.
-  $store->query('DELETE FROM <' . $rdf->uri . '>');
-  $store->insert($rdf->index, $rdf->uri);
-}
diff --git a/sparql_registry.info b/sparql_registry.info
deleted file mode 100644
index 21367d2..0000000
--- a/sparql_registry.info
+++ /dev/null
@@ -1,5 +0,0 @@
-name = SPARQL Endpoints Registry
-description = SPARQL Endpoints Registry
-package = RDF
-core = 7.x
-files[] = sparql_registry.module
diff --git a/sparql_registry.install b/sparql_registry.install
deleted file mode 100644
index ce6685c..0000000
--- a/sparql_registry.install
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Implements hook_schema().
- *
- * @see hook_schema()
- * @link schemaapi Schema API @endlink
- */
-function sparql_registry_schema() {
-  $schema['sparql_registry'] = array(
-    'description' => 'The base table for SPARQL Endpoints',
-    'fields' => array(
-      'srid' => array(
-        'description' => 'The primary identifier for an endpoint.',
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'title' => array(
-        'description' => 'The title of this endpoint, always treated as non-markup plain text.',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'endpoint' => array(
-        'description' => 'The url of this endpoint.',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'dataset' => array(
-        'description' => 'dataset',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => FALSE,
-        'default' => '',
-      ),
-    ),
-    'primary key' => array('srid'),
-  );
-  return $schema;
-}
diff --git a/sparql_registry.module b/sparql_registry.module
deleted file mode 100644
index 418f2c5..0000000
--- a/sparql_registry.module
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-
-/**
- * Implements hook_permission().
- */
-function sparql_registry_permission() {
-  $perms = array(
-    'administer sparql registry' => array(
-      'title' => t('Administer SPARQL endpoints registry'),
-    ),
-  );
-
-  return $perms;
-}
-
-/**
- * Implements hook_menu().
- */
-function sparql_registry_menu() {
-  $items['sparql_registry/%sparql_registry'] = array(
-    'title' => 'SPARQL Endpoint',
-    'title callback' => 'sparql_registry_page_title',
-    'title arguments' => array(1),
-    'page callback' => 'sparql_registry_page',
-    'page arguments' => array(1),
-    'access arguments' => array('administer sparql registry'),
-    'type' => MENU_CALLBACK,
-  );
-  $items['sparql_registry/%sparql_registry/edit'] = array(
-    'title' => 'Edit',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('sparql_registry_form_edit', 1),
-    'access arguments' => array('administer sparql registry'),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 10,
-  );
-
-  $items['sparql_registry/%sparql_registry/delete'] = array(
-    'title' => 'Delete',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('sparql_registry_delete_confirm', 1),
-    'access arguments' => array('administer sparql registry'),
-    'weight' => 10,
-    'type' => MENU_LOCAL_TASK,
-  );
-  $items['admin/structure/sparql_registry'] = array(
-    'title' => 'SPARQL Endpoints Registry',
-    'description' => 'Manage sparql endpoint entities.',
-    'access arguments' => array('administer sparql registry'),
-    'page callback' => 'sparql_registry_page_admin',
-    'page arguments' => array('list'),
-  );
-
-  $items['admin/structure/sparql_registry/list'] = array(
-    'title' => 'List',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-
-  $items['admin/structure/sparql_registry/create'] = array(
-    'title' => 'Add SPARQL endpoint',
-    'page arguments' => array('create'),
-    'access arguments' => array('administer sparql registry'),
-    'type' => MENU_LOCAL_ACTION,
-  );
-
-  return $items;
-}
-
-/**
- * Implements hook_entity_info().
- */
-function sparql_registry_entity_info() {
-  $return = array(
-    'sparql_registry' => array(
-      'label' => t('SPARQL Endpoints Registry'),
-      'base table' => 'sparql_registry',
-      'uri callback' => 'sparql_registry_uri',
-      'fieldable' => FALSE,
-      'entity keys' => array(
-        'id' => 'srid',
-      ),
-      'bundles' => array(
-        'sparql_registry' => array(
-          'label' => t('SPARQL Endpoints Registry Item'),
-          'admin' => array(
-            'path' => 'admin/structure/sparql_registry',
-          ),
-        ),
-      ),
-    ),
-  );
-  return $return;
-}
-
-/**
- * Entity uri callback.
- */
-function sparql_registry_uri($sparql_registry) {
-  return array(
-    'path' => 'sparql_registry/' . $sparql_registry->srid,
-  );
-}
-
-/**
- * Implements hook_admin_paths().
- */
-function sparql_registry_admin_paths() {
-  $paths = array(
-    'sparql_registry/*/edit' => TRUE,
-    'sparql_registry/*/delete' => TRUE,
-  );
-  return $paths;
-}
-
-function sparql_registry_load($srid, $reset = FALSE) {
-  $sparql_registry = sparql_registry_load_multiple(array($srid), array(), $reset);
-  return reset($sparql_registry);
-}
-
-function sparql_registry_load_by_uri($uri, $reset = FALSE) {
-  $query = new EntityFieldQuery();
-  $query
-    ->entityCondition('entity_type', 'sparql_registry', '=')
-    ->propertyCondition('endpoint', $uri, '=');
-  $result = $query->execute();
-
-  // The endpoint is in a double nested array. Use reset to pull it out.
-  $endpoint = reset(reset($result));
-  $srid = $endpoint->srid;
-
-  $sparql_registry = sparql_registry_load_multiple(array($srid), array(), $reset);
-  return reset($sparql_registry);
-}
-
-function sparql_registry_load_multiple($srids = FALSE, $conditions = array(), $reset = FALSE) {
-  return entity_load('sparql_registry', $srids, $conditions, $reset);
-}
-
-function sparql_registry_delete($srid) {
-  sparql_registry_delete_multiple(array($srid));
-}
-
-function sparql_registry_delete_multiple($srids) {
-  if (!empty($srids)) {
-    db_delete('sparql_registry')
-     ->condition('srid', $srids, 'IN')
-     ->execute();
-
-    entity_get_controller('sparql_registry')->resetCache();
-  }
-}
-
-function sparql_registry_page_title($sparql_registry) {
-  return check_plain($sparql_registry->title);
-}
-
-/**
- * Save the SPARQL registry form values to the database.
- */
-function sparql_registry_save(&$edit) {
-  // If there is an existing endpoint record, update the record. Otherwise,
-  // insert a new endpoint record.
-  if (!empty($edit->srid)) {
-    drupal_write_record('sparql_registry', $edit, 'srid');
-    module_invoke_all('entity_update', 'sparql_registry', $edit);
-  }
-  else {
-    drupal_write_record('sparql_registry', $edit);
-    module_invoke_all('entity_insert', 'sparql_registry', $edit);
-  }
-
-  return $edit;
-}
-
-function sparql_registry_page_admin($tab = '') {
-  switch ($tab) {
-    case 'create':
-      $build['sparql_registry_create'] = drupal_get_form('sparql_registry_form_edit');
-      break;
-    default:
-      $build['sparql_registry_list'] = drupal_get_form('sparql_registry_form_list');
-  }
-  return $build;
-}
-
-function sparql_registry_form_list() {
-  $header = array(
-    'title' => array('data' => t('Title'), 'field' => 'sr.title'),
-    'endpoint' => array('data' => t('Endpoint'), 'field' => 'endpoint'),
-    'dataset' => array('data' => t('Dataset'), 'field' => 'dataset'),
-    'edit' => array('data' => t('Edit')),
-    'delete' => array('data' => t('Delete')),
-  );
-  $query = db_select('sparql_registry', 'sr');
-  $count_query = clone $query;
-  $count_query->addExpression('COUNT(sr.srid)');
-
-  $query = $query->extend('PagerDefault')->extend('TableSort');
-  $query
-    ->fields('sr', array('srid', 'title', 'endpoint', 'dataset'))
-    ->limit(20)
-    ->orderByHeader($header)
-    ->setCountQuery($count_query);
-  $result = $query->execute();
-
-  $destination = drupal_get_destination();
-
-  $options = array();
-  foreach ($result as $row) {
-    $options[$row->srid] = array(
-      'title' => $row->title,
-      'endpoint' => $row->endpoint,
-      'dataset' => $row->dataset,
-      'edit' => array('data' => array(
-        '#type' => 'link',
-        '#title' => t('edit'),
-        '#href' => "sparql_registry/$row->srid/edit",
-        '#options' => array('query' => $destination),
-      )),
-      'delete' => array('data' => array(
-        '#type' => 'link',
-        '#title' => t('delete'),
-        '#href' => "sparql_registry/$row->srid/delete",
-        '#options' => array('query' => $destination),
-      )),
-    );
-  }
-
-  $form['sparql_registry'] = array(
-    '#type' => 'tableselect',
-    '#header' => $header,
-    '#options' => $options,
-    '#empty' => t('No entities available.'),
-  );
-  $form['pager']['#markup'] = theme('pager');
-
-  return $form;
-}
-
-function sparql_registry_form_edit($form, &$form_state, $edit = NULL) {
-  if (!isset($edit)) {
-    $edit = (object) array(
-      'title' => '',
-      'endpoint' => '',
-      'dataset' => '',
-    );
-  }
-  $form['title'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Title'),
-    '#default_value' => $edit->title,
-    '#required' => TRUE,
-  );
-  $form['endpoint'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Endpoint'),
-    '#default_value' => $edit->endpoint,
-    '#required' => TRUE,
-  );
-  $form['dataset'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Dataset'),
-    '#default_value' => $edit->dataset,
-    '#required' => FALSE,
-  );
-
-  // Store ID if any.
-  if (!empty($edit->srid)) {
-    $form['srid'] = array(
-      '#type' => 'value',
-      '#value' => $edit->srid,
-    );
-  }
-  $form['actions'] = array('#type' => 'actions');
-  $form['actions']['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Save'),
-    '#weight' => 5,
-  );
-
-  return $form;
-}
-
-function sparql_registry_form_edit_validate($form, &$form_state) {
-  // Check if endpoint has a valid url.
-  if (!valid_url($form_state['values']['endpoint'], TRUE)) {
-    form_set_error('endpoint', 'Endpoint value is not a valid url');
-  }
-}
-
-function sparql_registry_form_edit_submit($form, &$form_state) {
-  $edit = (object) $form_state['values'];
-  // Save own data.
-  sparql_registry_save($edit);
-  $form_state['redirect'] = "admin/structure/sparql_registry";
-}
-
-function sparql_registry_delete_confirm($form, &$form_state, $sparql_registry) {
-  $form['#sparql_registry'] = $sparql_registry;
-  $form['srid'] = array('#type' => 'value', '#value' => $sparql_registry->srid);
-  return confirm_form($form,
-    t('Are you sure you want to delete %title?', array('%title' => $sparql_registry->title)),
-    'sparql_registry/' . $sparql_registry->srid,
-    t('This action cannot be undone.'),
-    t('Delete'),
-    t('Cancel')
-  );
-}
-
-function sparql_registry_delete_confirm_submit($form, &$form_state) {
-  if ($form_state['values']['confirm']) {
-    $sparql_registry = sparql_registry_load($form_state['values']['srid']);
-    sparql_registry_delete($form_state['values']['srid']);
-    watchdog('sparql_registry', 'deleted %title.', array('%title' => $sparql_registry->title));
-    drupal_set_message(t('%title has been deleted.', array('%title' => $sparql_registry->title)));
-  }
-
-  $form_state['redirect'] = "admin/structure/sparql_registry";
-}