diff --git a/globeconnect/certs/globe.crt b/certs/globe.crt
similarity index 100%
rename from globeconnect/certs/globe.crt
rename to certs/globe.crt
diff --git a/globeconnect/README.md b/globeconnect/README.md
deleted file mode 100644
index 3984eea..0000000
--- a/globeconnect/README.md
+++ /dev/null
@@ -1,185 +0,0 @@
-# Globe Connect for Node.JS
-
-## Introduction
-Globe Connect for Node.JS platform provides an implementation of Globe APIs e.g Authentication, Amax,
-Sms etc. that is easy to use and can be integrated in your existing Node.JS application. Below shows
-some samples on how to use the API depending on the functionality that you need to integrate in your
-application.
-
-## Basic Usage
-
-###### Figure 1. Authentication
-
-```javascript
-globe = require('globe-connect');
-
-oauth = globe.Oauth('[app_key]', '[app_secret]');
-
-// get redirect url
-url = oauth.getRedirectUrl();
-console.log(url);
-
-// get access token
-oauth.getAccessToken('[code]', function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body)
-});
-```
-
-###### Figure 2. Amax
-
-
-```javascript
-globe = require('globe-connect');
-amax = globe.Amax('[app_id]', '[app_secret]');
-amax.setToken('[token]');
-amax.setAddress('[address]');
-amax.setPromo('[promo]');
-amax.sendReward(function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body);
-});
-```
-
-###### Figure 3. Binary SMS
-
-```javascript
-globe = require('globe-connect');
-var sms = globe.Sms('[shortcode]', '[token]');
-
-sms.setUserDataHeader('06050423F423F4');
-sms.setDataEncodingScheme(1)
-sms.setReceiverAddress('+639065272450')
-sms.setMessage('samplebinarymessage')
-sms.sendBinaryMessage(function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body);
-})
-```
-
-###### Figure 4. Location
-
-```javascript
-globe = require('globe-connect');
-var amax = globe.Location('[token]');
-amax.setAddress('[address]');
-amax.setRequestedAccuracy('[accuracy]');
-amax.getLocation(function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body);
-});
-```
-
-###### Figure 5. Payment (Send Payment Request)
-
-
-```javascript
-globe = require('globe-connect');
-payment = globe.Payment('[token]');
-payment.setAmount('[amount]');
-payment.setDescription('[desciption]');
-payment.setEndUserId('[number]');
-payment.setReferenceCode('[referenceCode]');
-payment.setTransactionOperationStatus('[status]');
-payment.sendPaymentRequest(function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body);
-})
-```
-
-###### Figure 6. Payment (Get Last Reference ID)
-```javascript
-
-globe = require('globe-connect');
-payment = globe.Payment('[token]');
-payment.setAppKey('[app_key]');
-payment.setAppSecret('[app_secret]');
-payment.getLastReferenceCode(function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body);
-})
-```
-
-###### Figure 7. Sms
-
-```javascript
-globe = require('globe-connect');
-var sms = globe.Sms('[shortcode]', '[token]');
-
-/* SEND MESSAGE */
-sms.setReceiverAddress('[address]');
-sms.setMessage('[message]')
-sms.sendMessage(function(resCode, body){
-    // some code here
-    console.log(resCode);
-    console.log(body);
-});
-```
-
-
-###### Figure 8. Subscriber (Get Balance)
-
-
-```javsacript
-globe = require('globe-connect');
-subscriber = globe.Subscriber('[token]');
-subscriber.setAddres('[address]');
-subscriber.getSubscriberBalance(function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body);
-});
-```
-
-###### Figure 9. Subscriber (Get Reload Amount)
-
-```javascript
-globe = require('globe-connect');
-subscriber = globe.Subscriber('[token]');
-subscriber.setAddres('[address]');
-subscriber.getReloadAmount(function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body);
-});
-
-```
-
-###### Figure 10. USSD (Send)
-
-```javascript
-globe = require('globe-connect');
-ussd = globe.Ussd('[token]', '[shortcode]');
-
-ussd.setAddress('[address]');
-ussd.setUssdMessage('[message]');
-ussd.setFlash('[flash]');
-ussd.sendUssdRequest(function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body);
-});
-```
-
-###### Figure 11. USSD (Reply)
-
-```javascript
-globe = require('globe-connect');
-ussd = globe.Ussd('[token]', '[shortcode]');
-
-ussd.setAddress('[address]');
-ussd.setUssdMessage('[message]');
-ussd.setFlash('[flash]');
-ussd.setSessionId('[session_id]')
-ussd.replyUssdRequest(function(resCode, body) {
-    // some code here
-    console.log(resCode);
-    console.log(body);
-});
-```
diff --git a/globeconnect/index.js b/index.js
similarity index 100%
rename from globeconnect/index.js
rename to index.js
diff --git a/globeconnect/lib/amax.js b/lib/amax.js
similarity index 100%
rename from globeconnect/lib/amax.js
rename to lib/amax.js
diff --git a/globeconnect/lib/location.js b/lib/location.js
similarity index 100%
rename from globeconnect/lib/location.js
rename to lib/location.js
diff --git a/globeconnect/lib/oauth.js b/lib/oauth.js
similarity index 100%
rename from globeconnect/lib/oauth.js
rename to lib/oauth.js
diff --git a/globeconnect/lib/payment.js b/lib/payment.js
similarity index 100%
rename from globeconnect/lib/payment.js
rename to lib/payment.js
diff --git a/globeconnect/lib/sms.js b/lib/sms.js
similarity index 95%
rename from globeconnect/lib/sms.js
rename to lib/sms.js
index e235a22..42fbd71 100644
--- a/globeconnect/lib/sms.js
+++ b/lib/sms.js
@@ -91,12 +91,9 @@ var Sms = function(sender, token) {
         
         // prepare request payload
         var payload = {
-            "outboundSMSMessageRequest": {
-                "senderAddress": "tel:" + this.sender,
-                "outboundSMSTextMessage": {
-                    "message" : this.msg},
-                "address" : ["tel:" + this.address]}};
-        
+            message: this.msg, 
+            address: this.address
+        }
         // initialize curl
         var curl = new Curl();
         // set request url
