diff --git a/user_relationship_blocks/user_relationship_blocks.module b/user_relationship_blocks/user_relationship_blocks.module
index 1dd155c..044fdef 100644
--- a/user_relationship_blocks/user_relationship_blocks.module
+++ b/user_relationship_blocks/user_relationship_blocks.module
@@ -406,8 +406,8 @@ function template_preprocess_user_relationships_actions_block(&$variables) {
   $account  =& $variables['account'];
 
   if ($user != $account) {
-    $variables['current_relationships'] = _user_relationships_ui_actions_between($user, $account, array('remove' => 1));
+    $variables['current_relationships'] = user_relationships_actions_between($user, $account, array('remove' => 1));
   }
 
-  $variables['actions'] = _user_relationships_ui_actions_between($user, $account, array('add' => 1, 'requested' => 1, 'received' => 1));
+  $variables['actions'] = user_relationships_actions_between($user, $account, array('add' => 1, 'requested' => 1, 'received' => 1));
 }
diff --git a/user_relationships.module b/user_relationships.module
index 3e20d7f..10f9694 100644
--- a/user_relationships.module
+++ b/user_relationships.module
@@ -945,3 +945,148 @@ function user_relationships_ui_locale($op = 'groups') {
       return array('user_relationships' => t('User Relationships'));
   }
 }
