diff --git a/.gitignore b/.gitignore
index bc3c72ed9..16b0335f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 .*
 *.pyc
+vendor/*
+composer.phar
+composer.lock
+
diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 7f333960a..e5bc04dce 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -3,7 +3,7 @@ require_once __DIR__."/configs/conf.php";
 $CC_CONFIG = Config::getConfig();
 
 require_once __DIR__."/configs/ACL.php";
-require_once 'propel/vendor/propel/propel1/runtime/lib/Propel.php';
+require_once 'vendor/propel/propel1/runtime/lib/Propel.php';
 
 Propel::init(__DIR__."/configs/airtime-conf-production.php");
 
diff --git a/airtime_mvc/library/propel/composer.json b/composer.json
similarity index 100%
rename from airtime_mvc/library/propel/composer.json
rename to composer.json
diff --git a/install_minimal/include/airtime-db-install.php b/install_minimal/include/airtime-db-install.php
index 084aad9a6..ae49fec40 100644
--- a/install_minimal/include/airtime-db-install.php
+++ b/install_minimal/include/airtime-db-install.php
@@ -16,7 +16,7 @@ require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php')
 set_include_path(AirtimeInstall::GetAirtimeSrcDir().'/application/models' . PATH_SEPARATOR . get_include_path());
 
 $CC_CONFIG = Config::getConfig();
-require_once 'propel/vendor/propel/propel1/runtime/lib/Propel.php';
+require_once 'vendor/propel/propel1/runtime/lib/Propel.php';
 Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
 
 //use this class to set new values in the cache as well.
diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php
index f231968b6..db01fdcf9 100644
--- a/install_minimal/include/airtime-install.php
+++ b/install_minimal/include/airtime-install.php
@@ -23,7 +23,7 @@ if ($iniExists) {
     //reinstall, Will ask if we should rewrite config files.
     require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
     $CC_CONFIG = Config::getConfig();
-    require_once 'propel/vendor/propel/propel1/runtime/lib/Propel.php';
+    require_once 'vendor/propel/propel1/runtime/lib/Propel.php';
     Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
     $version = AirtimeInstall::GetVersionInstalled();
     $newInstall = is_null($version);
diff --git a/install_minimal/include/airtime-installed-check.php b/install_minimal/include/airtime-installed-check.php
index 5609675ed..40d3959fa 100644
--- a/install_minimal/include/airtime-installed-check.php
+++ b/install_minimal/include/airtime-installed-check.php
@@ -22,7 +22,7 @@ if (!file_exists('/etc/airtime/airtime.conf')) {
 
 require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/db-conf.php");
 $CC_CONFIG = Config::getConfig();
-require_once('propel/vendor/propel/propel1/runtime/lib/Propel.php');
+require_once('vendor/propel/propel1/runtime/lib/Propel.php');
 Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
 
 $version = AirtimeInstall::GetVersionInstalled();