diff --git a/globeconnect/lib/subscriber.js b/lib/subscriber.js
similarity index 100%
rename from globeconnect/lib/subscriber.js
rename to lib/subscriber.js
diff --git a/globeconnect/lib/ussd.js b/lib/ussd.js
similarity index 100%
rename from globeconnect/lib/ussd.js
rename to lib/ussd.js
diff --git a/globeconnect/lib/voice.js b/lib/voice.js
similarity index 100%
rename from globeconnect/lib/voice.js
rename to lib/voice.js
diff --git a/globeconnect/lib/voice/ask.js b/lib/voice/ask.js
similarity index 100%
rename from globeconnect/lib/voice/ask.js
rename to lib/voice/ask.js
diff --git a/globeconnect/lib/voice/call.js b/lib/voice/call.js
similarity index 100%
rename from globeconnect/lib/voice/call.js
rename to lib/voice/call.js
diff --git a/globeconnect/lib/voice/choices.js b/lib/voice/choices.js
similarity index 100%
rename from globeconnect/lib/voice/choices.js
rename to lib/voice/choices.js
diff --git a/globeconnect/lib/voice/conference.js b/lib/voice/conference.js
similarity index 100%
rename from globeconnect/lib/voice/conference.js
rename to lib/voice/conference.js
diff --git a/globeconnect/lib/voice/hangup.js b/lib/voice/hangup.js
similarity index 100%
rename from globeconnect/lib/voice/hangup.js
rename to lib/voice/hangup.js
diff --git a/globeconnect/lib/voice/joinprompt.js b/lib/voice/joinprompt.js
similarity index 100%
rename from globeconnect/lib/voice/joinprompt.js
rename to lib/voice/joinprompt.js
diff --git a/globeconnect/lib/voice/leaveprompt.js b/lib/voice/leaveprompt.js
similarity index 100%
rename from globeconnect/lib/voice/leaveprompt.js
rename to lib/voice/leaveprompt.js
diff --git a/globeconnect/lib/voice/machinedetection.js b/lib/voice/machinedetection.js
similarity index 100%
rename from globeconnect/lib/voice/machinedetection.js
rename to lib/voice/machinedetection.js
diff --git a/globeconnect/lib/voice/message.js b/lib/voice/message.js
similarity index 100%
rename from globeconnect/lib/voice/message.js
rename to lib/voice/message.js
diff --git a/globeconnect/lib/voice/on.js b/lib/voice/on.js
similarity index 100%
rename from globeconnect/lib/voice/on.js
rename to lib/voice/on.js
diff --git a/globeconnect/lib/voice/record.js b/lib/voice/record.js
similarity index 100%
rename from globeconnect/lib/voice/record.js
rename to lib/voice/record.js
diff --git a/globeconnect/lib/voice/redirect.js b/lib/voice/redirect.js
similarity index 100%
rename from globeconnect/lib/voice/redirect.js
rename to lib/voice/redirect.js
diff --git a/globeconnect/lib/voice/result.js b/lib/voice/result.js
similarity index 100%
rename from globeconnect/lib/voice/result.js
rename to lib/voice/result.js
diff --git a/globeconnect/lib/voice/say.js b/lib/voice/say.js
similarity index 100%
rename from globeconnect/lib/voice/say.js
rename to lib/voice/say.js
diff --git a/globeconnect/lib/voice/session.js b/lib/voice/session.js
similarity index 100%
rename from globeconnect/lib/voice/session.js
rename to lib/voice/session.js
diff --git a/globeconnect/lib/voice/startrecording.js b/lib/voice/startrecording.js
similarity index 100%
rename from globeconnect/lib/voice/startrecording.js
rename to lib/voice/startrecording.js
diff --git a/globeconnect/lib/voice/transcription.js b/lib/voice/transcription.js
similarity index 100%
rename from globeconnect/lib/voice/transcription.js
rename to lib/voice/transcription.js
diff --git a/globeconnect/lib/voice/transfer.js b/lib/voice/transfer.js
similarity index 100%
rename from globeconnect/lib/voice/transfer.js
rename to lib/voice/transfer.js
diff --git a/globeconnect/lib/voice/wait.js b/lib/voice/wait.js
similarity index 100%
rename from globeconnect/lib/voice/wait.js
rename to lib/voice/wait.js
diff --git a/globeconnect/package.json b/package.json
similarity index 100%
rename from globeconnect/package.json
rename to package.json
diff --git a/globeconnect/tests/amax.js b/tests/amax.js
similarity index 100%
rename from globeconnect/tests/amax.js
rename to tests/amax.js
diff --git a/globeconnect/tests/location.js b/tests/location.js
similarity index 100%
rename from globeconnect/tests/location.js
rename to tests/location.js
diff --git a/globeconnect/tests/oauth.js b/tests/oauth.js
similarity index 100%
rename from globeconnect/tests/oauth.js
rename to tests/oauth.js
diff --git a/globeconnect/tests/payment.js b/tests/payment.js
similarity index 100%
rename from globeconnect/tests/payment.js
rename to tests/payment.js
diff --git a/globeconnect/tests/sms.js b/tests/sms.js
similarity index 100%
rename from globeconnect/tests/sms.js
rename to tests/sms.js
diff --git a/globeconnect/tests/subscriber.js b/tests/subscriber.js
similarity index 100%
rename from globeconnect/tests/subscriber.js
rename to tests/subscriber.js
diff --git a/globeconnect/tests/ussd.js b/tests/ussd.js
similarity index 100%
rename from globeconnect/tests/ussd.js
rename to tests/ussd.js
diff --git a/globeconnect/tests/voice.js b/tests/voice.js
similarity index 100%
rename from globeconnect/tests/voice.js
rename to tests/voice.js
diff --git a/globeconnect/voiceSamples/call.js b/voiceSamples/call.js
similarity index 100%
rename from globeconnect/voiceSamples/call.js
rename to voiceSamples/call.js