diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bb887de
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+/bin/
+/vendor/
+/composer.lock
+/composer.phar
+/example/output.pdf
+
+/.idea/
\ No newline at end of file
diff --git a/ConvertAPI.php b/ConvertAPI.php
deleted file mode 100644
index c903214..0000000
--- a/ConvertAPI.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-#
-# ConvertAPI.php
-#
-# Copyright 2014, Jonathon Wardman. All rights reserved.
-# Contact: jonathon@flutt.co.uk / flutt.co.uk
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-namespace ConvertAPI;
-
- /**
-  * Abstract class for interacting with the convertapi.com APIs. Should be
-  * extended in order to support each of the available convertapi.com conversion
-  * methods.
-  *
-  * @see http://convertapi.com/
-  */
-abstract class ConvertAPI {
-
- /**
-  * API key to use when making requests to convertapi.com APIs.
-  */
-	public $apiKey = null;
-	
- /**
-  * Additional parameters to send to convertapi.com when carrying out a Word to
-  * PDF conversion.
-  */
-	protected $_additionalParameters = array();
-
- /**
-  * An array of valid input file formats, or a string representing a URL. Will
-  * be checked before conversion and therefore must be populated by concrete
-  * classes.
-  */
-	protected $_validInputFormats = array();
-
- /* Magic methods. */
-	
- /**
-  * Constructor. Optionally sets the API key to use for calls to convertapi.com.
-  *
-  * @param string $apiKey Optional convertapi.com API key to use.
-  */
-	public function __construct($apiKey = null) {
-	
-		if (!isset($this->_apiUrl)) {
-			throw new \Exception('Child classes of ConvertAPI must specify a value for $this->_apiUrl.');
-		}
-	
-		if ($apiKey != null) {
-			$this->apiKey = $apiKey;
-		}
-	
-	}
-	
- /* Public methods. */
- /**
-  * Concrete classes must provide a convert method: a method which sends the
-  * request to convertapi.com and deals with the response.
-  *
-  * @param string $inputFilename Full path of file to convert.
-  * @param string $outputFilename Full path of file to write with converted document.
-  */
-	public function convert($inputFilename, $outputFilename = null) {
-	
-	 // Check input file (if it's an array of local file extensions)...
-		$urlInput = false;
-		if (is_array($this->_validInputFormats)) {
-			$inputFilenameChunks = explode('.', $inputFilename);
-			if (in_array(array_pop($inputFilenameChunks), $this->_validInputFormats)) {
-				if (!is_readable($inputFilename)) {
-					throw new \Exception('Input file is not readable.');
-				}
-			} else {
-				throw new \Exception('Invalid input file type.');
-			}
-		} else if ($this->_validInputFormats == 'url') {
-			if (preg_match('/^https?:\/\//', $inputFilename)) {
-				$urlInput = true;
-			} else {
-				throw new \Exception('Invalid input URL.');
-			}
-		} else {
-			throw new \Exception('Invalid input format identifier.');
-		}
-
-	 // Check output file...
-		if ($outputFilename !== null) {
-			if (!((file_exists($outputFilename) && is_writable($outputFilename)) || is_writable(dirname($outputFilename)))) {
-				throw new \Exception('Output file target is not writable.');
-			}
-		}
-
-	 // Do conversion...
-		try {
-			$convertResponse = $this->_apiRequest($inputFilename, $urlInput);
-			if ($outputFilename !== null) {
-				if (file_put_contents($outputFilename, $convertResponse['document'])) {
-					unset($convertResponse['document']);
-					return $convertResponse;
-				} else {
-					throw new \Exception('Error writing output file.');
-				}
-			} else {
-				return $convertResponse['document'];
-			}
-		} catch (\Exception $e) {
-			throw $e;
-		}
-
-	}
-
- /* Protected methods. */
-	
- /**
-  * Send a request to the API.
-  *
-  * @param string $filename Full path of file to convert.
-  * @return array Array containing request details and binary data. See above.
-  */
-	protected function _apiRequest($filename, $urlInput = false) {
-	
-
-		if (function_exists('curl_init')) {
-		
-	 // Set the source filename or URL...
-			if ($urlInput == true) {
-				$postFields = array('CUrl' => $filename);
-			} else {
-				if (is_readable($filename)) {
-					$postFields = array('File' => '@'.$filename);
-				} else {
-					throw new \Exception('File does not exist or is not readable.');
-				}
-			}
-
-	 // Build the rest of the post fields array...
-				if ($this->apiKey !== null) {
-					$postFields['ApiKey'] = $this->apiKey;
-				}
-				if (isset($this->_additionalParameters) && is_array($this->_additionalParameters)) {
-					foreach ($this->_additionalParameters AS $key => $value) {
-						if ($value !== null) {
-							$postFields[$key] = $value;
-						}
-					}
-				}
-
-	 // Carry out the cURL request...
-				$curlHandle = curl_init();
-				curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
-				curl_setopt($curlHandle, CURLOPT_POST, true);
-				curl_setopt($curlHandle, CURLOPT_POSTFIELDS, $postFields);
-				curl_setopt($curlHandle, CURLOPT_URL, $this->_apiUrl);
-				curl_setopt($curlHandle, CURLOPT_HEADER, true);
-				$curlReturn = curl_exec($curlHandle);
-
-	 // Split the response into headers and body (usually document)...
-				$curlReturnArray = explode("\r\n\r\n", $curlReturn);
-
-	 // Check headers and return the document...
-				$headers = explode("\r\n", $curlReturnArray[1]);
-				if ($headers[0] == 'HTTP/1.1 200 OK') {
-					$returnArray = array('document' => $curlReturnArray[2]);
-					foreach ($headers AS $headerLine) {
-						$headerParts = explode(': ', $headerLine);
-						switch ($headerParts[0]) {
-							case 'InputFormat': $returnArray['input'] = $headerParts[1]; break;
-							case 'OutputFormat': $returnArray['output'] = $headerParts[1]; break;
-							case 'CreditsCost': $returnArray['cost'] = $headerParts[1]; break;
-							case 'FileSize': $returnArray['size'] = $headerParts[1]; break;
-						}
-					}
-					return $returnArray;
-				} else {
-					throw new \Exception('Error converting document: '.trim(array_shift(explode("\n", $curlReturnArray[1]))));
-				}
-
-		} else {
-			throw new \Exception('Unable to init cURL. Check PHP is compiled with cURL support.');
-		}
-	
-	}
-	
- /* Abstract methods. */
- 
- /**
-  * Magic setter method. Concrete classes must define this to handle the
-  * _additionalParametersvariable. It should check and set all valid additional
-  * parameters for the given API.
-  *
-  * @param string $name Name of the additional parameter to set.
-  * @param string $value Value to set the parameter to.
-  */
-	abstract public function __set($name, $value);
-
-}
diff --git a/Abstract2Image.php b/ConvertAPI/Abstract2Image.php
similarity index 100%
rename from Abstract2Image.php
rename to ConvertAPI/Abstract2Image.php
diff --git a/Abstract2PDF.php b/ConvertAPI/Abstract2PDF.php
similarity index 100%
rename from Abstract2PDF.php
rename to ConvertAPI/Abstract2PDF.php
diff --git a/Abstract2PowerPoint.php b/ConvertAPI/Abstract2PowerPoint.php
similarity index 100%
rename from Abstract2PowerPoint.php
rename to ConvertAPI/Abstract2PowerPoint.php
diff --git a/ConvertAPI/ConvertAPI.php b/ConvertAPI/ConvertAPI.php
new file mode 100644
index 0000000..7e1448d
--- /dev/null
+++ b/ConvertAPI/ConvertAPI.php
@@ -0,0 +1,224 @@
+<?php
+
+#
+# ConvertAPI.php
+#
+# Copyright 2014, Jonathon Wardman. All rights reserved.
+# Contact: jonathon@flutt.co.uk / flutt.co.uk
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+namespace ConvertAPI;
+
+/**
+ * Abstract class for interacting with the convertapi.com APIs. Should be
+ * extended in order to support each of the available convertapi.com conversion
+ * methods.
+ *
+ * @see http://convertapi.com/
+ */
+abstract class ConvertAPI {
+
+	/**
+	 * API key to use when making requests to convertapi.com APIs.
+	 */
+	public $apiKey = null;
+	
+	/**
+	 * Additional parameters to send to convertapi.com when carrying out a Word to
+	 * PDF conversion.
+	 */
+	protected $_additionalParameters = array();
+
+	/**
+	 * An array of valid input file formats, or a string representing a URL. Will
+	 * be checked before conversion and therefore must be populated by concrete
+	 * classes.
+	 */
+	protected $_validInputFormats = array();
+
+	/* Magic methods. */
+	
+	/**
+	 * Constructor. Optionally sets the API key to use for calls to convertapi.com.
+	 *
+	 * @param string $apiKey Optional convertapi.com API key to use.
+	 * @throws \Exception
+	 */
+	public function __construct($apiKey = null) {
+
+		if (!isset($this->_apiUrl)) {
+			throw new \Exception('Child classes of ConvertAPI must specify a value for $this->_apiUrl.');
+		}
+
+		if (!isset($this->_https)) {
+			throw new \Exception('Child classes of ConvertAPI must specify a value for $this->_https.');
+		}
+
+		$schema = $this->_https ? 'https:' : 'http:';
+		$this->_apiUrl = $schema . $this->_apiUrl;
+
+		if ($apiKey != null) {
+			$this->apiKey = $apiKey;
+		}
+
+	}
+	
+	/* Public methods. */
+	/**
+	 * Concrete classes must provide a convert method: a method which sends the
+	 * request to convertapi.com and deals with the response.
+	 *
+	 * @param string $inputFilename Full path of file to convert.
+	 * @param string $outputFilename Full path of file to write with converted document.
+	 * @param array $postFields Basic post options for api request.
+	 * @return Array|bool Returns curl info if $outputFilename = null or true
+	 * @throws \Exception
+	 */
+	public function convert($inputFilename, $outputFilename = null, $postFields = array()) {
+		// Check input file (if it's an array of local file extensions)...
+		$urlInput = false;
+		if (is_array($this->_validInputFormats)) {
+			$inputFilenameChunks = explode('.', $inputFilename);
+			if (in_array(array_pop($inputFilenameChunks), $this->_validInputFormats)) {
+				if (!is_readable($inputFilename)) {
+					throw new \Exception('Input file is not readable.');
+				}
+			} else {
+				throw new \Exception('Invalid input file type.');
+			}
+		} else if ($this->_validInputFormats == 'url') {
+			if (preg_match('/^https?:\/\//', $inputFilename)) {
+				$urlInput = true;
+			} else {
+				throw new \Exception('Invalid input URL.');
+			}
+		} else {
+			throw new \Exception('Invalid input format identifier.');
+		}
+
+		// Do conversion...
+		try {
+			$convertResponse = $this->_apiRequest($inputFilename, $outputFilename, $urlInput, $postFields);
+			return $convertResponse;
+		} catch (\Exception $e) {
+			throw $e;
+		}
+
+	}
+
+	/* Protected methods. */
+	
+	/**
+	 * Send a request to the API.
+	 *
+	 * @param string $inputFile Full path of file to convert.
+	 * @param string|bool $outputFile
+	 * @param string|bool $urlInput
+	 * @param array $postFields Basic post options for api request.
+	 * @return array|string Array containing request details and binary data or path to file. See above.
+	 * @throws \Exception
+	 */
+	protected function _apiRequest($inputFile, $outputFile = false , $urlInput = false, $postFields = array()) {
+		if (function_exists('curl_init')) {
+			// Set the source filename or URL...
+			if ($urlInput == true) {
+				$postFields['CUrl'] = $inputFile;
+			} else {
+				if (is_readable($inputFile)) {
+					$postFields['File'] = new \CurlFile($inputFile);
+				} else {
+					throw new \Exception('File does not exist or is not readable.');
+				}
+			}
+
+			// Build the rest of the post fields array...
+			if ($this->apiKey !== null) {
+				$postFields['ApiKey'] = $this->apiKey;
+			}
+			if (isset($this->_additionalParameters) && is_array($this->_additionalParameters)) {
+				foreach ($this->_additionalParameters AS $key => $value) {
+					if ($value !== null) {
+						$postFields[$key] = $value;
+					}
+				}
+			}
+
+			// Carry out the cURL request...
+			$curlHandle = curl_init();
+			curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($curlHandle, CURLOPT_POST, true);
+			curl_setopt($curlHandle, CURLOPT_POSTFIELDS, $postFields);
+			curl_setopt($curlHandle, CURLOPT_URL, $this->_apiUrl);
+
+			if ($outputFile) {
+				// Check output file...
+
+				if (!((file_exists($outputFile) && is_writable($outputFile)) || is_writable(dirname($outputFile)))) {
+					throw new \Exception('Output file target is not writable.');
+				}
+
+				$outFile = fopen($outputFile, 'w');
+				curl_setopt($curlHandle, CURLOPT_FILE, $outFile);
+				curl_setopt($curlHandle, CURLOPT_HEADER, false);
+			} else {
+				curl_setopt($curlHandle, CURLOPT_HEADER, true);
+			}
+			$curlReturn = curl_exec($curlHandle);
+
+			if ($outputFile) {
+				return $curlReturn;
+			}
+
+			// Split the response into headers and body (usually document)...
+			$curlReturnArray = explode("\r\n\r\n", $curlReturn);
+
+			// Check headers and return the document...
+			$headers = explode("\r\n", $curlReturnArray[1]);
+			if ($headers[0] == 'HTTP/1.1 200 OK') {
+				$returnArray = array('document' => $curlReturnArray[2]);
+				foreach ($headers AS $headerLine) {
+					$headerParts = explode(': ', $headerLine);
+					switch ($headerParts[0]) {
+						case 'InputFormat': $returnArray['input'] = $headerParts[1]; break;
+						case 'OutputFormat': $returnArray['output'] = $headerParts[1]; break;
+						case 'CreditsCost': $returnArray['cost'] = $headerParts[1]; break;
+						case 'FileSize': $returnArray['size'] = $headerParts[1]; break;
+					}
+				}
+				return $returnArray;
+			} else {
+				throw new \Exception('Error converting document: '.trim(array_shift(explode("\n", $curlReturnArray[1]))));
+			}
+
+		} else {
+			throw new \Exception('Unable to init cURL. Check PHP is compiled with cURL support.');
+		}
+
+	}
+	
+	/* Abstract methods. */
+
+	/**
+	 * Magic setter method. Concrete classes must define this to handle the
+	 * _additionalParametersvariable. It should check and set all valid additional
+	 * parameters for the given API.
+	 *
+	 * @param string $name Name of the additional parameter to set.
+	 * @param string $value Value to set the parameter to.
+	 */
+	abstract public function __set($name, $value);
+
+}
\ No newline at end of file
diff --git a/Email2PDF.php b/ConvertAPI/Email2PDF.php
similarity index 86%
rename from Email2PDF.php
rename to ConvertAPI/Email2PDF.php
index d622cdd..e7b943c 100644
--- a/Email2PDF.php
+++ b/ConvertAPI/Email2PDF.php
@@ -12,10 +12,12 @@
   */
 class Email2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Email2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Email2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Excel2PDF.php b/ConvertAPI/Excel2PDF.php
