diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 609ae46..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-lib/curl_cookie.txt
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index c782e85..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "test/ztest"]
-	path = test/ztest
-	url = git://github.com/jaz303/ztest.git
diff --git a/README.markdown b/README.md
similarity index 89%
rename from README.markdown
rename to README.md
index 743e538..c85496e 100644
--- a/README.markdown
+++ b/README.md
@@ -5,17 +5,31 @@ A basic CURL wrapper for PHP (see [http://php.net/curl](http://php.net/curl) for
 
 ## Installation
 
-Click the `download` link above or `git clone git://github.com/shuber/curl.git`
-
+### Installing with the composer:
+  
+Add composer.json package in your project file or create a new file.  
+```json
+{
+    "require":{
+        "shuber/curl": "dev-master"
+    }
+}
+```  
+Get the composer and install, or run the updater.  
+```bash
+curl -sS https://getcomposer.org/installer | php  
+php composer.phar install
+```  
 
 ## Usage
 
 ### Initialization
 
-Simply require and initialize the `Curl` class like so:
+Simply require the `Autoload` and initialize the object:
 
-	require_once 'curl.php';
-	$curl = new Curl;
+	require_once 'vendor/autoload.php';
+    use Shuber\LibCurl as Curl;
+	$curl = new Curl\Curl();
 
 
 ### Performing a Request
diff --git a/composer.json b/composer.json
index 8f0df6e..bc66a3f 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,8 @@
     "type": "library",
     "description": "PHP Wrapper for Curl",
     "autoload": {
-        "files": ["curl.php"]
+        "psr-0" : {
+            "":"lib/"
+        }
     }
 }
\ No newline at end of file
diff --git a/curl.php b/curl.php
deleted file mode 100644
index a41c113..0000000
--- a/curl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-require_once 'lib'.DIRECTORY_SEPARATOR.'curl.php';
-require_once 'lib'.DIRECTORY_SEPARATOR.'curl_response.php';
-require_once 'lib'.DIRECTORY_SEPARATOR.'curl_exception.php';
\ No newline at end of file
diff --git a/lib/curl.php b/lib/Shuber/LibCurl/Curl.php
similarity index 99%
rename from lib/curl.php
rename to lib/Shuber/LibCurl/Curl.php
index b5d0991..d89fddd 100644
--- a/lib/curl.php
+++ b/lib/Shuber/LibCurl/Curl.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace Shuber\LibCurl;
 /**
  * A basic CURL wrapper
  *
diff --git a/lib/curl_exception.php b/lib/Shuber/LibCurl/CurlException.php
similarity index 98%
rename from lib/curl_exception.php
rename to lib/Shuber/LibCurl/CurlException.php
index 9313fc0..625bada 100644
--- a/lib/curl_exception.php
+++ b/lib/Shuber/LibCurl/CurlException.php
@@ -1,5 +1,6 @@
 <?php
-
+namespace Shuber\LibCurl;
+use Exception;
 class CurlException extends Exception
 {
 	
diff --git a/lib/curl_response.php b/lib/Shuber/LibCurl/CurlResponse.php
similarity index 98%
rename from lib/curl_response.php
rename to lib/Shuber/LibCurl/CurlResponse.php
index a1b07b2..e865921 100644
--- a/lib/curl_response.php
+++ b/lib/Shuber/LibCurl/CurlResponse.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace Shuber\LibCurl;
 /**
  * Parses the response from a Curl request into an object containing
  * the response body and an associative array of headers