diff --git a/includes/SendingSMS.doc b/includes/SendingSMS.doc
old mode 100644
new mode 100755
diff --git a/includes/YoPaymentsAPI.inc b/includes/YoPaymentsAPI.inc
old mode 100644
new mode 100755
diff --git a/includes/YoPaymentsAPI.php b/includes/YoPaymentsAPI.php
old mode 100644
new mode 100755
diff --git a/includes/example.php b/includes/example.php
old mode 100644
new mode 100755
diff --git a/includes/ybsclientlib.phplib b/includes/ybsclientlib.phplib
old mode 100644
new mode 100755
diff --git a/sms_yo_uganda.api.inc b/sms_yo_uganda.api.inc
old mode 100644
new mode 100755
diff --git a/sms_yo_uganda.info b/sms_yo_uganda.info
old mode 100644
new mode 100755
index 63fa983..722e6ba
--- a/sms_yo_uganda.info
+++ b/sms_yo_uganda.info
@@ -10,3 +10,10 @@ version = ""
 project = "sms_yo_uganda"
 datestamp = "1370861724"
 
+
+
+; Information added by drush on 2013-06-20
+version = ""
+project = "sms_yo_uganda"
+datestamp = "1371726290"
+
diff --git a/sms_yo_uganda.install b/sms_yo_uganda.install
old mode 100644
new mode 100755
diff --git a/sms_yo_uganda.module b/sms_yo_uganda.module
old mode 100644
new mode 100755
index 516090a..e50c4e8
--- a/sms_yo_uganda.module
+++ b/sms_yo_uganda.module
@@ -7,8 +7,8 @@
 /**
  * Implementing hook_menu().
  */