similarity index 86%
rename from Excel2PDF.php
rename to ConvertAPI/Excel2PDF.php
index bca7c4a..11e3564 100644
--- a/Excel2PDF.php
+++ b/ConvertAPI/Excel2PDF.php
@@ -12,10 +12,12 @@
   */
 class Excel2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Excel2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Excel2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Jnt2PDF.php b/ConvertAPI/Jnt2PDF.php
similarity index 85%
rename from Jnt2PDF.php
rename to ConvertAPI/Jnt2PDF.php
index 672e526..2695972 100644
--- a/Jnt2PDF.php
+++ b/ConvertAPI/Jnt2PDF.php
@@ -12,10 +12,12 @@
   */
 class Jnt2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Jnt2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Jnt2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Lotus2PDF.php b/ConvertAPI/Lotus2PDF.php
similarity index 87%
rename from Lotus2PDF.php
rename to ConvertAPI/Lotus2PDF.php
index 85aa590..2f274a1 100644
--- a/Lotus2PDF.php
+++ b/ConvertAPI/Lotus2PDF.php
@@ -12,10 +12,12 @@
   */
 class Email2Pdf extends Abstract2Pdf {
 
+	protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Lotus2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Lotus2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/OpenOffice2PDF.php b/ConvertAPI/OpenOffice2PDF.php
similarity index 91%
rename from OpenOffice2PDF.php
rename to ConvertAPI/OpenOffice2PDF.php
index 370abe9..71d155f 100644
--- a/OpenOffice2PDF.php
+++ b/ConvertAPI/OpenOffice2PDF.php
@@ -12,10 +12,12 @@
   */
 class OpenOffice2Pdf extends Abstract2Pdf {
 
+	protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/OpenOffice2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/OpenOffice2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Pdf2Image.php b/ConvertAPI/Pdf2Image.php
similarity index 84%
rename from Pdf2Image.php
rename to ConvertAPI/Pdf2Image.php
index c6e5852..96b02b1 100644
--- a/Pdf2Image.php
+++ b/ConvertAPI/Pdf2Image.php
@@ -12,10 +12,12 @@
   */
 class Pdf2Image extends Abstract2Image {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Pdf2Image';
+	protected $_apiUrl = '//do.convertapi.com/Pdf2Image';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Pdf2PowerPoint.php b/ConvertAPI/Pdf2PowerPoint.php
similarity index 85%
rename from Pdf2PowerPoint.php
rename to ConvertAPI/Pdf2PowerPoint.php
index 9f19145..3099d3f 100644
--- a/Pdf2PowerPoint.php
+++ b/ConvertAPI/Pdf2PowerPoint.php
@@ -12,10 +12,12 @@
   */
 class Pdf2PowerPoint extends Abstract2PowerPoint {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Pdf2PowerPoint';
+	protected $_apiUrl = '//do.convertapi.com/Pdf2PowerPoint';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/PostScript2PDF.php b/ConvertAPI/PostScript2PDF.php
similarity index 84%
rename from PostScript2PDF.php
rename to ConvertAPI/PostScript2PDF.php
index f318f16..a571623 100644
--- a/PostScript2PDF.php
+++ b/ConvertAPI/PostScript2PDF.php
@@ -12,10 +12,12 @@
   */
 class PostScript2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/PostScript2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/PostScript2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/ConvertAPI/PowerPoint2Image.php b/ConvertAPI/PowerPoint2Image.php
new file mode 100644
index 0000000..3f0d25e
--- /dev/null
+++ b/ConvertAPI/PowerPoint2Image.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace ConvertAPI;
+
+require_once('Abstract2PDF.php');
+
+ /**
+  * Extends the ConvertAPI class to convert PowerPoint documents into Image format
+  * via convertapi.com.
+  *
+  * @see http://www.convertapi.com/powerpoint-pdf-api
+  */
+class PowerPoint2Image extends Abstract2Pdf {
+
+    protected $_https = true;
+
+ /**
+  * URL of the appropriate convertapi.com API.
+  */
+	protected $_apiUrl = '//do.convertapi.com/PowerPoint2Image';
+
+ /**
+  * An array of valid input file formats for this conversion. Overrides the
+  * parent array.
+  */
+	protected $_validInputFormats = array('pot', 'potx', 'pps',
+	                                      'ppsx', 'ppt', 'pptx');
+
+}
\ No newline at end of file
diff --git a/PowerPoint2PDF.php b/ConvertAPI/PowerPoint2PDF.php
similarity index 86%
rename from PowerPoint2PDF.php
rename to ConvertAPI/PowerPoint2PDF.php
index a4bcaac..548ada5 100644
--- a/PowerPoint2PDF.php
+++ b/ConvertAPI/PowerPoint2PDF.php
@@ -12,10 +12,12 @@
   */
 class PowerPoint2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/PowerPoint2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/PowerPoint2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Project2PDF.php b/ConvertAPI/Project2PDF.php
similarity index 84%
rename from Project2PDF.php
rename to ConvertAPI/Project2PDF.php
index 2888714..ab67bd5 100644
--- a/Project2PDF.php
+++ b/ConvertAPI/Project2PDF.php
@@ -12,10 +12,12 @@
   */
 class Project2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Project2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Project2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Publisher2PDF.php b/ConvertAPI/Publisher2PDF.php
similarity index 84%
rename from Publisher2PDF.php
rename to ConvertAPI/Publisher2PDF.php
index 40e3b51..41c8f55 100644
--- a/Publisher2PDF.php
+++ b/ConvertAPI/Publisher2PDF.php
@@ -12,10 +12,12 @@
   */
 class Publisher2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Publisher2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Publisher2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/RichText2PDF.php b/ConvertAPI/RichText2PDF.php
similarity index 84%
rename from RichText2PDF.php
rename to ConvertAPI/RichText2PDF.php
index 804ffa2..92a4e08 100644
--- a/RichText2PDF.php
+++ b/ConvertAPI/RichText2PDF.php
@@ -12,10 +12,12 @@
   */
 class RichText2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/RichText2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/RichText2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Snp2PDF.php b/ConvertAPI/Snp2PDF.php
similarity index 85%
rename from Snp2PDF.php
rename to ConvertAPI/Snp2PDF.php
index b160838..961559d 100644
--- a/Snp2PDF.php
+++ b/ConvertAPI/Snp2PDF.php
@@ -12,10 +12,12 @@
   */
 class Snp2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Snp2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Snp2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Text2PDF.php b/ConvertAPI/Text2PDF.php
similarity index 85%
rename from Text2PDF.php
rename to ConvertAPI/Text2PDF.php
index 42f02c6..0dd5b8a 100644
--- a/Text2PDF.php
+++ b/ConvertAPI/Text2PDF.php
@@ -12,10 +12,12 @@
   */
 class Text2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Text2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Text2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Visio2PDF.php b/ConvertAPI/Visio2PDF.php
similarity index 84%
rename from Visio2PDF.php
rename to ConvertAPI/Visio2PDF.php
index 79e32d4..223edb4 100644
--- a/Visio2PDF.php
+++ b/ConvertAPI/Visio2PDF.php
@@ -12,10 +12,12 @@
   */
 class Visio2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Visio2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Visio2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Web2Image.php b/ConvertAPI/Web2Image.php
similarity index 84%
rename from Web2Image.php
rename to ConvertAPI/Web2Image.php
index 5ee3a14..59e7c1d 100644
--- a/Web2Image.php
+++ b/ConvertAPI/Web2Image.php
@@ -12,10 +12,12 @@
   */
 class Web2Image extends Abstract2Image {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Web2Image';
+	protected $_apiUrl = '//do.convertapi.com/Web2Image';
 
  /**
   * A string indicating that the valid input format is a URL for this
diff --git a/Web2PDF.php b/ConvertAPI/Web2PDF.php
similarity index 85%
rename from Web2PDF.php
rename to ConvertAPI/Web2PDF.php
index 056b365..b882144 100644
--- a/Web2PDF.php
+++ b/ConvertAPI/Web2PDF.php
@@ -12,10 +12,12 @@
   */
 class Web2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Web2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Web2Pdf';
 
  /**
   * An string indicating that the valid input format is a URL for this
diff --git a/Word2PDF.php b/ConvertAPI/Word2PDF.php
similarity index 88%
rename from Word2PDF.php
rename to ConvertAPI/Word2PDF.php
index 1e42f80..c7c4250 100644
--- a/Word2PDF.php
+++ b/ConvertAPI/Word2PDF.php
@@ -12,10 +12,12 @@
   */
 class Word2Pdf extends Abstract2Pdf {
 
+	protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Word2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Word2Pdf';
 	
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/Xps2PDF.php b/ConvertAPI/Xps2PDF.php
similarity index 85%
rename from Xps2PDF.php
rename to ConvertAPI/Xps2PDF.php
index cfbaf1b..3eb7bb3 100644
--- a/Xps2PDF.php
+++ b/ConvertAPI/Xps2PDF.php
@@ -12,10 +12,12 @@
   */
 class Xps2Pdf extends Abstract2Pdf {
 
+    protected $_https = true;
+
  /**
   * URL of the appropriate convertapi.com API.
   */
-	protected $_apiUrl = 'http://do.convertapi.com/Xps2Pdf';
+	protected $_apiUrl = '//do.convertapi.com/Xps2Pdf';
 
  /**
   * An array of valid input file formats for this conversion. Overrides the
diff --git a/README.md b/README.md
index 21f1ad8..7e6e014 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,28 @@ ConvertApi is an online file conversion service for creating PDF and Images from
 
 Development of this library is not in any way connected with Baltsoft Software.
 
+Installation via [Composer](http://getcomposer.org/)
+-----
+
+ * Install Composer to your project root:
+    ```bash
+    curl -sS https://getcomposer.org/installer | php
+    ```
+
+ * Add a `composer.json` file to your project:
+    ```json
+    {
+        "require": {
+            "knyga/convertapi-php": "dev-master"
+        }
+    }
+    ```
+
+ * Run the Composer installer:
+    ```bash
+    php composer.phar install
+    ```
+
 Using
 -----
 
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..d30f740
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "knyga/convertapi-php",
+    "type": "application",
+    "description": "PHP library for the convertapi.com REST API.",
+    "keywords": ["convertapi", "curl", "knyga", "confuzzledduck"],
+    "homepage": "https://github.com/knyga/convertapi-php",
+    "license": "GNU",
+    "authors": [
+        {
+            "name": "ConfuzzledDuck"
+        },
+        {
+            "name": "Oleksandr Knyga",
+            "email": "oleksandrknyga@gmail.com"
+        }
+    ],
+    "minimum-stability": "stable",
+    "require": {
+        "php": ">= 5.4",
+        "lib-curl": "*"
+    },
+    "autoload": {
+        "psr-0": { "ConvertAPI\\": "." }
+    }
+}
diff --git a/example/example.php b/example/example.php
index c82c014..9f59b2a 100644
--- a/example/example.php
+++ b/example/example.php
@@ -1,12 +1,12 @@
 <?php
 
-// Include the required concrete conversion class
-include('../Text2PDF.php');
+include('../vendor/autoload.php');
 
 try {
-// Instantiate the class
-	$text2pdf = new ConvertAPI\Text2Pdf();
-// Convert the file
+	// Instantiate the class
+	$code = 131231;//your real code
+	$text2pdf = new ConvertAPI\Text2Pdf($code);
+	// Convert the file
 	$text2pdf->convert(__DIR__.'/input.txt', __DIR__.'/output.pdf');
 } catch (Exception $e) {
 	var_dump($e->getMessage());