diff --git a/.gitignore b/.gitignore
index 6c2ba2f..e880a46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ example/
 vendor/
 .env
 /.phpunit.result.cache
+/build/
diff --git a/build.properties b/build.properties
deleted file mode 100644
index 58ad2be..0000000
--- a/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-project.dir = ${project.basedir}
-
-# Application directories
-app.dir = ${project.dir}/app
-exec.dir = ${project.dir}/bin
-src.dir = ${project.dir}/src
-vendor.dir = ${project.dir}/vendor
-test.dir = ${project.dir}/tests
-build.dir = ${project.dir}/build
-release.dir = ${project.dir}/releases
-report.dir = ${build.dir}/reports
-
-# Report settings
-report.format = xml
-
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 2dc4258..0000000
--- a/build.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="dossier" default="help" basedir=".">
-    <property file="${project.basedir}/build.properties" />
-    <autoloader autoloaderpath="${vendor.dir}/autoload.php"/>
-    
-
-    <target name="help">
-        <echo>dossier.phar buildfile for Phing</echo>
-    </target>
-        
-    <target name="__prepare">
-        <mkdir dir="${build.dir}" />
-        <mkdir dir="${release.dir}" />
-    </target>
-    
-    
-    <target name="__copy" depends="__prepare">
-        <copy todir="${build.dir}/src" preservepermissions="true">
-            <fileset dir="${project.dir}">
-                <include name="app/**" />
-                <include name="bin/dossier.php" />
-                <include name="src/**" />
-                <include name="vendor/**" />
-                
-                <exclude name="**/.git*"/>
-                <exclude name="**/*.dist"/>
-                <exclude name="**/*.dist"/> 
-                <exclude name="app/conf/*_dev.yaml"/>
-                <exclude name="app/conf/*_test.yaml"/>
-                <exclude name="vendor/**/*.md"/>
-                <exclude name="vendor/**/docs/"/>
-                <exclude name="vendor/**/tests/"/>
-            </fileset>
-        </copy>
-    </target>
-    
-
-    <target name="test" depends="__prepare">
-        <echo>Running Tests</echo>
-        <phpunit pharlocation="${exec.dir}/phpunit" haltonfailure="true" printsummary="true"
-            bootstrap="${src.dir}/bootstrap.php">
-            <batchtest>
-                <fileset dir="${test.dir}">
-                    <include name="**/*Test.php"/>
-                </fileset>
-            </batchtest>
-        </phpunit>
-    </target>
-
-    
-    <target name="build" depends="__copy">
-        <echo>Building PHAR</echo>
-        <pharpackage destfile="${release.dir}/${project.name}.phar" 
-            basedir="${project.dir}"
-            compression="bzip2"
-            clistub="bin/dossier.php">
-            <fileset dir="${project.dir}">
-                <include name="app/**" />
-                <include name="src/**" />
-                <include name="bin/dossier.php" />
-                <include name="vendor/**" />
-            </fileset>
-        </pharpackage>
-    </target>
-</project>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 610b186..4e0db99 100644
--- a/composer.json
+++ b/composer.json
@@ -47,8 +47,7 @@
 	},
 	"require-dev" : {
 		"wapmorgan/php-code-analyzer" : "^1.0",
-		"phpunit/phpunit" : "~8.1",
-		"phing/phing" : "~2.16"
+		"phpunit/phpunit" : "~8.1"
 	},
 	"config" : {
 		"bin-dir" : "bin"
@@ -69,16 +68,5 @@
 				]
 			}
 		}
-<<<<<<< HEAD
-	},
-	"repositories" : [{
-			"type" : "git",
-			"url" : "https://github.com/magdev/console-form.git",
-			"name" : "magdev/console-form"
-		}
-	],
-	"minimum-stability" : "stable"
-=======
 	}
->>>>>>> refs/heads/master
 }
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index b036516..243d7c3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,11 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-<<<<<<< HEAD
-    "content-hash": "62e2eefeba07c02c71eae7348eb04be8",
-=======
-    "content-hash": "382454bc91f4b1d3ca867d38173f9eaa",
->>>>>>> refs/heads/master
+    "content-hash": "f14647e936930e8032fb3efead5e7e86",
     "packages": [
         {
             "name": "adbario/php-dot-notation",
@@ -1916,99 +1912,6 @@
             "description": "Library for handling version information and constraints",
             "time": "2018-07-08T19:19:57+00:00"
         },
-        {
-            "name": "phing/phing",
-            "version": "2.16.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phingofficial/phing.git",
-                "reference": "cbe0f969e434e269af91b4160b86fe899c6e07c7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phingofficial/phing/zipball/cbe0f969e434e269af91b4160b86fe899c6e07c7",
-                "reference": "cbe0f969e434e269af91b4160b86fe899c6e07c7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.0",
-                "symfony/yaml": "^3.1 || ^4.0"
-            },
-            "require-dev": {
-                "ext-pdo_sqlite": "*",
-                "mikey179/vfsstream": "^1.6",
-                "pdepend/pdepend": "2.x",
-                "pear/archive_tar": "1.4.x",
-                "pear/http_request2": "dev-trunk",
-                "pear/net_growl": "dev-trunk",
-                "pear/pear-core-minimal": "1.10.1",
-                "pear/versioncontrol_git": "@dev",
-                "pear/versioncontrol_svn": "~0.5",
-                "phpdocumentor/phpdocumentor": "2.x",
-                "phploc/phploc": "~2.0.6",
-                "phpmd/phpmd": "~2.2",
-                "phpunit/phpunit": ">=3.7",
-                "sebastian/git": "~1.0",
-                "sebastian/phpcpd": "2.x",
-                "siad007/versioncontrol_hg": "^1.0",
-                "simpletest/simpletest": "^1.1",
-                "squizlabs/php_codesniffer": "~2.2"
-            },
-            "suggest": {
-                "pdepend/pdepend": "PHP version of JDepend",
-                "pear/archive_tar": "Tar file management class",
-                "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository",
-                "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system",
-                "phpdocumentor/phpdocumentor": "Documentation Generator for PHP",
-                "phploc/phploc": "A tool for quickly measuring the size of a PHP project",
-                "phpmd/phpmd": "PHP version of PMD tool",
-                "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information",
-                "phpunit/phpunit": "The PHP Unit Testing Framework",
-                "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code",
-                "siad007/versioncontrol_hg": "A library for interfacing with Mercurial repositories.",
-                "tedivm/jshrink": "Javascript Minifier built in PHP"
-            },
-            "bin": [
-                "bin/phing"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.16.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "classes/phing/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "classes"
-            ],
-            "license": [
-                "LGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Michiel Rook",
-                    "email": "mrook@php.net"
-                },
-                {
-                    "name": "Phing Community",
-                    "homepage": "https://www.phing.info/trac/wiki/Development/Contributors"
-                }
-            ],
-            "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
-            "homepage": "https://www.phing.info/",
-            "keywords": [
-                "build",
-                "phing",
-                "task",
-                "tool"
-            ],
-            "time": "2018-01-25T13:18:09+00:00"
-        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "1.0.1",