+
+
+/**
+ * Adds autocompletion capability
+ */
+function user_relationships_autocomplete_types($string = '') {
+  $matches = array();
+  if ($string) {
+    $result = db_query_range("SELECT rtid, name FROM {user_relationship_types} WHERE LOWER(name) LIKE LOWER(:string)", 0, 10, array(':string' => '%' . strtolower($string) . '%'));
+    foreach ($result as $relationship) {
+      $matches[$relationship->name] = check_plain(ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name));
+   }
+  }
+  print drupal_json_output($matches);
+}
+
+/**
+ * List of possible relationship actions with between two users.
+ *
+ * @param $viewer
+ *   User object for the visitor.
+ * @param $viewed
+ *   User object for the user being looked at.
+ * @param action_types
+ *   Associative array of kinds of links to show (all by default).
+ *   Only the existence of specific array keys is needed: add, remove,
+ *   requested, received.
+ *
+ * @return
+ *   An array with actions as strings.
+ */
+function user_relationships_actions_between($viewer, $viewed, $action_types = array('add' => 1, 'remove' => 1, 'requested' => 1, 'received' => 1)) {
+  if ($viewer->uid == $viewed->uid) {
+    return;
+  }
+
+  $list = array();
+
+  if (isset($action_types['requested'])) {
+    $relationships = user_relationships_load(array('requester_id' => $viewer->uid, 'requestee_id' => $viewed->uid, 'approved' => FALSE));
+    foreach ($relationships as $relationship) {
+      $list[] = t('You have sent a new %relationship_name request to this user. (!pending_requests)', array(
+        '%relationship_name'  => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
+        '!pending_requests'   => l(t('pending requests'), "relationships/sent"),
+      ));
+    }
+  }
+
+  if (isset($action_types['received'])) {
+    $relationships = user_relationships_load(array('requester_id' => $viewed->uid, 'requestee_id' => $viewer->uid, 'approved' => FALSE));
+    foreach ($relationships as $relationship) {
+      $list[] = t('This user has requested to be your %relationship_name. (!pending_requests)', array(
+        '%relationship_name'  => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
+        '!pending_requests'   => l(t('pending requests'), "user/{$viewer->uid}/relationships/received"),
+      ));
+    }
+  }
+
+  if (isset($action_types['add'])) {
+    $relationships = user_relationships_get_requestable_rtypes($viewer, $viewed, 'full');
+    if ($relationships) {
+      // If configured, create direct links.
+      if (variable_get('user_relationships_show_direct_links', 1)) {
+        // Create a single link, or one for each relationship type.
+        foreach ($relationships as $relationship) {
+          $list[] = theme('user_relationships_request_relationship_direct_link', array('relate_to' => $viewed, 'relationship_type' => $relationship));
+        }
+      }
+      // just one generic link pointing to a page with dropdown.
+      else {
+        $list[] = theme('user_relationships_request_relationship_link', array('relate_to' => $viewed));
+      }
+    }
+  }
+
+  if (isset($action_types['remove'])) {
+    $relationships = user_relationships_load(array('between' => array($viewer->uid, $viewed->uid)));
+    foreach ($relationships as $relationship) {
+      if ($relationship->approved && !isset($list[$relationship->rid])) {
+        $list[$relationship->rid] = t('%relationship_name (!remove_link)', array(
+          '%relationship_name'  => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name) . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
+          '!remove_link'        => theme('user_relationships_remove_link', array('uid' => $viewer->uid, 'rid' => $relationship->rid)),
+        ));
+      }
+    }
+  }
+
+  return $list;
+}
+
+/**
+ * Get relationship types that a user can request from another user.
+ *
+ * @param $requester
+ *   Requesting user object.
+ * @param $requestee
+ *   The requestee user object.
+ * @param $return
+ *   What should be returned, either name for the translated relationship name
+ *   or full for the whole object. Defaults to name.
+ *
+ * @return
+ *   An array of relationship types a user can request from another, keyed by
+ *   the relationship type id and either the name or full object as value,
+ *   depending on the return argument.
+ */
+function user_relationships_get_requestable_rtypes($requester, $requestee, $return = 'name') {
+  $current_relationships = user_relationships_load(array('between' => array($requester->uid, $requestee->uid)), array('sort' => 'rtid'));
+
+  $relationship_types = user_relationships_types_load();
+  $relationships = array();
+  foreach ($relationship_types as $rtype) {
+
+    // Exclude types that are not allowed.
+    if (!user_relationships_can_request($requester, $rtype) || !user_relationships_can_receive($requestee, $rtype)) {
+      continue;
+    }
+
+    // If there is a relationship o that type already, make further checks.
+    if (isset($current_relationships[$rtype->rtid])) {
+      $relationship = $current_relationships[$rtype->rtid];
+      if (is_array($relationship) && count($relationship)) {
+        $relationship = $relationship[0];
+      }
+
+      // Skip two-way relationships, one-way non-reciprocal relationships, or
+      // reciprocal where this direction already exists.
+      if (isset($current_relationships[$rtype->rtid]) && (!$rtype->is_oneway || !$rtype->is_reciprocal || (isset($relationship) && $relationship->requester_id == $requester->uid))) {
+        // If users can't have multiple relationships, we're done here.
+        // Return an empty array.
+        if (!variable_get('user_relationships_allow_multiple', TRUE)) {
+          return array();
+        }
+        continue;
+      }
+    }
+    if ($return == 'name') {
+      $relationships[$rtype->rtid] = ur_tt("user_relationships:rtid:$rtype->rtid:name", $rtype->name);
+    }
+    else {
+      $relationships[$rtype->rtid] = $rtype;
+    }
+  }
+  return $relationships;
+}
diff --git a/user_relationships_ui/user_relationships_ui.forms.inc b/user_relationships_ui/user_relationships_ui.forms.inc
index 41b9eaa..d15ce41 100644
--- a/user_relationships_ui/user_relationships_ui.forms.inc
+++ b/user_relationships_ui/user_relationships_ui.forms.inc
@@ -13,7 +13,7 @@ module_load_include('inc', 'user_relationships_ui', 'user_relationships_ui.actio
  * @param $form_values array $form['values'] when called from form_alter()
  */
 function user_relationships_ui_request_form($requester, $requestee, $form_values = NULL) {
-  $relationships = user_relationships_ui_get_requestable_rtypes($requester, $requestee);
+  $relationships = user_relationships_get_requestable_rtypes($requester, $requestee);
   //try to find out desired relationship type
   $default_relationship = NULL;
   if (isset($form_values['rtid'])) {//given through form
diff --git a/user_relationships_ui/user_relationships_ui.module b/user_relationships_ui/user_relationships_ui.module
index b9bce43..198abad 100644
--- a/user_relationships_ui/user_relationships_ui.module
+++ b/user_relationships_ui/user_relationships_ui.module
@@ -38,150 +38,6 @@ function _user_relationships_ui_set_notifications(&$account) {
   }
 }
 
-/**
- * Adds autocompletion capability
- */
-function _user_relationships_ui_autocomplete_types($string = '') {
-  $matches = array();
-  if ($string) {
-    $result = db_query_range("SELECT rtid, name FROM {user_relationship_types} WHERE LOWER(name) LIKE LOWER(:string)", 0, 10, array(':string' => '%' . strtolower($string) . '%'));
-    foreach ($result as $relationship) {
-      $matches[$relationship->name] = check_plain(ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name));
-   }
-  }
-  print drupal_json_output($matches);
-}
-
-/**
- * List of possible relationship actions with between two users.
- *
- * @param $viewer
- *   User object for the visitor.
- * @param $viewed
- *   User object for the user being looked at.
- * @param action_types
- *   Associative array of kinds of links to show (all by default).
- *   Only the existence of specific array keys is needed: add, remove,
- *   requested, received.
- *
- * @return
- *   An array with actions as strings.
- */
-function _user_relationships_ui_actions_between($viewer, $viewed, $action_types = array('add' => 1, 'remove' => 1, 'requested' => 1, 'received' => 1)) {
-  if ($viewer->uid == $viewed->uid) {
-    return;
-  }
-
-  $list = array();
-
-  if (isset($action_types['requested'])) {
-    $relationships = user_relationships_load(array('requester_id' => $viewer->uid, 'requestee_id' => $viewed->uid, 'approved' => FALSE));
-    foreach ($relationships as $relationship) {
-      $list[] = t('You have sent a new %relationship_name request to this user. (!pending_requests)', array(
-        '%relationship_name'  => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
-        '!pending_requests'   => l(t('pending requests'), "relationships/sent"),
-      ));
-    }
-  }
-
-  if (isset($action_types['received'])) {
-    $relationships = user_relationships_load(array('requester_id' => $viewed->uid, 'requestee_id' => $viewer->uid, 'approved' => FALSE));
-    foreach ($relationships as $relationship) {
-      $list[] = t('This user has requested to be your %relationship_name. (!pending_requests)', array(
-        '%relationship_name'  => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
-        '!pending_requests'   => l(t('pending requests'), "user/{$viewer->uid}/relationships/received"),
-      ));
-    }
-  }
-
-  if (isset($action_types['add'])) {
-    $relationships = user_relationships_ui_get_requestable_rtypes($viewer, $viewed, 'full');
-    if ($relationships) {
-      // If configured, create direct links.
-      if (variable_get('user_relationships_show_direct_links', 1)) {
-        // Create a single link, or one for each relationship type.
-        foreach ($relationships as $relationship) {
-          $list[] = theme('user_relationships_request_relationship_direct_link', array('relate_to' => $viewed, 'relationship_type' => $relationship));
-        }
-      }
-      // just one generic link pointing to a page with dropdown.
-      else {
-        $list[] = theme('user_relationships_request_relationship_link', array('relate_to' => $viewed));
-      }
-    }
-  }
-
-  if (isset($action_types['remove'])) {
-    $relationships = user_relationships_load(array('between' => array($viewer->uid, $viewed->uid)));
-    foreach ($relationships as $relationship) {
-      if ($relationship->approved && !isset($list[$relationship->rid])) {
-        $list[$relationship->rid] = t('%relationship_name (!remove_link)', array(
-          '%relationship_name'  => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name) . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
-          '!remove_link'        => theme('user_relationships_remove_link', array('uid' => $viewer->uid, 'rid' => $relationship->rid)),
-        ));
-      }
-    }
-  }
-
-  return $list;
-}
-
-/**
- * Get relationship types that a user can request from another user.
- *
- * @param $requester
- *   Requesting user object.
- * @param $requestee
- *   The requestee user object.
- * @param $return
- *   What should be returned, either name for the translated relationship name
- *   or full for the whole object. Defaults to name.
- *
- * @return
- *   An array of relationship types a user can request from another, keyed by
- *   the relationship type id and either the name or full object as value,
- *   depending on the return argument.
- */
-function user_relationships_ui_get_requestable_rtypes($requester, $requestee, $return = 'name') {
-  $current_relationships = user_relationships_load(array('between' => array($requester->uid, $requestee->uid)), array('sort' => 'rtid'));
-
-  $relationship_types = user_relationships_types_load();
-  $relationships = array();
-  foreach ($relationship_types as $rtype) {
-
-    // Exclude types that are not allowed.
-    if (!user_relationships_can_request($requester, $rtype) || !user_relationships_can_receive($requestee, $rtype)) {
-      continue;
-    }
-
-    // If there is a relationship o that type already, make further checks.
-    if (isset($current_relationships[$rtype->rtid])) {
-      $relationship = $current_relationships[$rtype->rtid];
-      if (is_array($relationship) && count($relationship)) {
-        $relationship = $relationship[0];
-      }
-
-      // Skip two-way relationships, one-way non-reciprocal relationships, or
-      // reciprocal where this direction already exists.
-      if (isset($current_relationships[$rtype->rtid]) && (!$rtype->is_oneway || !$rtype->is_reciprocal || (isset($relationship) && $relationship->requester_id == $requester->uid))) {
-        // If users can't have multiple relationships, we're done here.
-        // Return an empty array.
-        if (!variable_get('user_relationships_allow_multiple', TRUE)) {
-          return array();
-        }
-        continue;
-      }
-    }
-    if ($return == 'name') {
-      $relationships[$rtype->rtid] = ur_tt("user_relationships:rtid:$rtype->rtid:name", $rtype->name);
-    }
-    else {
-      $relationships[$rtype->rtid] = $rtype;
-    }
-  }
-  return $relationships;
-}
-
 
 /**********************************
  *          CALLBACKS
@@ -304,11 +160,10 @@ function user_relationships_ui_menu() {
   $items['relationship_types/autocomplete'] = array(
     'title' => 'User Relationships Autocomplete',
     'type' => MENU_CALLBACK,
-    'page callback' => '_user_relationships_ui_autocomplete_types',
+    'page callback' => 'user_relationships_autocomplete_types',
     'access callback' => 'user_access',
     'access arguments' => array('administer user relationships'),
   );
-
   $items['relationships'] = array(
     'title' => 'My relationships',
     'type' => MENU_NORMAL_ITEM,
@@ -516,7 +371,7 @@ function user_relationships_ui_user_view($account, $view_mode) {
   }
 
   $output = array();
-  if (user_access('view user relationships') && ($list = _user_relationships_ui_actions_between($user, $account, array('remove' => 1)))) {
+  if (user_access('view user relationships') && ($list = user_relationships_actions_between($user, $account, array('remove' => 1)))) {
     $output['relations'] = array(
       '#title'      => t('Your relationships to this user'),
       '#type'       => 'user_profile_item',
@@ -525,7 +380,7 @@ function user_relationships_ui_user_view($account, $view_mode) {
     );
   }
 
-  if ($actions = _user_relationships_ui_actions_between($user, $account, array('add' => 1, 'requested' => 1, 'received' => 1))) {
+  if ($actions = user_relationships_actions_between($user, $account, array('add' => 1, 'requested' => 1, 'received' => 1))) {
     $output['actions'] = array(
       '#title'      => t('Relationship actions'),
       '#type'       => 'user_profile_item',