-function yo_uganda_menu() {
-  $items['admin/config/yo_uganda'] = array(
+function sms_yo_uganda_menu() {
+  $items['admin/config/sms_yo_uganda'] = array(
     'title' => t("Yo! Uganda settings"),
     'description' => t("This is the page for various settings for Yo! Uganda."),
     'position' => 'right',
@@ -18,18 +18,18 @@ function yo_uganda_menu() {
     'file' => 'system.admin.inc',
     'file path' => drupal_get_path('module', 'system'),
   );
-  $items['admin/config/yo_uganda/settings'] = array(
+  $items['admin/config/sms_yo_uganda/settings'] = array(
     'title' => t('Yo! Uganda Settings'),
     'description' => t('Set general Yo! Uganda Settings.'),
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('yo_uganda_settings'),
+    'page arguments' => array('sms_yo_uganda_settings'),
     'access arguments' => array('administer site configuration'),
   );
   $items['sms/yo/receive'] = array(
     'title' => t('Yo Receive'),
-    'page callback' => 'yo_uganda_receive_sms',
+    'page callback' => 'sms_yo_uganda_receive_sms',
     'description' => t('function for incoming sms from yo'),
-    'access callback' => 'yo_uganda_access_incoming',
+    'access callback' => 'sms_yo_uganda_access_incoming',
     'type' => MENU_CALLBACK,
   );
   return $items;
@@ -48,101 +48,101 @@ function yo_uganda_menu() {
  *   41.220.12.205
  *   212.88.103.182
  */
-function yo_uganda_settings() {
+function sms_yo_uganda_settings() {
 
   $form['sms'] = array (
     '#type' => 'fieldset',
     '#title' => 'Yo! SMS',
   );
-  $form['sms']['yo_uganda_sms_yo_accountnumber'] = array(
+  $form['sms']['sms_yo_uganda_sms_yo_accountnumber'] = array(
     '#type' => 'textfield',
     '#title' => t('Yo! SMS Account Number'),
     '#description' => t('The Yo! SMS Account Number.'),
     '#size' => 40,
     '#maxlength' => 255,
-    '#default_value' => variable_get('yo_uganda_sms_accountnumber', ''),
+    '#default_value' => variable_get('sms_yo_uganda_sms_accountnumber', ''),
   );
-  $form['sms']['yo_uganda_sms_incoming_server_ip1'] = array(
+  $form['sms']['sms_yo_uganda_sms_incoming_server_ip1'] = array(
     '#type' => 'textfield',
     '#title' => t('Incoming Server IP Address 1'),
     '#description' => t('Will only accept incoming connections from this IP address. It is highly recommended to provide this value.'),
     '#size' => 15,
     '#maxlength' => 15,
-    '#default_value' => variable_get('yo_uganda_incoming_server_ip1',''),
+    '#default_value' => variable_get('sms_yo_uganda_incoming_server_ip1',''),
   );
-  $form['sms']['yo_uganda_sms_incoming_server_ip2'] = array(
+  $form['sms']['sms_yo_uganda_sms_incoming_server_ip2'] = array(
     '#type' => 'textfield',
     '#title' => t('Incoming Server IP Address 2'),
     '#description' => t('Will only accept incoming connections from this IP address. It is highly recommended to provide this value.'),
     '#size' => 15,
     '#maxlength' => 15,
-    '#default_value' => variable_get('yo_uganda_incoming_server_ip2', ''),
+    '#default_value' => variable_get('sms_yo_uganda_incoming_server_ip2', ''),
   );
 
   $form['payment'] = array (
     '#type' => 'fieldset',
     '#title' => 'Yo! Payment',
   );
-  $form['payment']['yo_uganda_payment_username'] = array(
+  $form['payment']['sms_yo_uganda_payment_username'] = array(
     '#type' => 'textfield',
     '#title' => t('Username'),
     '#description' => t('The Yo! Payment Username.'),
     '#size' => 40,
     '#maxlength' => 255,
-    '#default_value' => variable_get('yo_uganda_payment_username', ''),
+    '#default_value' => variable_get('sms_yo_uganda_payment_username', ''),
   );
-  $form['payment']['yo_uganda_payment_password'] = array(
+  $form['payment']['sms_yo_uganda_payment_password'] = array(
     '#type' => 'textfield',
     '#title' => t('Password'),
     '#description' => t('The Yo! Payment password.'),
     '#size' => 40,
     '#maxlength' => 255,
-    '#default_value' => variable_get('yo_uganda_payment_password', ''),
+    '#default_value' => variable_get('sms_yo_uganda_payment_password', ''),
   );
-  $form['payment']['yo_uganda_payment_server_1'] = array(
+  $form['payment']['sms_yo_uganda_payment_server_1'] = array(
     '#type' => 'textfield',
     '#title' => t('Payment Server #1'),
     '#description' => t('Will try to send payments here. Production value is https://paymentsapi1.yo.co.ug/ybs/task.php Sandbox is https://41.220.12.206/services/yopaymentsdev/task.php'),
     '#size' => 60,
     '#maxlength' => 255,
-    '#default_value' => variable_get('yo_uganda_payment_server_1', 'https://41.220.12.206/services/yopaymentsdev/task.php'),
+    '#default_value' => variable_get('sms_yo_uganda_payment_server_1', 'https://41.220.12.206/services/yopaymentsdev/task.php'),
   );
-  $form['payment']['yo_uganda_payment_server_2'] = array(
+  $form['payment']['sms_yo_uganda_payment_server_2'] = array(
     '#type' => 'textfield',
     '#title' => t('Payment Server #2'),
     '#description' => t('Will try to send payments here, too. Production value is https://paymentsapi2.yo.co.ug/ybs/task.php'),
     '#size' => 60,
     '#maxlength' => 255,
-    '#default_value' => variable_get('yo_uganda_payment_server_2', 'https://41.220.12.206/services/yopaymentsdev/task.php'),
+    '#default_value' => variable_get('sms_yo_uganda_payment_server_2', 'https://41.220.12.206/services/yopaymentsdev/task.php'),
   );
-  $form['payment']['yo_uganda_payment_type'] = array(
+  $form['payment']['sms_yo_uganda_payment_type'] = array(
     '#type' => 'radios',
     '#title' => t('Airtime or Mobile Money'),
     '#description' => t('Type of payment to use (Airtime or Mobile Money).'),
     '#options' => array('airtime' => 'Airtime', 'mobile money' => 'Mobile Money'),
     '#default_value' => variable_get('yo_uganda_payment_type', 'airtime'),
   );
-  $form['payment']['yo_uganda_payment_amount'] = array(
+  $form['payment']['sms_yo_uganda_payment_amount'] = array(
     '#type' => 'textfield',
     '#title' => t('Amount'),
     '#description' => t('Amount to be transferred in UGX. If you choose for Airtime, it will be calculated from this amount.'),
     '#size' => 10,
     '#maxlength' => 10,
-    '#default_value' => variable_get('yo_uganda_payment_amount', 2000),
+    '#default_value' => variable_get('ysms_o_uganda_payment_amount', 2000),
   );
   $vocabularies = taxonomy_get_vocabularies();
   $options = array();
   foreach ($vocabularies as $vocabulary) {
     $options[$vocabulary->vid] = $vocabulary->name;
   }
-  $form['payment']['yo_uganda_payment_isp_vocabulary'] = array(
+  $form['payment']['sms_yo_uganda_payment_isp_vocabulary'] = array(
     '#type' => 'radios',
     '#title' => t('Vocabulary with the Internet Service Providers.'),
     '#description' => t('The Internet Service Providers that are active in Uganda.'),
     '#options' => $options,
-    '#default_value' => variable_get('yo_uganda_payment_isp_vocabulary', 0),
+    '#default_value' => variable_get('sms_yo_uganda_payment_isp_vocabulary', 0),
   );
-  $vocabulary = variable_get('yo_uganda_payment_isp_vocabulary', 0);
+  $vocabulary = variable_get('sms_yo_uganda_payment_isp_vocabulary', 0);
   if ($vocabulary) {
     $terms = taxonomy_get_tree($vocabulary, $parent = 0, $max_depth = 1);
     $providers = array();
@@ -150,27 +150,27 @@ function yo_uganda_settings() {
     foreach ($terms as $term) {
       $providers[$term->name] = $term->name;
       $default[$term->name] = '';
-      $form['payment']['yo_uganda_payment_internal_provider_name_' . $term->name] = array(
+      $form['payment']['sms_yo_uganda_payment_internal_provider_name_' . $term->name] = array(
         '#type' => 'textfield',
         '#title' => t('Internal Provider Name for ' . $term->name),
 //        '#description' => t('The name of the provider used by Yo! Uganda internally.'),
         '#weight' => 100 + $term->tid,
-        '#default_value' => variable_get('yo_uganda_payment_internal_provider_name_' . $term->name, $term->name),
+        '#default_value' => variable_get('sms_yo_uganda_payment_internal_provider_name_' . $term->name, $term->name),
       );
     }
-    $form['payment']['yo_uganda_payment_supported_providers'] = array(
+    $form['payment']['sms_yo_uganda_payment_supported_providers'] = array(
       '#type' => 'checkboxes',
       '#title' => t('Supported Mobile Airtime Providers'),
       '#description' => t('The Mobile Airtime Providers that are supported by Yo! Uganda.'),
       '#options' => $providers,
-      '#default_value' => variable_get('yo_uganda_payment_supported_providers', $default),
+      '#default_value' => variable_get('sms_yo_uganda_payment_supported_providers', $default),
     );
   }
 
   return system_settings_form($form);
 }
 
-function yo_uganda_settings_submit($form, $form_state) {
+function sms_yo_uganda_settings_submit($form, $form_state) {
   // all is fine
 
 }
@@ -184,8 +184,8 @@ function yo_uganda_settings_submit($form, $form_state) {
  *
  * Returns the internal name of the term with the provided name.
  */
-function yo_uganda_get_internal_provider_name($termname) {
-  return variable_get('yo_uganda_payment_internal_provider_name_' . $termname, 'MTN_UGANDA');
+function sms_yo_uganda_get_internal_provider_name($termname) {
+  return variable_get('sms_yo_uganda_payment_internal_provider_name_' . $termname, 'MTN_UGANDA');
 }
 
 /**
@@ -198,23 +198,23 @@ function yo_uganda_get_internal_provider_name($termname) {
  * @param String $phonenumber
  *   Phonenumber to send bandwidth to
  */
-function yo_uganda_send_airtime($phonenumber, $provider, $narrative, $transactionref = NULL, $externalref = NULL) {
+function sms_yo_uganda_send_airtime($phonenumber, $provider, $narrative, $transactionref = NULL, $externalref = NULL) {
   $method = 'acwithdrawfunds';
   $internetbundle = FALSE;
-  $paymenttype = variable_get('yo_uganda_payment_type', 'airtime');
+  $paymenttype = variable_get('sms_yo_uganda_payment_type', 'airtime');
   if ($paymenttype == 'airtime') {
     $method = 'acsendairtimemobile';
     $internetbundle = TRUE;
   }
   $price_per_mb = 200;
-  $amount = variable_get('yo_uganda_payment_amount', 2000);
+  $amount = variable_get('sms_yo_uganda_payment_amount', 2000);
   $bandwidth = $amount / $price_per_mb;
-  watchdog("yo_uganda_send_airtime", "Going to send $bandwidth MB to $phonenumber");
-  module_load_include('inc', 'yo_uganda', 'includes/YoPaymentsAPI');
+  watchdog("ysms_o_uganda_send_airtime", "Going to send $bandwidth MB to $phonenumber");
+  module_load_include('inc', 'sms_yo_uganda', 'includes/YoPaymentsAPI');
   $yo_payment = new YoPaymentAPI (
-    variable_get('yo_uganda_payment_username', ''),
-    variable_get('yo_uganda_payment_password', ''),
-    yo_uganda_get_payment_server()
+    variable_get('sms_yo_uganda_payment_username', ''),
+    variable_get('sms_yo_uganda_payment_password', ''),
+    sms_yo_uganda_get_payment_server()
   );
 
   /*
@@ -223,15 +223,15 @@ function yo_uganda_send_airtime($phonenumber, $provider, $narrative, $transactio
    * For creating a settings form, copy that from this module.
    */
 
-  $internalname = yo_uganda_get_internal_provider_name($provider);
+  $internalname = sms_yo_uganda_get_internal_provider_name($provider);
   $response = $yo_payment->withdrawFunds($method, $amount, $phonenumber, $internetbundle, $internalname, $narrative, NULL, NULL, $transactionref, $externalref);
 
-//watchdog('yo_uganda_send_airtime', 'Response keys = ' . implode(' | ', array_keys((array) $response)));
-//watchdog('yo_uganda_send_airtime', 'Response values = ' . implode(' | ', array_values((array) $response)));
+//watchdog('sms_yo_uganda_send_airtime', 'Response keys = ' . implode(' | ', array_keys((array) $response)));
+//watchdog('sms_yo_uganda_send_airtime', 'Response values = ' . implode(' | ', array_values((array) $response)));
 
   // Do some basic error reporting and handling here
   try {
-    yo_uganda_transaction_error($response);
+    sms_yo_uganda_transaction_error($response);
   }
   catch (Exception $e) {
     $transactionreference = (string) $response['TransactionReference'];
@@ -246,13 +246,13 @@ function yo_uganda_send_airtime($phonenumber, $provider, $narrative, $transactio
   return $response;
 }
 
-function yo_uganda_check_status($phonenumber, $transactionref) {
-  watchdog("yo_uganda_check_status", "Checking Yo! Transaction " . $transactionref);
-  module_load_include('inc', 'yo_uganda', 'includes/YoPaymentsAPI');
+function sms_yo_uganda_check_status($phonenumber, $transactionref) {
+  watchdog("sms_yo_uganda_check_status", "Checking Yo! Transaction " . $transactionref);
+  module_load_include('inc', 'sms_yo_uganda', 'includes/YoPaymentsAPI');
   $yo_payment = new YoPaymentAPI (
-    variable_get('yo_uganda_payment_username', ''),
-    variable_get('yo_uganda_payment_password', ''),
-    yo_uganda_get_payment_server()
+    variable_get('sms_yo_uganda_payment_username', ''),
+    variable_get('sms_yo_uganda_payment_password', ''),
+    sms_yo_uganda_get_payment_server()
   );
 
   /*
@@ -269,7 +269,7 @@ function yo_uganda_check_status($phonenumber, $transactionref) {
 
   // Do some basic error reporting and handling here
   try {
-    yo_uganda_transaction_error($response);
+    sms_yo_uganda_transaction_error($response);
   }
   catch (Exception $e) {
     throw new Exception('Failed to follow up on transaction. Transaction Reference: ' . $transactionref, $e->getCode(), $e);
@@ -278,11 +278,11 @@ function yo_uganda_check_status($phonenumber, $transactionref) {
   return $response;
 }
 
-function yo_uganda_get_payment_server() {
-  return variable_get('yo_uganda_payment_server_1', 'https://41.220.12.206/services/yopaymentsdev/task.php');
+function sms_yo_uganda_get_payment_server() {
+  return variable_get('sms_yo_uganda_payment_server_1', 'https://41.220.12.206/services/yopaymentsdev/task.php');
 }
 
-function yo_uganda_transaction_error($response) {
+function sms_yo_uganda_transaction_error($response) {
   $status = (string) $response['Status'];
   $statuscode = (string) $response['StatusCode'];
   $statusmessage = (string) $response['StatusMessage'];
@@ -354,25 +354,25 @@ function yo_uganda_transaction_error($response) {
     // We have a response
     // and the response holds at least a Status and a StatusCode
     if (in_array($statuscode, array_keys($statuscodes))) {
-      watchdog('yo_uganda_transaction_error', $status . ' ' . $statuscode . ': ' . $statuscodes[$statuscode]);
+      watchdog('sms_yo_uganda_transaction_error', $status . ' ' . $statuscode . ': ' . $statuscodes[$statuscode]);
       if (!empty($statusmessage)) {
-        watchdog('yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Status Message "' . $statusmessage . '"');
+        watchdog('sms_yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Status Message "' . $statusmessage . '"');
       }
       if (!empty($errormessage)) {
-        watchdog('yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Error Message "' . $errormessage . '"');
+        watchdog('sms_yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Error Message "' . $errormessage . '"');
       }
       if (!empty($transactionstatus)) {
-        watchdog('yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Transaction Status "' . $transactionstatus . '"');
+        watchdog('sms_yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Transaction Status "' . $transactionstatus . '"');
       }
       if (!empty($transactionreference)) {
-        watchdog('yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Transaction Reference "' . $transactionreference . '"');
+        watchdog('sms_yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Transaction Reference "' . $transactionreference . '"');
       }
       if ($statuscode != '0') {
         throw new Exception($status . ' ' . $statuscode . ': ' . $statuscodes[$statuscode] . '. Check the error logs for details.', $statuscode);
       }
     }
     else {
-      watchdog('yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Unknown StatusCode. Please contact Yo! Uganda for details.');
+      watchdog('sms_yo_uganda_transaction_error', $status . ' ' . $statuscode . ': Unknown StatusCode. Please contact Yo! Uganda for details.');
       throw new Exception($status . ' ' . $statuscode . ': Unknown StatusCode. Please contact Yo! Uganda for details.', 9998);
     }
   }
@@ -384,7 +384,7 @@ function yo_uganda_transaction_error($response) {
     // 3.  Put all transaction processing queues on hold.
     // 4.  Start a separate queue that polls Yo! Uganda to see if the service is available again.
     // 5.  When the service becomes available again, stop the polling queue, send an email to the administrator and reverse steps 2 and 3.
-    watchdog('yo_uganda_transaction_error', $response . ': Service unavailable. Please contact Yo! Uganda for details.');
+    watchdog('sms_yo_uganda_transaction_error', $response . ': Service unavailable. Please contact Yo! Uganda for details.');
     throw new Exception($response . ': Service unavailable. Please contact Yo! Uganda for details.', 9999);
   }
 }
@@ -393,7 +393,7 @@ function yo_uganda_transaction_error($response) {
  * Implementation of hook_gateway_info().
  */
 
-function yo_uganda_gateway_info() {
+function sms_yo_uganda_gateway_info() {
   return array(
       'yo' => array(
           'name' => 'Yo! Uganda',
@@ -409,8 +409,8 @@ function yo_uganda_gateway_info() {
 /**
  * Callback for sending messages.
  */
-function yo_uganda_send($number, $message, $options) {
-  require_once(drupal_get_path('module', 'yo_uganda') .'/includes/ybsclientlib.phplib');
+function sms_yo_uganda_send($number, $message, $options) {
+  require_once(drupal_get_path('module', 'sms_yo_uganda') .'/includes/ybsclientlib.phplib');
   $gateway = sms_gateways('gateway', 'yo');
 
   if ($config == NULL) {
@@ -418,9 +418,9 @@ function yo_uganda_send($number, $message, $options) {
   }
 
   $number = '256' . trim ($number, "0");
-  watchdog ('yo_uganda', "Sending message to ". $number);
+  watchdog ('sms_yo_uganda', "Sending message to ". $number);
 
-  return sms_send_via_ybs($message, $number, variable_get('yo_uganda_sms_accountnumber', ''));
+  return sms_send_via_ybs($message, $number, variable_get('sms_yo_uganda_sms_accountnumber', ''));
 }
 
 /**
@@ -428,13 +428,13 @@ function yo_uganda_send($number, $message, $options) {
  * Not implemented
  * @return unknown
  */
-function yo_uganda_balance() {
+function sms_yo_uganda_balance() {
   //  $result = sms_yo_gateway_command('getbalance');
   return $result['data'];
 }
 
 
-function yo_uganda_country_codes() {
+function sms_yo_uganda_country_codes() {
   return array(
       256 => "Uganda",
   );
@@ -444,7 +444,7 @@ function yo_uganda_country_codes() {
 /**
  * Converts a string to USC-2 encoding if neccessary.
  */
-function yo_uganda_unicode($message) {
+function sms_yo_uganda_unicode($message) {
   if (function_exists('iconv')) {
     $latin = @iconv('UTF-8', 'ISO-8859-1', $message);
     if (strcmp($latin, $message)) {
@@ -455,12 +455,12 @@ function yo_uganda_unicode($message) {
   return FALSE;
 }
 
-function yo_uganda_format_number(&$number, $options = array()) {
+function sms_yo_uganda_format_number(&$number, $options = array()) {
   //  drupal_set_message("we are going to format the number ". $number);
 }
 
 
-function yo_uganda_validate_number(&$number, $options = array()) {
+function sms_yo_uganda_validate_number(&$number, $options = array()) {
 
   // strip non-numbers
   $number2 = preg_replace("/[^0-9]/", '', $number);
@@ -520,7 +520,7 @@ function yo_uganda_validate_number(&$number, $options = array()) {
 
 
 
-function yo_uganda_access_incoming( ) {
+function sms_yo_uganda_access_incoming( ) {
   $gateway = sms_gateways('gateway', 'yo');
   $config = $gateway['configuration'];
 
@@ -538,7 +538,7 @@ function yo_uganda_access_incoming( ) {
   return TRUE;
 }
 
-function yo_uganda_receive_sms() {
+function sms_yo_uganda_receive_sms() {
   //drupal_set_message("we are in");
   print("we are in");
   $number = $_REQUEST['from'];
@@ -574,13 +574,13 @@ function yo_uganda_receive_sms() {
 
 }
 
-function yo_uganda_incoming_callback() {
+function sms_yo_uganda_incoming_callback() {
   // Any necessary processing to extract the number and message
   sms_incoming($number, $message, $options);
 }
 
 
-function yo_uganda_utf8RawUrlDecode ($source) {
+function sms_yo_uganda_utf8RawUrlDecode ($source) {
   $decodedStr = "";
   $pos = 0;
   $len = strlen ($source);