diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php
index 7c2f6579f..d35ef170a 100644
--- a/application/controllers/Satellite.php
+++ b/application/controllers/Satellite.php
@@ -211,11 +211,11 @@ class Satellite extends CI_Controller {
 	}
 
 	function calcpass($sat_tle) {
-		require_once realpath(__DIR__ . "/../../predict/Predict.php");
-		require_once realpath(__DIR__ . "/../../predict/Predict/Sat.php");
-		require_once realpath(__DIR__ . "/../../predict/Predict/QTH.php");
-		require_once realpath(__DIR__ . "/../../predict/Predict/Time.php");
-		require_once realpath(__DIR__ . "/../../predict/Predict/TLE.php");
+		require_once "./src/predict/Predict.php";
+		require_once "./src/predict/Predict/Sat.php";
+		require_once "./src/predict/Predict/QTH.php";
+		require_once "./src/predict/Predict/Time.php";
+		require_once "./src/predict/Predict/TLE.php";
 
 		// The observer or groundstation is called QTH in ham radio terms
 		$predict  = new Predict();
diff --git a/predict/composer.json b/predict/composer.json
deleted file mode 100644
index f8032d295..000000000
--- a/predict/composer.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "predict/predict",
-    "type": "library",
-    "description": "Predict PHP",
-    "keywords": [
-        "sgp",
-        "sgp4",
-        "sdp4",
-        "satellite",
-        "iss"
-    ],
-    "homepage": "https://github.com/shupp/Predict",
-    "authors": [
-        {
-            "name": "Bill Shupp",
-            "email": "bill@shupp.org"
-        }
-    ]
-}
diff --git a/predict/generatePackage.php b/predict/generatePackage.php
deleted file mode 100644
index 287dd41bf..000000000
--- a/predict/generatePackage.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
-
-require_once('PEAR/PackageFileManager2.php');
-
-PEAR::setErrorHandling(PEAR_ERROR_DIE);
-
-$packagexml = new PEAR_PackageFileManager2;
-
-$packagexml->setOptions(array(
-    'baseinstalldir'    => '/',
-    'simpleoutput'      => true,
-    'packagedirectory'  => './',
-    'filelistgenerator' => 'file',
-    'ignore'            => array('generatePackage.php', 'xhprof_lib/*'),
-    'dir_roles' => array(
-        'tests'     => 'test',
-        'examples'  => 'doc'
-    ),
-    'exceptions' => array('README.md' => 'doc'),
-));
-
-$packagexml->setPackage('Predict');
-$packagexml->setSummary('A partial port of the Gpredict program for satellite tracking');
-$packagexml->setDescription(
-    'Predict is a partial PHP port of the Gpredict (http://gpredict.oz9aec.net/) program that '
-    . 'allows real-time tracking and orbit prediction of satellites from two line element sets.  '
-    . 'It supports the SGP4 and SDP4 models for prediction.'
-);
-
-$packagexml->setChannel('shupp.github.com/pirum');
-$packagexml->setAPIVersion('0.2.2');
-$packagexml->setReleaseVersion('0.2.2');
-
-$packagexml->setReleaseStability('alpha');
-
-$packagexml->setAPIStability('alpha');
-
-$packagexml->setNotes('
-* Addec Predict_TLE::createChecksum()
-* Updates to examples
-');
-$packagexml->setPackageType('php');
-$packagexml->addRelease();
-
-$packagexml->detectDependencies();
-
-$packagexml->addMaintainer('lead',
-                           'shupp',
-                           'Bill Shupp',
-                           'shupp@php.net');
-$packagexml->setLicense('GPL v2.1',
-                        'http://www.opensource.org/licenses/gpl-license.php');
-
-$packagexml->setPhpDep('5.2.0');
-$packagexml->setPearinstallerDep('1.4.0b1');
-$packagexml->addExtensionDep('required', 'date');
-
-$packagexml->generateContents();
-$packagexml->writePackageFile();
-
-?>
diff --git a/predict/package.xml b/predict/package.xml
deleted file mode 100644
index 783eb5477..000000000
--- a/predict/package.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
- <name>Predict</name>
- <channel>shupp.github.com/pirum</channel>
- <summary>A partial port of the Gpredict program for satellite tracking</summary>
- <description>Predict is a partial PHP port of the Gpredict (http://gpredict.oz9aec.net/) program that allows real-time tracking and orbit prediction of satellites from two line element sets.  It supports the SGP4 and SDP4 models for prediction.</description>
- <lead>
-  <name>Bill Shupp</name>
-  <user>shupp</user>
-  <email>shupp@php.net</email>
-  <active>yes</active>
- </lead>
- <date>2014-03-06</date>
- <time>13:28:41</time>
- <version>
-  <release>0.2.2</release>
-  <api>0.2.2</api>
- </version>
- <stability>
-  <release>alpha</release>
-  <api>alpha</api>
- </stability>
- <license uri="http://www.opensource.org/licenses/gpl-license.php">GPL v2.1</license>
- <notes>
-* Addec Predict_TLE::createChecksum()
-* Updates to examples
- </notes>
- <contents>
-  <dir baseinstalldir="/" name="/">
-   <dir name="examples">
-    <file name="benchmark.php" role="doc" />
-    <file name="findsun.php" role="doc" />
-    <file name="google_maps_iss.png" role="doc" />
-    <file name="iss.tle" role="doc" />
-    <file name="pass_polar_plot.png" role="doc" />
-    <file name="solar_position.php" role="doc" />
-    <file name="update_iss_tle.php" role="doc" />
-    <file name="visible_passes.php" role="doc" />
-   </dir> <!-- /examples -->
-   <dir name="Predict">
-    <file name="DeepArg.php" role="php" />
-    <file name="DeepStatic.php" role="php" />
-    <file name="Exception.php" role="php" />
-    <file name="Geodetic.php" role="php" />
-    <file name="Math.php" role="php" />
-    <file name="ObsSet.php" role="php" />
-    <file name="Pass.php" role="php" />
-    <file name="PassDetail.php" role="php" />
-    <file name="QTH.php" role="php" />
-    <file name="Sat.php" role="php" />
-    <file name="SGPObs.php" role="php" />
-    <file name="SGPSDP.php" role="php" />
-    <file name="SGSDPStatic.php" role="php" />
-    <file name="Solar.php" role="php" />
-    <file name="Time.php" role="php" />
-    <file name="TLE.php" role="php" />
-    <file name="Vector.php" role="php" />
-   </dir> <!-- /Predict -->
-   <dir name="tests">
-    <file name="Table.php" role="test" />
-    <file name="test-001.php" role="test" />
-    <file name="test-001.tle" role="test" />
-    <file name="test-002.php" role="test" />
-    <file name="test-002.tle" role="test" />
-   </dir> <!-- /tests -->
-   <file name="Predict.php" role="php" />
-   <file name="README.md" role="doc" />
-  </dir> <!-- / -->
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.2.0</min>
-   </php>
-   <pearinstaller>
-    <min>1.4.0b1</min>
-   </pearinstaller>
-   <extension>
-    <name>date</name>
-   </extension>
-  </required>
- </dependencies>
- <phprelease />
- <changelog>
-  <release>
-   <version>
-    <release>0.1.0</release>
-    <api>0.1.0</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2011-08-22</date>
-   <license uri="http://www.opensource.org/licenses/gpl-license.php">GPL v2.1</license>
-   <notes>
-* Initial release
-   </notes>
-  </release>
-  <release>
-   <version>
-    <release>0.1.1</release>
-    <api>0.1.1</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2011-09-05</date>
-   <license uri="http://www.opensource.org/licenses/gpl-license.php">GPL v2.1</license>
-   <notes>
-* Fixed minimum elevation bug in visible pass detection
-* Updated precision of Pogson&apos;s Ratio, refactored calculate magnitude to be more readble, as well as added comments
-   </notes>
-  </release>
-  <release>
-   <version>
-    <release>0.1.2</release>
-    <api>0.1.2</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2011-09-25</date>
-   <license uri="http://www.opensource.org/licenses/gpl-license.php">GPL v2.1</license>
-   <notes>
-* Added Predict_Time::getEpochTimeStamp()
-   </notes>
-  </release>
-  <release>
-   <version>
-    <release>0.2.0</release>
-    <api>0.2.0</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2012-05-21</date>
-   <license uri="http://www.opensource.org/licenses/gpl-license.php">GPL v2.1</license>
-   <notes>
-* Fixed bug in Predict_Time::unix2daynum()
-* Updated example iss.tle file
-   </notes>
-  </release>
-  <release>
-   <version>
-    <release>0.2.1</release>
-    <api>0.2.1</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2012-07-04</date>
-   <license uri="http://www.opensource.org/licenses/gpl-license.php">GPL v2.1</license>
-   <notes>
-* Corrected role of README.md
-   </notes>
-  </release>
-  <release>
-   <version>
-    <release>0.2.2</release>
-    <api>0.2.2</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2014-03-06</date>
-   <license uri="http://www.opensource.org/licenses/gpl-license.php">GPL v2.1</license>
-   <notes>
-* Addec Predict_TLE::createChecksum()
-* Updates to examples
-   </notes>
-  </release>
- </changelog>
-</package>
diff --git a/predict/Predict.php b/src/predict/Predict.php
similarity index 97%
rename from predict/Predict.php
rename to src/predict/Predict.php
index 9e3fa162e..1c8713984 100644
--- a/predict/Predict.php
+++ b/src/predict/Predict.php
@@ -35,16 +35,16 @@
     along with this program; if not, visit http://www.fsf.org/
 */
 
-require_once realpath(__DIR__ . "/../predict/Predict/Time.php");
-require_once realpath(__DIR__ . "/../predict/Predict/Math.php");
-require_once realpath(__DIR__ . "/../predict/Predict/Pass.php");
-require_once realpath(__DIR__ . "/../predict/Predict/PassDetail.php");
-require_once realpath(__DIR__ . "/../predict/Predict/Vector.php");
-require_once realpath(__DIR__ . "/../predict/Predict/Geodetic.php");
-require_once realpath(__DIR__ . "/../predict/Predict/ObsSet.php");
-require_once realpath(__DIR__ . "/../predict/Predict/Solar.php");
-require_once realpath(__DIR__ . "/../predict/Predict/SGPSDP.php");
-require_once realpath(__DIR__ . "/../predict/Predict/SGPSDP.php");
+require_once "Predict/Time.php";
+require_once "Predict/Math.php";
+require_once "Predict/Pass.php";
+require_once "Predict/PassDetail.php";
+require_once "Predict/Vector.php";
+require_once "Predict/Geodetic.php";
+require_once "Predict/ObsSet.php";
+require_once "Predict/Solar.php";
+require_once "Predict/SGPSDP.php";
+require_once "Predict/SGPSDP.php";
 
 /**
  * The main Predict class.  Contains constants for use by other classes, as well as
diff --git a/predict/Predict/DeepArg.php b/src/predict/Predict/DeepArg.php
similarity index 100%
rename from predict/Predict/DeepArg.php
rename to src/predict/Predict/DeepArg.php
diff --git a/predict/Predict/DeepStatic.php b/src/predict/Predict/DeepStatic.php
similarity index 100%
rename from predict/Predict/DeepStatic.php
rename to src/predict/Predict/DeepStatic.php
diff --git a/predict/Predict/Exception.php b/src/predict/Predict/Exception.php
similarity index 100%
rename from predict/Predict/Exception.php
rename to src/predict/Predict/Exception.php
diff --git a/predict/Predict/Geodetic.php b/src/predict/Predict/Geodetic.php
similarity index 100%
rename from predict/Predict/Geodetic.php
rename to src/predict/Predict/Geodetic.php
diff --git a/predict/Predict/Math.php b/src/predict/Predict/Math.php
similarity index 98%
rename from predict/Predict/Math.php
rename to src/predict/Predict/Math.php
index 37b3a1cbc..e9c534513 100644
--- a/predict/Predict/Math.php
+++ b/src/predict/Predict/Math.php
@@ -5,7 +5,7 @@
  * Ported to PHP by Bill Shupp.  Original comments below
  */
 
-require_once realpath(__DIR__ . "/../../predict/Predict.php");
+require_once realpath(__DIR__ . "/../Predict.php");
 
 /*
  * Unit SGP_Math
diff --git a/predict/Predict/ObsSet.php b/src/predict/Predict/ObsSet.php
similarity index 100%
rename from predict/Predict/ObsSet.php
rename to src/predict/Predict/ObsSet.php
diff --git a/predict/Predict/Pass.php b/src/predict/Predict/Pass.php
similarity index 100%
rename from predict/Predict/Pass.php
rename to src/predict/Predict/Pass.php
diff --git a/predict/Predict/PassDetail.php b/src/predict/Predict/PassDetail.php
similarity index 93%
rename from predict/Predict/PassDetail.php
rename to src/predict/Predict/PassDetail.php
index 9fbf423a5..57529b47c 100644
--- a/predict/Predict/PassDetail.php
+++ b/src/predict/Predict/PassDetail.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once realpath(__DIR__ . "/../../predict/Predict/Vector.php");
+require_once realpath(__DIR__ . "/../Predict/Vector.php");
 
 
 /** Pass detail entry.
diff --git a/predict/Predict/QTH.php b/src/predict/Predict/QTH.php
similarity index 100%
rename from predict/Predict/QTH.php
rename to src/predict/Predict/QTH.php
diff --git a/predict/Predict/SGPObs.php b/src/predict/Predict/SGPObs.php
similarity index 95%
rename from predict/Predict/SGPObs.php
rename to src/predict/Predict/SGPObs.php
index 82f670772..cbb1bd363 100644
--- a/predict/Predict/SGPObs.php
+++ b/src/predict/Predict/SGPObs.php
@@ -6,11 +6,11 @@
  * Ported to PHP by Bill Shupp.  Original comments below
  */
 
-require_once realpath(__DIR__ . "/../../predict/Predict/Math.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/Time.php");
-require_once realpath(__DIR__ . "/../../predict/Predict.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/Vector.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/ObsSet.php");
+require_once realpath(__DIR__ . "/../Predict/Math.php");
+require_once realpath(__DIR__ . "/../Predict/Time.php");
+require_once realpath(__DIR__ . "/../Predict.php");
+require_once realpath(__DIR__ . "/../Predict/Vector.php");
+require_once realpath(__DIR__ . "/../Predict/ObsSet.php");
 
 
 /*
diff --git a/predict/Predict/SGPSDP.php b/src/predict/Predict/SGPSDP.php
similarity index 99%
rename from predict/Predict/SGPSDP.php
rename to src/predict/Predict/SGPSDP.php
index 41a7de548..48ecbb142 100644
--- a/predict/Predict/SGPSDP.php
+++ b/src/predict/Predict/SGPSDP.php
@@ -5,9 +5,9 @@
  * Original comments below
  */
 
-require_once realpath(__DIR__ . "/../../predict/Predict.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/Time.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/Math.php");
+require_once realpath(__DIR__ . "/../Predict.php");
+require_once realpath(__DIR__ . "/../Predict/Time.php");
+require_once realpath(__DIR__ . "/../Predict/Math.php");
 
 
 
diff --git a/predict/Predict/SGSDPStatic.php b/src/predict/Predict/SGSDPStatic.php
similarity index 100%
rename from predict/Predict/SGSDPStatic.php
rename to src/predict/Predict/SGSDPStatic.php
diff --git a/predict/Predict/Sat.php b/src/predict/Predict/Sat.php
similarity index 100%
rename from predict/Predict/Sat.php
rename to src/predict/Predict/Sat.php
diff --git a/predict/Predict/Solar.php b/src/predict/Predict/Solar.php
similarity index 89%
rename from predict/Predict/Solar.php
rename to src/predict/Predict/Solar.php
index 8ec351b0f..880f035ed 100644
--- a/predict/Predict/Solar.php
+++ b/src/predict/Predict/Solar.php
@@ -4,13 +4,13 @@
  * Ported from gpredict to PHP by Bill Shupp
  */
 
-require_once realpath(__DIR__ . "/../../predict/Predict.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/Math.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/Time.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/Vector.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/Geodetic.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/ObsSet.php");
-require_once realpath(__DIR__ . "/../../predict/Predict/SGPObs.php");
+require_once realpath(__DIR__ . "/../Predict.php");
+require_once realpath(__DIR__ . "/../Predict/Math.php");
+require_once realpath(__DIR__ . "/../Predict/Time.php");
+require_once realpath(__DIR__ . "/../Predict/Vector.php");
+require_once realpath(__DIR__ . "/../Predict/Geodetic.php");
+require_once realpath(__DIR__ . "/../Predict/ObsSet.php");
+require_once realpath(__DIR__ . "/../Predict/SGPObs.php");
 
 
 /*
diff --git a/predict/Predict/TLE.php b/src/predict/Predict/TLE.php
similarity index 100%
rename from predict/Predict/TLE.php
rename to src/predict/Predict/TLE.php
diff --git a/predict/Predict/Time.php b/src/predict/Predict/Time.php
similarity index 100%
rename from predict/Predict/Time.php
rename to src/predict/Predict/Time.php
diff --git a/predict/Predict/Vector.php b/src/predict/Predict/Vector.php
similarity index 100%
rename from predict/Predict/Vector.php
rename to src/predict/Predict/Vector.php
diff --git a/predict/Predict/index.html b/src/predict/Predict/index.html
similarity index 100%
rename from predict/Predict/index.html
rename to src/predict/Predict/index.html
diff --git a/predict/README.md b/src/predict/README.md
similarity index 100%
rename from predict/README.md
rename to src/predict/README.md
diff --git a/predict/index.html b/src/predict/index.html
similarity index 100%
rename from predict/index.html
rename to src/predict/index.html