diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..9600250
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<?xml-model xlink:href="/usr/share/php5/PEAR/data/phing/etc/phing-grammar.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0" ?>
+
+  <project name="HTML Compressor" default="default">
+
+    <property name="build_dir" value=".~build" />
+    <property name="phar_file" value="${build_dir}/html-compressor.phar" />
+    <property name="phar_stub_file" value="stub.php" />
+    <property name="vendor_dir" value="includes/vendor" />
+    <property name="composer_lock" value="composer.lock" />
+
+    <target name="preamble">
+      <echo msg="PHP version: ${php.version}" />
+      <echo msg="Phing version: ${phing.version}" />
+      <echo msg="------------------------------------" />
+      <echo msg="Project: ${phing.project.name}" />
+      <echo msg="Base directory: ${project.basedir}" />
+      <echo msg="------------------------------------" />
+    </target>
+
+    <target name="prepare" depends="preamble">
+      <echo msg="Preparing to build..." />
+
+      <echo msg="Deleting previous: ${build_dir} ..." />
+      <delete dir="${build_dir}" includeemptydirs="true" quiet="true" />
+
+      <echo msg="Deleting previous: ${vendor_dir} ..." />
+      <delete dir="${vendor_dir}" includeemptydirs="true" quiet="true" />
+
+      <echo msg="Deleting previous: ${composer_lock} ..." />
+      <delete file="${composer_lock}" quiet="true" />
+
+      <echo msg="------------------------------------" />
+    </target>
+
+    <target name="build" depends="prepare">
+      <echo msg="Creating: ${build_dir} ..." />
+      <mkdir dir="${build_dir}" />
+
+      <echo msg="Running Composer..." />
+      <composer composer="composer" />
+
+      <echo msg="Creating PHAR package file..." />
+      <pharpackage basedir="./" stub="${phar_stub_file}" destfile="${phar_file}" />
+    </target>
+
+    <target name="default" depends="build_or_rebuild">
+      <echo msg="Build complete! :-)" />
+    </target>
+
+  </project>
diff --git a/composer.json b/composer.json
index df8161d..8c028b6 100644
--- a/composer.json
+++ b/composer.json
@@ -40,11 +40,11 @@
 
 	"autoload"         : {
 		"psr-4": {
-			"WebSharks\\HtmlCompressor\\": "includes/classes/"
+			"WebSharks\\HtmlCompressor\\": "src/includes/classes/"
 		}
 	},
 
 	"config"           : {
-		"vendor-dir": "includes/vendor"
+		"vendor-dir": "src/includes/vendor"
 	}
 }
diff --git a/includes/.htaccess b/src/includes/.htaccess
similarity index 100%
rename from includes/.htaccess
rename to src/includes/.htaccess
diff --git a/includes/classes/Benchmark.php b/src/includes/classes/Benchmark.php
similarity index 100%
rename from includes/classes/Benchmark.php
rename to src/includes/classes/Benchmark.php
diff --git a/includes/classes/Core.php b/src/includes/classes/Core.php
similarity index 100%
rename from includes/classes/Core.php
rename to src/includes/classes/Core.php
diff --git a/includes/classes/HookApi.php b/src/includes/classes/HookApi.php
similarity index 100%
rename from includes/classes/HookApi.php
rename to src/includes/classes/HookApi.php
diff --git a/src/stub.php b/src/stub.php
new file mode 100644
index 0000000..1a96371
--- /dev/null
+++ b/src/stub.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * HTML Compressor Stub.
+ *
+ * @since 150421 Improving PHAR support.
+ *
+ * @author JasWSInc <https://github.com/jaswsinc>
+ * @copyright WebSharks, Inc. <http://www.websharks-inc.com>
+ * @license GNU General Public License, version 2
+ */
+namespace WebSharks\HtmlCompressor;
+
+require_once dirname(__FILE__).'/includes/classes/Core.php';